From 32f589d04e6cf95130026b98022c14fefe7e555a Mon Sep 17 00:00:00 2001 From: "Sebastiaan J. van Zelst" Date: Fri, 18 Jan 2019 15:03:41 +0100 Subject: [PATCH] large scale refactoring of SNA --- example_simulation.py | 2 +- examples/sna_example_df.py | 8 +++--- examples/sna_example_log.py | 6 ++-- pm4py/algo/__init__.py | 2 +- pm4py/algo/enhancement/__init__.py | 1 + pm4py/algo/enhancement/sna/__init__.py | 1 + .../algo/enhancement/sna/metrics/__init__.py | 1 + .../sna/metrics/handover/__init__.py | 1 + .../sna/metrics/handover/factory.py | 2 +- .../sna/metrics/handover/versions/__init__.py | 1 + .../sna/metrics/handover/versions/classic.py | 2 +- .../sna/metrics/real_handover/__init__.py | 1 + .../sna/metrics/real_handover/factory.py | 2 +- .../real_handover/versions/__init__.py | 1 + .../metrics/real_handover/versions/classic.py | 2 +- .../metrics/similar_activities/__init__.py | 1 + .../sna/metrics/similar_activities/factory.py | 2 +- .../similar_activities/versions/__init__.py | 1 + .../similar_activities/versions/classic.py | 4 +-- .../enhancement/sna/transformer/__init__.py | 1 + .../sna/transformer/common/__init__.py | 1 + .../sna/transformer/common/df_utilities.py | 0 .../sna/transformer/common/rscact.py | 0 .../sna/transformer/common/rscrsc.py | 0 .../sna/transformer/pandas/__init__.py | 1 + .../sna/transformer/pandas/factory.py | 2 +- .../transformer/pandas/versions/__init__.py | 1 + .../sna/transformer/pandas/versions/basic.py | 2 +- .../sna/transformer/pandas/versions/full.py | 2 +- .../sna/transformer/tracelog/__init__.py | 1 + .../sna/transformer/tracelog/factory.py | 2 +- .../transformer/tracelog/versions/__init__.py | 1 + .../transformer/tracelog/versions/basic.py | 2 +- .../sna/transformer/tracelog/versions/full.py | 2 +- pm4py/algo/other/__init__.py | 1 - pm4py/algo/other/playout/__init__.py | 1 - pm4py/algo/other/playout/versions/__init__.py | 1 - pm4py/algo/other/simple/__init__.py | 1 - pm4py/algo/other/simple/filtering/__init__.py | 1 - .../other/simple/filtering/pandas/__init__.py | 1 - .../filtering/pandas/versions/__init__.py | 1 - .../simple/filtering/tracelog/__init__.py | 1 - .../filtering/tracelog/versions/__init__.py | 1 - pm4py/algo/other/simple/model/__init__.py | 1 - .../other/simple/model/pandas/__init__.py | 1 - .../simple/model/pandas/versions/__init__.py | 1 - .../other/simple/model/tracelog/__init__.py | 1 - .../model/tracelog/versions/__init__.py | 1 - pm4py/algo/simulation/__init__.py | 1 + pm4py/algo/simulation/playout/__init__.py | 1 + .../playout/data_structures/__init__.py | 0 .../{other => simulation}/playout/factory.py | 2 +- .../simulation/playout/versions/__init__.py | 1 + .../playout/versions/basic_playout.py | 0 pm4py/algo/simulation/simple/__init__.py | 1 + .../simulation/simple/filtering/__init__.py | 1 + .../simple/filtering/pandas/__init__.py | 1 + .../simple/filtering/pandas/factory.py | 2 +- .../filtering/pandas/versions/__init__.py | 1 + .../versions/filter_topvariants_soundmodel.py | 0 .../simple/filtering/tracelog/__init__.py | 1 + .../simple/filtering/tracelog/factory.py | 2 +- .../filtering/tracelog/versions/__init__.py | 1 + .../versions/filter_topvariants_soundmodel.py | 0 .../algo/simulation/simple/model/__init__.py | 1 + .../simple/model/pandas/__init__.py | 1 + .../simple/model/pandas/factory.py | 2 +- .../simple/model/pandas/versions/__init__.py | 1 + .../simple/model/pandas/versions/classic.py | 2 +- .../simple/model/tracelog/__init__.py | 1 + .../simple/model/tracelog/factory.py | 2 +- .../model/tracelog/versions/__init__.py | 1 + .../simple/model/tracelog/versions/classic.py | 2 +- pm4py/algo/sna/__init__.py | 1 - pm4py/algo/sna/metrics/__init__.py | 1 - pm4py/algo/sna/metrics/handover/__init__.py | 1 - .../sna/metrics/handover/versions/__init__.py | 1 - .../sna/metrics/real_handover/__init__.py | 1 - .../real_handover/versions/__init__.py | 1 - .../metrics/similar_activities/__init__.py | 1 - .../similar_activities/versions/__init__.py | 1 - pm4py/algo/sna/transformer/__init__.py | 1 - pm4py/algo/sna/transformer/common/__init__.py | 1 - pm4py/algo/sna/transformer/pandas/__init__.py | 1 - .../transformer/pandas/versions/__init__.py | 1 - .../algo/sna/transformer/tracelog/__init__.py | 1 - .../transformer/tracelog/versions/__init__.py | 1 - pm4py/objects/petri/check_soundness.py | 2 +- pm4py/objects/petri/reachability_graph.py | 2 +- setup.py | 28 +++++++++---------- simulation_df.py | 2 +- tests/pm_extr_test/simple_test.py | 2 +- tests/simple_execution.py | 2 +- tests/sna_tests.py | 10 +++---- 94 files changed, 82 insertions(+), 81 deletions(-) create mode 100644 pm4py/algo/enhancement/__init__.py create mode 100644 pm4py/algo/enhancement/sna/__init__.py create mode 100644 pm4py/algo/enhancement/sna/metrics/__init__.py create mode 100644 pm4py/algo/enhancement/sna/metrics/handover/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/handover/factory.py (87%) create mode 100644 pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/handover/versions/classic.py (89%) create mode 100644 pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/real_handover/factory.py (87%) create mode 100644 pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/real_handover/versions/classic.py (95%) create mode 100644 pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/similar_activities/factory.py (86%) create mode 100644 pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py rename pm4py/algo/{ => enhancement}/sna/metrics/similar_activities/versions/classic.py (92%) create mode 100644 pm4py/algo/enhancement/sna/transformer/__init__.py create mode 100644 pm4py/algo/enhancement/sna/transformer/common/__init__.py rename pm4py/algo/{ => enhancement}/sna/transformer/common/df_utilities.py (100%) rename pm4py/algo/{ => enhancement}/sna/transformer/common/rscact.py (100%) rename pm4py/algo/{ => enhancement}/sna/transformer/common/rscrsc.py (100%) create mode 100644 pm4py/algo/enhancement/sna/transformer/pandas/__init__.py rename pm4py/algo/{ => enhancement}/sna/transformer/pandas/factory.py (92%) create mode 100644 pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py rename pm4py/algo/{ => enhancement}/sna/transformer/pandas/versions/basic.py (97%) rename pm4py/algo/{ => enhancement}/sna/transformer/pandas/versions/full.py (97%) create mode 100644 pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py rename pm4py/algo/{ => enhancement}/sna/transformer/tracelog/factory.py (88%) create mode 100644 pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py rename pm4py/algo/{ => enhancement}/sna/transformer/tracelog/versions/basic.py (96%) rename pm4py/algo/{ => enhancement}/sna/transformer/tracelog/versions/full.py (97%) delete mode 100644 pm4py/algo/other/__init__.py delete mode 100644 pm4py/algo/other/playout/__init__.py delete mode 100644 pm4py/algo/other/playout/versions/__init__.py delete mode 100644 pm4py/algo/other/simple/__init__.py delete mode 100644 pm4py/algo/other/simple/filtering/__init__.py delete mode 100644 pm4py/algo/other/simple/filtering/pandas/__init__.py delete mode 100644 pm4py/algo/other/simple/filtering/pandas/versions/__init__.py delete mode 100644 pm4py/algo/other/simple/filtering/tracelog/__init__.py delete mode 100644 pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py delete mode 100644 pm4py/algo/other/simple/model/__init__.py delete mode 100644 pm4py/algo/other/simple/model/pandas/__init__.py delete mode 100644 pm4py/algo/other/simple/model/pandas/versions/__init__.py delete mode 100644 pm4py/algo/other/simple/model/tracelog/__init__.py delete mode 100644 pm4py/algo/other/simple/model/tracelog/versions/__init__.py create mode 100644 pm4py/algo/simulation/__init__.py create mode 100644 pm4py/algo/simulation/playout/__init__.py rename pm4py/algo/{other => simulation}/playout/data_structures/__init__.py (100%) rename pm4py/algo/{other => simulation}/playout/factory.py (90%) create mode 100644 pm4py/algo/simulation/playout/versions/__init__.py rename pm4py/algo/{other => simulation}/playout/versions/basic_playout.py (100%) create mode 100644 pm4py/algo/simulation/simple/__init__.py create mode 100644 pm4py/algo/simulation/simple/filtering/__init__.py create mode 100644 pm4py/algo/simulation/simple/filtering/pandas/__init__.py rename pm4py/algo/{other => simulation}/simple/filtering/pandas/factory.py (86%) create mode 100644 pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py rename pm4py/algo/{other => simulation}/simple/filtering/pandas/versions/filter_topvariants_soundmodel.py (100%) create mode 100644 pm4py/algo/simulation/simple/filtering/tracelog/__init__.py rename pm4py/algo/{other => simulation}/simple/filtering/tracelog/factory.py (86%) create mode 100644 pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py rename pm4py/algo/{other => simulation}/simple/filtering/tracelog/versions/filter_topvariants_soundmodel.py (100%) create mode 100644 pm4py/algo/simulation/simple/model/__init__.py create mode 100644 pm4py/algo/simulation/simple/model/pandas/__init__.py rename pm4py/algo/{other => simulation}/simple/model/pandas/factory.py (90%) create mode 100644 pm4py/algo/simulation/simple/model/pandas/versions/__init__.py rename pm4py/algo/{other => simulation}/simple/model/pandas/versions/classic.py (98%) create mode 100644 pm4py/algo/simulation/simple/model/tracelog/__init__.py rename pm4py/algo/{other => simulation}/simple/model/tracelog/factory.py (89%) create mode 100644 pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py rename pm4py/algo/{other => simulation}/simple/model/tracelog/versions/classic.py (98%) delete mode 100644 pm4py/algo/sna/__init__.py delete mode 100644 pm4py/algo/sna/metrics/__init__.py delete mode 100644 pm4py/algo/sna/metrics/handover/__init__.py delete mode 100644 pm4py/algo/sna/metrics/handover/versions/__init__.py delete mode 100644 pm4py/algo/sna/metrics/real_handover/__init__.py delete mode 100644 pm4py/algo/sna/metrics/real_handover/versions/__init__.py delete mode 100644 pm4py/algo/sna/metrics/similar_activities/__init__.py delete mode 100644 pm4py/algo/sna/metrics/similar_activities/versions/__init__.py delete mode 100644 pm4py/algo/sna/transformer/__init__.py delete mode 100644 pm4py/algo/sna/transformer/common/__init__.py delete mode 100644 pm4py/algo/sna/transformer/pandas/__init__.py delete mode 100644 pm4py/algo/sna/transformer/pandas/versions/__init__.py delete mode 100644 pm4py/algo/sna/transformer/tracelog/__init__.py delete mode 100644 pm4py/algo/sna/transformer/tracelog/versions/__init__.py diff --git a/example_simulation.py b/example_simulation.py index a839f3e06..63ffb3539 100644 --- a/example_simulation.py +++ b/example_simulation.py @@ -1,6 +1,6 @@ import os -from pm4py.algo.other.simple.model.tracelog import factory as simple_extraction_factory +from pm4py.algo.simulation.simple.model.tracelog import factory as simple_extraction_factory from pm4py.objects.log.importer.xes import factory as xes_importer from pm4py.objects.stochastic_petri import map as stochastic_map from pm4py.objects.stochastic_petri.lp_perf_bounds import LpPerfBounds diff --git a/examples/sna_example_df.py b/examples/sna_example_df.py index 65a5c5658..84ea2d833 100644 --- a/examples/sna_example_df.py +++ b/examples/sna_example_df.py @@ -1,9 +1,9 @@ import os -from pm4py.algo.sna.metrics.handover import factory as handover_of_work -from pm4py.algo.sna.metrics.real_handover import factory as real_handover_of_work -from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities -from pm4py.algo.sna.transformer.pandas import factory as sna_transformer +from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work +from pm4py.algo.enhancement.sna.metrics.real_handover import factory as real_handover_of_work +from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities +from pm4py.algo.enhancement.sna.transformer.pandas import factory as sna_transformer from pm4py.objects.log.adapters.pandas import csv_import_adapter from pm4py.visualization.sna import factory as sna_vis_factory diff --git a/examples/sna_example_log.py b/examples/sna_example_log.py index e72518c37..e38d74c37 100644 --- a/examples/sna_example_log.py +++ b/examples/sna_example_log.py @@ -1,8 +1,8 @@ import os -from pm4py.algo.sna.metrics.handover import factory as handover_of_work -from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities -from pm4py.algo.sna.transformer.tracelog import factory as sna_transformer +from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work +from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities +from pm4py.algo.enhancement.sna.transformer.tracelog import factory as sna_transformer from pm4py.objects.log.importer.xes import factory as xes_importer from pm4py.visualization.sna import factory as sna_vis_factory diff --git a/pm4py/algo/__init__.py b/pm4py/algo/__init__.py index 2091253fc..21222f437 100644 --- a/pm4py/algo/__init__.py +++ b/pm4py/algo/__init__.py @@ -1 +1 @@ -from pm4py.algo import sna, conformance, discovery, filtering +from pm4py.algo import conformance, discovery, enhancement, filtering diff --git a/pm4py/algo/enhancement/__init__.py b/pm4py/algo/enhancement/__init__.py new file mode 100644 index 000000000..45331b4b3 --- /dev/null +++ b/pm4py/algo/enhancement/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement import sna \ No newline at end of file diff --git a/pm4py/algo/enhancement/sna/__init__.py b/pm4py/algo/enhancement/sna/__init__.py new file mode 100644 index 000000000..2a0f463f2 --- /dev/null +++ b/pm4py/algo/enhancement/sna/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna import metrics, transformer diff --git a/pm4py/algo/enhancement/sna/metrics/__init__.py b/pm4py/algo/enhancement/sna/metrics/__init__.py new file mode 100644 index 000000000..956623e7e --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics import handover, real_handover, similar_activities diff --git a/pm4py/algo/enhancement/sna/metrics/handover/__init__.py b/pm4py/algo/enhancement/sna/metrics/handover/__init__.py new file mode 100644 index 000000000..cc3caaf4c --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/handover/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.handover import versions, factory diff --git a/pm4py/algo/sna/metrics/handover/factory.py b/pm4py/algo/enhancement/sna/metrics/handover/factory.py similarity index 87% rename from pm4py/algo/sna/metrics/handover/factory.py rename to pm4py/algo/enhancement/sna/metrics/handover/factory.py index cfe1c80a8..f426106d5 100644 --- a/pm4py/algo/sna/metrics/handover/factory.py +++ b/pm4py/algo/enhancement/sna/metrics/handover/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.metrics.handover.versions import classic +from pm4py.algo.enhancement.sna.metrics.handover.versions import classic CLASSIC = "classic" diff --git a/pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py new file mode 100644 index 000000000..c999828ad --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/handover/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.handover.versions import classic diff --git a/pm4py/algo/sna/metrics/handover/versions/classic.py b/pm4py/algo/enhancement/sna/metrics/handover/versions/classic.py similarity index 89% rename from pm4py/algo/sna/metrics/handover/versions/classic.py rename to pm4py/algo/enhancement/sna/metrics/handover/versions/classic.py index 900e1adf3..e9b74c9ce 100644 --- a/pm4py/algo/sna/metrics/handover/versions/classic.py +++ b/pm4py/algo/enhancement/sna/metrics/handover/versions/classic.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils +from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils def apply(mco, parameters=None): diff --git a/pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py b/pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py new file mode 100644 index 000000000..d855c2e3d --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/real_handover/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.real_handover import factory, versions diff --git a/pm4py/algo/sna/metrics/real_handover/factory.py b/pm4py/algo/enhancement/sna/metrics/real_handover/factory.py similarity index 87% rename from pm4py/algo/sna/metrics/real_handover/factory.py rename to pm4py/algo/enhancement/sna/metrics/real_handover/factory.py index 3c9bfcc1d..922e859f0 100644 --- a/pm4py/algo/sna/metrics/real_handover/factory.py +++ b/pm4py/algo/enhancement/sna/metrics/real_handover/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.metrics.real_handover.versions import classic +from pm4py.algo.enhancement.sna.metrics.real_handover.versions import classic CLASSIC = "classic" diff --git a/pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py new file mode 100644 index 000000000..aba2ad5ce --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/real_handover/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.real_handover.versions import classic diff --git a/pm4py/algo/sna/metrics/real_handover/versions/classic.py b/pm4py/algo/enhancement/sna/metrics/real_handover/versions/classic.py similarity index 95% rename from pm4py/algo/sna/metrics/real_handover/versions/classic.py rename to pm4py/algo/enhancement/sna/metrics/real_handover/versions/classic.py index 25b55cb09..96d0637e8 100644 --- a/pm4py/algo/sna/metrics/real_handover/versions/classic.py +++ b/pm4py/algo/enhancement/sna/metrics/real_handover/versions/classic.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils +from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils def apply(mco, parameters=None): diff --git a/pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py new file mode 100644 index 000000000..43623d674 --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/similar_activities/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.similar_activities import versions, factory diff --git a/pm4py/algo/sna/metrics/similar_activities/factory.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/factory.py similarity index 86% rename from pm4py/algo/sna/metrics/similar_activities/factory.py rename to pm4py/algo/enhancement/sna/metrics/similar_activities/factory.py index fdd2af954..9252eb943 100644 --- a/pm4py/algo/sna/metrics/similar_activities/factory.py +++ b/pm4py/algo/enhancement/sna/metrics/similar_activities/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.metrics.similar_activities.versions import classic +from pm4py.algo.enhancement.sna.metrics.similar_activities.versions import classic CLASSIC = "classic" diff --git a/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py new file mode 100644 index 000000000..5446ec26b --- /dev/null +++ b/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.metrics.similar_activities.versions import classic diff --git a/pm4py/algo/sna/metrics/similar_activities/versions/classic.py b/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/classic.py similarity index 92% rename from pm4py/algo/sna/metrics/similar_activities/versions/classic.py rename to pm4py/algo/enhancement/sna/metrics/similar_activities/versions/classic.py index 0342bdd37..0970487be 100644 --- a/pm4py/algo/sna/metrics/similar_activities/versions/classic.py +++ b/pm4py/algo/enhancement/sna/metrics/similar_activities/versions/classic.py @@ -2,8 +2,8 @@ import pandas as pd from _collections import defaultdict -from pm4py.algo.sna.transformer.common import rscact as rscact_utils -from pm4py.algo.sna.transformer.common import rscrsc as rscrsc_utils +from pm4py.algo.enhancement.sna.transformer.common import rscact as rscact_utils +from pm4py.algo.enhancement.sna.transformer.common import rscrsc as rscrsc_utils from scipy.stats import pearsonr diff --git a/pm4py/algo/enhancement/sna/transformer/__init__.py b/pm4py/algo/enhancement/sna/transformer/__init__.py new file mode 100644 index 000000000..6323c93df --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer import common, pandas, tracelog diff --git a/pm4py/algo/enhancement/sna/transformer/common/__init__.py b/pm4py/algo/enhancement/sna/transformer/common/__init__.py new file mode 100644 index 000000000..302974ae7 --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/common/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer.common import df_utilities diff --git a/pm4py/algo/sna/transformer/common/df_utilities.py b/pm4py/algo/enhancement/sna/transformer/common/df_utilities.py similarity index 100% rename from pm4py/algo/sna/transformer/common/df_utilities.py rename to pm4py/algo/enhancement/sna/transformer/common/df_utilities.py diff --git a/pm4py/algo/sna/transformer/common/rscact.py b/pm4py/algo/enhancement/sna/transformer/common/rscact.py similarity index 100% rename from pm4py/algo/sna/transformer/common/rscact.py rename to pm4py/algo/enhancement/sna/transformer/common/rscact.py diff --git a/pm4py/algo/sna/transformer/common/rscrsc.py b/pm4py/algo/enhancement/sna/transformer/common/rscrsc.py similarity index 100% rename from pm4py/algo/sna/transformer/common/rscrsc.py rename to pm4py/algo/enhancement/sna/transformer/common/rscrsc.py diff --git a/pm4py/algo/enhancement/sna/transformer/pandas/__init__.py b/pm4py/algo/enhancement/sna/transformer/pandas/__init__.py new file mode 100644 index 000000000..a607cbfba --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/pandas/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer.pandas import versions, factory diff --git a/pm4py/algo/sna/transformer/pandas/factory.py b/pm4py/algo/enhancement/sna/transformer/pandas/factory.py similarity index 92% rename from pm4py/algo/sna/transformer/pandas/factory.py rename to pm4py/algo/enhancement/sna/transformer/pandas/factory.py index 64bb10d5b..88e874d26 100644 --- a/pm4py/algo/sna/transformer/pandas/factory.py +++ b/pm4py/algo/enhancement/sna/transformer/pandas/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.transformer.pandas.versions import basic, full +from pm4py.algo.enhancement.sna.transformer.pandas.versions import basic, full BASIC = "basic" FULL = "full" diff --git a/pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py b/pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py new file mode 100644 index 000000000..1709cb3f1 --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/pandas/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer.pandas.versions import full diff --git a/pm4py/algo/sna/transformer/pandas/versions/basic.py b/pm4py/algo/enhancement/sna/transformer/pandas/versions/basic.py similarity index 97% rename from pm4py/algo/sna/transformer/pandas/versions/basic.py rename to pm4py/algo/enhancement/sna/transformer/pandas/versions/basic.py index 344b23b28..e314bf88c 100644 --- a/pm4py/algo/sna/transformer/pandas/versions/basic.py +++ b/pm4py/algo/enhancement/sna/transformer/pandas/versions/basic.py @@ -1,6 +1,6 @@ import pandas as pd -from pm4py.algo.sna.transformer.common import df_utilities +from pm4py.algo.enhancement.sna.transformer.common import df_utilities from pm4py.objects.log.util import xes from pm4py.objects.sna.matrix_container import MatrixContainer from pm4py.util import constants diff --git a/pm4py/algo/sna/transformer/pandas/versions/full.py b/pm4py/algo/enhancement/sna/transformer/pandas/versions/full.py similarity index 97% rename from pm4py/algo/sna/transformer/pandas/versions/full.py rename to pm4py/algo/enhancement/sna/transformer/pandas/versions/full.py index 642850057..942399893 100644 --- a/pm4py/algo/sna/transformer/pandas/versions/full.py +++ b/pm4py/algo/enhancement/sna/transformer/pandas/versions/full.py @@ -1,6 +1,6 @@ import pandas as pd -from pm4py.algo.sna.transformer.common import df_utilities +from pm4py.algo.enhancement.sna.transformer.common import df_utilities from pm4py.objects.log.util import xes from pm4py.objects.sna.matrix_container import MatrixContainer from pm4py.util import constants diff --git a/pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py b/pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py new file mode 100644 index 000000000..529bc9191 --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/tracelog/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer.tracelog import factory, versions diff --git a/pm4py/algo/sna/transformer/tracelog/factory.py b/pm4py/algo/enhancement/sna/transformer/tracelog/factory.py similarity index 88% rename from pm4py/algo/sna/transformer/tracelog/factory.py rename to pm4py/algo/enhancement/sna/transformer/tracelog/factory.py index f4156c1a9..6e43fd33d 100644 --- a/pm4py/algo/sna/transformer/tracelog/factory.py +++ b/pm4py/algo/enhancement/sna/transformer/tracelog/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.sna.transformer.tracelog.versions import full, basic +from pm4py.algo.enhancement.sna.transformer.tracelog.versions import full, basic FULL = "full" BASIC = "basic" diff --git a/pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py new file mode 100644 index 000000000..6e9d8586a --- /dev/null +++ b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.enhancement.sna.transformer.tracelog.versions import basic, full diff --git a/pm4py/algo/sna/transformer/tracelog/versions/basic.py b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/basic.py similarity index 96% rename from pm4py/algo/sna/transformer/tracelog/versions/basic.py rename to pm4py/algo/enhancement/sna/transformer/tracelog/versions/basic.py index f0c69d58d..8077023a8 100644 --- a/pm4py/algo/sna/transformer/tracelog/versions/basic.py +++ b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/basic.py @@ -1,6 +1,6 @@ import pandas as pd -from pm4py.algo.sna.transformer.common import df_utilities +from pm4py.algo.enhancement.sna.transformer.common import df_utilities from pm4py.objects.log.util import xes from pm4py.objects.sna.matrix_container import MatrixContainer from pm4py.util import constants diff --git a/pm4py/algo/sna/transformer/tracelog/versions/full.py b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/full.py similarity index 97% rename from pm4py/algo/sna/transformer/tracelog/versions/full.py rename to pm4py/algo/enhancement/sna/transformer/tracelog/versions/full.py index bc49f3200..a5e5321d6 100644 --- a/pm4py/algo/sna/transformer/tracelog/versions/full.py +++ b/pm4py/algo/enhancement/sna/transformer/tracelog/versions/full.py @@ -1,6 +1,6 @@ import pandas as pd -from pm4py.algo.sna.transformer.common import df_utilities +from pm4py.algo.enhancement.sna.transformer.common import df_utilities from pm4py.objects.log.util import xes from pm4py.objects.sna.matrix_container import MatrixContainer from pm4py.util import constants diff --git a/pm4py/algo/other/__init__.py b/pm4py/algo/other/__init__.py deleted file mode 100644 index 58a3967aa..000000000 --- a/pm4py/algo/other/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other import simple, playout diff --git a/pm4py/algo/other/playout/__init__.py b/pm4py/algo/other/playout/__init__.py deleted file mode 100644 index f228e6571..000000000 --- a/pm4py/algo/other/playout/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.playout import factory, data_structures, versions diff --git a/pm4py/algo/other/playout/versions/__init__.py b/pm4py/algo/other/playout/versions/__init__.py deleted file mode 100644 index 3402d85a3..000000000 --- a/pm4py/algo/other/playout/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.playout.versions import basic_playout diff --git a/pm4py/algo/other/simple/__init__.py b/pm4py/algo/other/simple/__init__.py deleted file mode 100644 index ff8162773..000000000 --- a/pm4py/algo/other/simple/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple import filtering, model diff --git a/pm4py/algo/other/simple/filtering/__init__.py b/pm4py/algo/other/simple/filtering/__init__.py deleted file mode 100644 index cd3d0ed92..000000000 --- a/pm4py/algo/other/simple/filtering/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.filtering import tracelog, pandas diff --git a/pm4py/algo/other/simple/filtering/pandas/__init__.py b/pm4py/algo/other/simple/filtering/pandas/__init__.py deleted file mode 100644 index 9f54aff50..000000000 --- a/pm4py/algo/other/simple/filtering/pandas/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.filtering.pandas import versions, factory diff --git a/pm4py/algo/other/simple/filtering/pandas/versions/__init__.py b/pm4py/algo/other/simple/filtering/pandas/versions/__init__.py deleted file mode 100644 index da2bcefb2..000000000 --- a/pm4py/algo/other/simple/filtering/pandas/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.filtering.pandas.versions import filter_topvariants_soundmodel diff --git a/pm4py/algo/other/simple/filtering/tracelog/__init__.py b/pm4py/algo/other/simple/filtering/tracelog/__init__.py deleted file mode 100644 index d8a673235..000000000 --- a/pm4py/algo/other/simple/filtering/tracelog/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.filtering.tracelog import versions, factory diff --git a/pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py b/pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py deleted file mode 100644 index e8283e8f3..000000000 --- a/pm4py/algo/other/simple/filtering/tracelog/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.filtering.tracelog.versions import filter_topvariants_soundmodel diff --git a/pm4py/algo/other/simple/model/__init__.py b/pm4py/algo/other/simple/model/__init__.py deleted file mode 100644 index 6a2ecec5d..000000000 --- a/pm4py/algo/other/simple/model/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.model import tracelog, pandas diff --git a/pm4py/algo/other/simple/model/pandas/__init__.py b/pm4py/algo/other/simple/model/pandas/__init__.py deleted file mode 100644 index c5126f7d7..000000000 --- a/pm4py/algo/other/simple/model/pandas/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.model.pandas import factory, versions diff --git a/pm4py/algo/other/simple/model/pandas/versions/__init__.py b/pm4py/algo/other/simple/model/pandas/versions/__init__.py deleted file mode 100644 index 3ce689e83..000000000 --- a/pm4py/algo/other/simple/model/pandas/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.model.pandas.versions import classic diff --git a/pm4py/algo/other/simple/model/tracelog/__init__.py b/pm4py/algo/other/simple/model/tracelog/__init__.py deleted file mode 100644 index d37cd0c15..000000000 --- a/pm4py/algo/other/simple/model/tracelog/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.model.tracelog import versions, factory diff --git a/pm4py/algo/other/simple/model/tracelog/versions/__init__.py b/pm4py/algo/other/simple/model/tracelog/versions/__init__.py deleted file mode 100644 index 8baa9adbd..000000000 --- a/pm4py/algo/other/simple/model/tracelog/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.other.simple.model.tracelog.versions import classic diff --git a/pm4py/algo/simulation/__init__.py b/pm4py/algo/simulation/__init__.py new file mode 100644 index 000000000..cc681a054 --- /dev/null +++ b/pm4py/algo/simulation/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation import simple, playout diff --git a/pm4py/algo/simulation/playout/__init__.py b/pm4py/algo/simulation/playout/__init__.py new file mode 100644 index 000000000..8a53ec82a --- /dev/null +++ b/pm4py/algo/simulation/playout/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.playout import factory, data_structures, versions diff --git a/pm4py/algo/other/playout/data_structures/__init__.py b/pm4py/algo/simulation/playout/data_structures/__init__.py similarity index 100% rename from pm4py/algo/other/playout/data_structures/__init__.py rename to pm4py/algo/simulation/playout/data_structures/__init__.py diff --git a/pm4py/algo/other/playout/factory.py b/pm4py/algo/simulation/playout/factory.py similarity index 90% rename from pm4py/algo/other/playout/factory.py rename to pm4py/algo/simulation/playout/factory.py index ed8a20a5f..f3fa0fa6b 100644 --- a/pm4py/algo/other/playout/factory.py +++ b/pm4py/algo/simulation/playout/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.other.playout.versions import basic_playout +from pm4py.algo.simulation.playout.versions import basic_playout BASIC_PLAYOUT = "basic_playout" VERSIONS = {BASIC_PLAYOUT: basic_playout.apply} diff --git a/pm4py/algo/simulation/playout/versions/__init__.py b/pm4py/algo/simulation/playout/versions/__init__.py new file mode 100644 index 000000000..5d8fb2fb2 --- /dev/null +++ b/pm4py/algo/simulation/playout/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.playout.versions import basic_playout diff --git a/pm4py/algo/other/playout/versions/basic_playout.py b/pm4py/algo/simulation/playout/versions/basic_playout.py similarity index 100% rename from pm4py/algo/other/playout/versions/basic_playout.py rename to pm4py/algo/simulation/playout/versions/basic_playout.py diff --git a/pm4py/algo/simulation/simple/__init__.py b/pm4py/algo/simulation/simple/__init__.py new file mode 100644 index 000000000..07051270b --- /dev/null +++ b/pm4py/algo/simulation/simple/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple import filtering, model diff --git a/pm4py/algo/simulation/simple/filtering/__init__.py b/pm4py/algo/simulation/simple/filtering/__init__.py new file mode 100644 index 000000000..9d60ae8a4 --- /dev/null +++ b/pm4py/algo/simulation/simple/filtering/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.filtering import tracelog, pandas diff --git a/pm4py/algo/simulation/simple/filtering/pandas/__init__.py b/pm4py/algo/simulation/simple/filtering/pandas/__init__.py new file mode 100644 index 000000000..6c196525b --- /dev/null +++ b/pm4py/algo/simulation/simple/filtering/pandas/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.filtering.pandas import versions, factory diff --git a/pm4py/algo/other/simple/filtering/pandas/factory.py b/pm4py/algo/simulation/simple/filtering/pandas/factory.py similarity index 86% rename from pm4py/algo/other/simple/filtering/pandas/factory.py rename to pm4py/algo/simulation/simple/filtering/pandas/factory.py index d214b9749..719b938de 100644 --- a/pm4py/algo/other/simple/filtering/pandas/factory.py +++ b/pm4py/algo/simulation/simple/filtering/pandas/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.other.simple.filtering.pandas.versions import filter_topvariants_soundmodel +from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel TOPVARIANTS_SOUNDMODEL = "topvariants_soundmodel" diff --git a/pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py b/pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py new file mode 100644 index 000000000..6473a0992 --- /dev/null +++ b/pm4py/algo/simulation/simple/filtering/pandas/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel diff --git a/pm4py/algo/other/simple/filtering/pandas/versions/filter_topvariants_soundmodel.py b/pm4py/algo/simulation/simple/filtering/pandas/versions/filter_topvariants_soundmodel.py similarity index 100% rename from pm4py/algo/other/simple/filtering/pandas/versions/filter_topvariants_soundmodel.py rename to pm4py/algo/simulation/simple/filtering/pandas/versions/filter_topvariants_soundmodel.py diff --git a/pm4py/algo/simulation/simple/filtering/tracelog/__init__.py b/pm4py/algo/simulation/simple/filtering/tracelog/__init__.py new file mode 100644 index 000000000..dd12276b1 --- /dev/null +++ b/pm4py/algo/simulation/simple/filtering/tracelog/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.filtering.tracelog import versions, factory diff --git a/pm4py/algo/other/simple/filtering/tracelog/factory.py b/pm4py/algo/simulation/simple/filtering/tracelog/factory.py similarity index 86% rename from pm4py/algo/other/simple/filtering/tracelog/factory.py rename to pm4py/algo/simulation/simple/filtering/tracelog/factory.py index 56b9ae6fd..a1aec682a 100644 --- a/pm4py/algo/other/simple/filtering/tracelog/factory.py +++ b/pm4py/algo/simulation/simple/filtering/tracelog/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.other.simple.filtering.tracelog.versions import filter_topvariants_soundmodel +from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel TOPVARIANTS_SOUNDMODEL = "topvariants_soundmodel" diff --git a/pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py b/pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py new file mode 100644 index 000000000..3c6391148 --- /dev/null +++ b/pm4py/algo/simulation/simple/filtering/tracelog/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel diff --git a/pm4py/algo/other/simple/filtering/tracelog/versions/filter_topvariants_soundmodel.py b/pm4py/algo/simulation/simple/filtering/tracelog/versions/filter_topvariants_soundmodel.py similarity index 100% rename from pm4py/algo/other/simple/filtering/tracelog/versions/filter_topvariants_soundmodel.py rename to pm4py/algo/simulation/simple/filtering/tracelog/versions/filter_topvariants_soundmodel.py diff --git a/pm4py/algo/simulation/simple/model/__init__.py b/pm4py/algo/simulation/simple/model/__init__.py new file mode 100644 index 000000000..cafee239a --- /dev/null +++ b/pm4py/algo/simulation/simple/model/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.model import tracelog, pandas diff --git a/pm4py/algo/simulation/simple/model/pandas/__init__.py b/pm4py/algo/simulation/simple/model/pandas/__init__.py new file mode 100644 index 000000000..dbd4bd396 --- /dev/null +++ b/pm4py/algo/simulation/simple/model/pandas/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.model.pandas import factory, versions diff --git a/pm4py/algo/other/simple/model/pandas/factory.py b/pm4py/algo/simulation/simple/model/pandas/factory.py similarity index 90% rename from pm4py/algo/other/simple/model/pandas/factory.py rename to pm4py/algo/simulation/simple/model/pandas/factory.py index 19e69b1fe..a50f5263b 100644 --- a/pm4py/algo/other/simple/model/pandas/factory.py +++ b/pm4py/algo/simulation/simple/model/pandas/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.other.simple.model.pandas.versions import classic +from pm4py.algo.simulation.simple.model.pandas.versions import classic CLASSIC = "classic" diff --git a/pm4py/algo/simulation/simple/model/pandas/versions/__init__.py b/pm4py/algo/simulation/simple/model/pandas/versions/__init__.py new file mode 100644 index 000000000..82e8f4820 --- /dev/null +++ b/pm4py/algo/simulation/simple/model/pandas/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.model.pandas.versions import classic diff --git a/pm4py/algo/other/simple/model/pandas/versions/classic.py b/pm4py/algo/simulation/simple/model/pandas/versions/classic.py similarity index 98% rename from pm4py/algo/other/simple/model/pandas/versions/classic.py rename to pm4py/algo/simulation/simple/model/pandas/versions/classic.py index edb51ff85..d264aba9f 100644 --- a/pm4py/algo/other/simple/model/pandas/versions/classic.py +++ b/pm4py/algo/simulation/simple/model/pandas/versions/classic.py @@ -5,7 +5,7 @@ from pm4py.algo.filtering.pandas.auto_filter import auto_filter from pm4py.algo.filtering.pandas.end_activities import end_activities_filter from pm4py.algo.filtering.pandas.start_activities import start_activities_filter -from pm4py.algo.other.simple.filtering.pandas.versions import filter_topvariants_soundmodel +from pm4py.algo.simulation.simple.filtering.pandas.versions import filter_topvariants_soundmodel from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY from pm4py.objects.log.util.xes import DEFAULT_TIMESTAMP_KEY from pm4py.util.constants import PARAMETER_CONSTANT_ACTIVITY_KEY diff --git a/pm4py/algo/simulation/simple/model/tracelog/__init__.py b/pm4py/algo/simulation/simple/model/tracelog/__init__.py new file mode 100644 index 000000000..2e72a12f5 --- /dev/null +++ b/pm4py/algo/simulation/simple/model/tracelog/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.model.tracelog import versions, factory diff --git a/pm4py/algo/other/simple/model/tracelog/factory.py b/pm4py/algo/simulation/simple/model/tracelog/factory.py similarity index 89% rename from pm4py/algo/other/simple/model/tracelog/factory.py rename to pm4py/algo/simulation/simple/model/tracelog/factory.py index 019e501be..b27f0027a 100644 --- a/pm4py/algo/other/simple/model/tracelog/factory.py +++ b/pm4py/algo/simulation/simple/model/tracelog/factory.py @@ -1,4 +1,4 @@ -from pm4py.algo.other.simple.model.tracelog.versions import classic +from pm4py.algo.simulation.simple.model.tracelog.versions import classic CLASSIC = "classic" diff --git a/pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py b/pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py new file mode 100644 index 000000000..5d30a065a --- /dev/null +++ b/pm4py/algo/simulation/simple/model/tracelog/versions/__init__.py @@ -0,0 +1 @@ +from pm4py.algo.simulation.simple.model.tracelog.versions import classic diff --git a/pm4py/algo/other/simple/model/tracelog/versions/classic.py b/pm4py/algo/simulation/simple/model/tracelog/versions/classic.py similarity index 98% rename from pm4py/algo/other/simple/model/tracelog/versions/classic.py rename to pm4py/algo/simulation/simple/model/tracelog/versions/classic.py index e4611dbea..7e4a0f10c 100644 --- a/pm4py/algo/other/simple/model/tracelog/versions/classic.py +++ b/pm4py/algo/simulation/simple/model/tracelog/versions/classic.py @@ -4,7 +4,7 @@ from pm4py.algo.filtering.tracelog.auto_filter import auto_filter from pm4py.algo.filtering.tracelog.start_activities import start_activities_filter from pm4py.algo.filtering.tracelog.end_activities import end_activities_filter -from pm4py.algo.other.simple.filtering.tracelog.versions import filter_topvariants_soundmodel +from pm4py.algo.simulation.simple.filtering.tracelog.versions import filter_topvariants_soundmodel from pm4py.objects.log.util import insert_classifier from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY from pm4py.util.constants import PARAMETER_CONSTANT_ATTRIBUTE_KEY, PARAMETER_CONSTANT_ACTIVITY_KEY diff --git a/pm4py/algo/sna/__init__.py b/pm4py/algo/sna/__init__.py deleted file mode 100644 index c7e6eec32..000000000 --- a/pm4py/algo/sna/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna import metrics, transformer diff --git a/pm4py/algo/sna/metrics/__init__.py b/pm4py/algo/sna/metrics/__init__.py deleted file mode 100644 index d7f09b2e8..000000000 --- a/pm4py/algo/sna/metrics/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics import handover, real_handover, similar_activities diff --git a/pm4py/algo/sna/metrics/handover/__init__.py b/pm4py/algo/sna/metrics/handover/__init__.py deleted file mode 100644 index 00fbb6433..000000000 --- a/pm4py/algo/sna/metrics/handover/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.handover import versions, factory diff --git a/pm4py/algo/sna/metrics/handover/versions/__init__.py b/pm4py/algo/sna/metrics/handover/versions/__init__.py deleted file mode 100644 index 9f3319dcc..000000000 --- a/pm4py/algo/sna/metrics/handover/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.handover.versions import classic diff --git a/pm4py/algo/sna/metrics/real_handover/__init__.py b/pm4py/algo/sna/metrics/real_handover/__init__.py deleted file mode 100644 index af9a9e6b3..000000000 --- a/pm4py/algo/sna/metrics/real_handover/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.real_handover import factory, versions diff --git a/pm4py/algo/sna/metrics/real_handover/versions/__init__.py b/pm4py/algo/sna/metrics/real_handover/versions/__init__.py deleted file mode 100644 index 15a708082..000000000 --- a/pm4py/algo/sna/metrics/real_handover/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.real_handover.versions import classic diff --git a/pm4py/algo/sna/metrics/similar_activities/__init__.py b/pm4py/algo/sna/metrics/similar_activities/__init__.py deleted file mode 100644 index 01f3d43bf..000000000 --- a/pm4py/algo/sna/metrics/similar_activities/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.similar_activities import versions, factory diff --git a/pm4py/algo/sna/metrics/similar_activities/versions/__init__.py b/pm4py/algo/sna/metrics/similar_activities/versions/__init__.py deleted file mode 100644 index 472ccf2c6..000000000 --- a/pm4py/algo/sna/metrics/similar_activities/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.metrics.similar_activities.versions import classic diff --git a/pm4py/algo/sna/transformer/__init__.py b/pm4py/algo/sna/transformer/__init__.py deleted file mode 100644 index 1b54d9114..000000000 --- a/pm4py/algo/sna/transformer/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer import common, pandas, tracelog diff --git a/pm4py/algo/sna/transformer/common/__init__.py b/pm4py/algo/sna/transformer/common/__init__.py deleted file mode 100644 index df357d721..000000000 --- a/pm4py/algo/sna/transformer/common/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer.common import df_utilities diff --git a/pm4py/algo/sna/transformer/pandas/__init__.py b/pm4py/algo/sna/transformer/pandas/__init__.py deleted file mode 100644 index c04ade350..000000000 --- a/pm4py/algo/sna/transformer/pandas/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer.pandas import versions, factory diff --git a/pm4py/algo/sna/transformer/pandas/versions/__init__.py b/pm4py/algo/sna/transformer/pandas/versions/__init__.py deleted file mode 100644 index 2741fd8a6..000000000 --- a/pm4py/algo/sna/transformer/pandas/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer.pandas.versions import full diff --git a/pm4py/algo/sna/transformer/tracelog/__init__.py b/pm4py/algo/sna/transformer/tracelog/__init__.py deleted file mode 100644 index cfe9a61da..000000000 --- a/pm4py/algo/sna/transformer/tracelog/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer.tracelog import factory, versions diff --git a/pm4py/algo/sna/transformer/tracelog/versions/__init__.py b/pm4py/algo/sna/transformer/tracelog/versions/__init__.py deleted file mode 100644 index 6b483288c..000000000 --- a/pm4py/algo/sna/transformer/tracelog/versions/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from pm4py.algo.sna.transformer.tracelog.versions import basic, full diff --git a/pm4py/objects/petri/check_soundness.py b/pm4py/objects/petri/check_soundness.py index f369e40aa..e434f6b1c 100644 --- a/pm4py/objects/petri/check_soundness.py +++ b/pm4py/objects/petri/check_soundness.py @@ -8,7 +8,7 @@ def check_source_and_sink_reachability(net, unique_source, unique_sink): """ - Checks reachability of the source and the sink place from all other nodes (places/transitions) + Checks reachability of the source and the sink place from all simulation nodes (places/transitions) of the Petri net Parameters diff --git a/pm4py/objects/petri/reachability_graph.py b/pm4py/objects/petri/reachability_graph.py index e70273288..e2ee44a75 100644 --- a/pm4py/objects/petri/reachability_graph.py +++ b/pm4py/objects/petri/reachability_graph.py @@ -8,7 +8,7 @@ def staterep(name): """ Creates a string representation for a state of a transition system. - Necessary because graphviz does not support symbols other than alphanimerics and '_'. + Necessary because graphviz does not support symbols simulation than alphanimerics and '_'. TODO: find a better representation. Parameters diff --git a/setup.py b/setup.py index 68b55d969..363e8bfa9 100644 --- a/setup.py +++ b/setup.py @@ -19,20 +19,20 @@ def read_file(filename): author_email=pm4py.__author_email__, py_modules=[pm4py.__name__], include_package_data=True, - packages=['pm4py', 'pm4py.algo', 'pm4py.algo.sna', 'pm4py.algo.sna.metrics', 'pm4py.algo.sna.metrics.handover', - 'pm4py.algo.sna.metrics.handover.versions', 'pm4py.algo.sna.metrics.real_handover', - 'pm4py.algo.sna.metrics.real_handover.versions', 'pm4py.algo.sna.metrics.similar_activities', - 'pm4py.algo.sna.metrics.similar_activities.versions', 'pm4py.algo.sna.transformer', - 'pm4py.algo.sna.transformer.common', 'pm4py.algo.sna.transformer.pandas', - 'pm4py.algo.sna.transformer.pandas.versions', 'pm4py.algo.sna.transformer.tracelog', - 'pm4py.algo.sna.transformer.tracelog.versions', 'pm4py.algo.other', 'pm4py.algo.other.simple', - 'pm4py.algo.other.simple.model', 'pm4py.algo.other.simple.model.pandas', - 'pm4py.algo.other.simple.model.pandas.versions', 'pm4py.algo.other.simple.model.tracelog', - 'pm4py.algo.other.simple.model.tracelog.versions', 'pm4py.algo.other.simple.filtering', - 'pm4py.algo.other.simple.filtering.pandas', 'pm4py.algo.other.simple.filtering.pandas.versions', - 'pm4py.algo.other.simple.filtering.tracelog', 'pm4py.algo.other.simple.filtering.tracelog.versions', - 'pm4py.algo.other.playout', 'pm4py.algo.other.playout.versions', - 'pm4py.algo.other.playout.data_structures', 'pm4py.algo.discovery', 'pm4py.algo.discovery.dfg', + packages=['pm4py', 'pm4py.algo', 'pm4py.algo.enhancement.sna', 'pm4py.algo.enhancement.sna.metrics', 'pm4py.algo.enhancement.sna.metrics.handover', + 'pm4py.algo.enhancement.sna.metrics.handover.versions', 'pm4py.algo.enhancement.sna.metrics.real_handover', + 'pm4py.algo.enhancement.sna.metrics.real_handover.versions', 'pm4py.algo.enhancement.sna.metrics.similar_activities', + 'pm4py.algo.enhancement.sna.metrics.similar_activities.versions', 'pm4py.algo.enhancement.sna.transformer', + 'pm4py.algo.enhancement.sna.transformer.common', 'pm4py.algo.enhancement.sna.transformer.pandas', + 'pm4py.algo.enhancement.sna.transformer.pandas.versions', 'pm4py.algo.enhancement.sna.transformer.tracelog', + 'pm4py.algo.enhancement.sna.transformer.tracelog.versions', 'pm4py.algo.simulation', 'pm4py.algo.simulation.simple', + 'pm4py.algo.simulation.simple.model', 'pm4py.algo.simulation.simple.model.pandas', + 'pm4py.algo.simulation.simple.model.pandas.versions', 'pm4py.algo.simulation.simple.model.tracelog', + 'pm4py.algo.simulation.simple.model.tracelog.versions', 'pm4py.algo.simulation.simple.filtering', + 'pm4py.algo.simulation.simple.filtering.pandas', 'pm4py.algo.simulation.simple.filtering.pandas.versions', + 'pm4py.algo.simulation.simple.filtering.tracelog', 'pm4py.algo.simulation.simple.filtering.tracelog.versions', + 'pm4py.algo.simulation.playout', 'pm4py.algo.simulation.playout.versions', + 'pm4py.algo.simulation.playout.data_structures', 'pm4py.algo.discovery', 'pm4py.algo.discovery.dfg', 'pm4py.algo.discovery.dfg.utils', 'pm4py.algo.discovery.dfg.adapters', 'pm4py.algo.discovery.dfg.adapters.pandas', 'pm4py.algo.discovery.dfg.versions', 'pm4py.algo.discovery.alpha', 'pm4py.algo.discovery.alpha.utils', 'pm4py.algo.discovery.alpha.versions', diff --git a/simulation_df.py b/simulation_df.py index 8e224b529..d6fd1c5f4 100644 --- a/simulation_df.py +++ b/simulation_df.py @@ -3,7 +3,7 @@ from pm4py.algo.discovery.dfg.adapters.pandas import df_statistics from pm4py.algo.filtering.common.filtering_constants import CASE_CONCEPT_NAME from pm4py.algo.filtering.pandas.attributes import attributes_filter -from pm4py.algo.other.simple.model.pandas import factory as model_factory +from pm4py.algo.simulation.simple.model.pandas import factory as model_factory from pm4py.objects.log.importer.csv.versions import pandas_df_imp from pm4py.objects.log.util.xes import DEFAULT_NAME_KEY from pm4py.objects.log.util.xes import DEFAULT_TIMESTAMP_KEY diff --git a/tests/pm_extr_test/simple_test.py b/tests/pm_extr_test/simple_test.py index 993165d25..e8052bb30 100644 --- a/tests/pm_extr_test/simple_test.py +++ b/tests/pm_extr_test/simple_test.py @@ -11,7 +11,7 @@ from pm4py.objects.log.importer.xes import factory as xes_factory from pm4py.objects.petri.exporter import pnml as pnml_exporter from pm4py.visualization.petrinet import factory as petri_vis_factory - from pm4py.algo.other.simple.model.tracelog import factory as simple_model_factory + from pm4py.algo.simulation.simple.model.tracelog import factory as simple_model_factory logFolder = os.path.join("..", "compressed_input_data") pnmlFolder = "simple_pnml" diff --git a/tests/simple_execution.py b/tests/simple_execution.py index 062795f4a..4952116db 100644 --- a/tests/simple_execution.py +++ b/tests/simple_execution.py @@ -1,7 +1,7 @@ import os import unittest -from pm4py.algo.other.simple.model.tracelog import factory as simple_model_factory +from pm4py.algo.simulation.simple.model.tracelog import factory as simple_model_factory from pm4py.objects.log.importer.xes import factory as xes_importer from tests.constants import INPUT_DATA_DIR diff --git a/tests/sna_tests.py b/tests/sna_tests.py index 3ce6c2e02..5584049e1 100644 --- a/tests/sna_tests.py +++ b/tests/sna_tests.py @@ -1,11 +1,11 @@ import os import unittest -from pm4py.algo.sna.metrics.handover import factory as handover_of_work -from pm4py.algo.sna.metrics.real_handover import factory as real_handover_of_work -from pm4py.algo.sna.metrics.similar_activities import factory as similar_activities -from pm4py.algo.sna.transformer.pandas import factory as sna_transformer_df -from pm4py.algo.sna.transformer.tracelog import factory as sna_transformer +from pm4py.algo.enhancement.sna.metrics.handover import factory as handover_of_work +from pm4py.algo.enhancement.sna.metrics.real_handover import factory as real_handover_of_work +from pm4py.algo.enhancement.sna.metrics.similar_activities import factory as similar_activities +from pm4py.algo.enhancement.sna.transformer.pandas import factory as sna_transformer_df +from pm4py.algo.enhancement.sna.transformer.tracelog import factory as sna_transformer from pm4py.objects.log.adapters.pandas import csv_import_adapter from pm4py.objects.log.importer.xes import factory as xes_importer from pm4py.visualization.sna import factory as sna_vis_factory