Changed file locations

.gitignore

@@ -139,4 +139,4 @@ dmypy.json
 # explainer Stuff
 explainer/test.py
 explainer/old_code.py
-explainer/conf.py
+tutorial/conf.py

explainer/explainer_regex.py

@@ -1,7 +1,7 @@
 import math
 import re
 from itertools import combinations, product, chain
-from explainer_util import (
+from explainer.explainer_util import (
     Trace,
     get_sublists,
     levenshtein_distance,

explainer/explainer_signal.py

@@ -1,10 +1,10 @@
-from explainer_util import *
+from explainer.explainer_util import *
 import re
 import math
-import SignavioAuthenticator
+from tutorial.SignavioAuthenticator import SignavioAuthenticator
 from itertools import combinations, chain
 import requests
-from conf import system_instance, workspace_id, user_name, pw
+from tutorial.conf import system_instance, workspace_id, user_name, pw
 
 KEYWORDS = [
     "ABS",
@@ -163,7 +163,7 @@ def __init__(self):
         self.adherent_trace = None
         self.adherent_traces = []
         self.minimal_solution = False
-        self.authenticator = SignavioAuthenticator.SignavioAuthenticator(
+        self.authenticator = SignavioAuthenticator(
             system_instance, workspace_id, user_name, pw
         )
         self.auth_data = self.authenticator.authenticate()

explainer/tutorial/explainer_tutorial_1.ipynb → tutorial/explainer_tutorial_1.ipynb

@@ -20,16 +20,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {
     "metadata": {}
    },
    "outputs": [],
    "source": [
     "import sys\n",
     "sys.path.append('../')\n",
-    "from explainer_util import Trace, EventLog\n",
-    "from explainer_regex import ExplainerRegex\n"
+    "from explainer.explainer_util import Trace, EventLog\n",
+    "from explainer.explainer_regex import ExplainerRegex\n"
    ]
   },
   {
@@ -42,7 +42,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 2,
    "metadata": {
     "metadata": {}
    },
@@ -63,7 +63,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 3,
    "metadata": {
     "metadata": {}
    },
@@ -93,7 +93,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 4,
    "metadata": {
     "metadata": {}
    },
@@ -212,7 +212,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 5,
    "metadata": {
     "metadata": {}
    },
@@ -231,15 +231,18 @@
       "--------------------------------\n",
       "5\n",
       "\n",
-      "Addition (Added C at position 5): A->B->A->C->B->C\n",
+      "Addition (Added B at position 1): A->B->B->A->C->B\n",
+      "Subtraction (Removed B from position 5): A->B->B->A->C\n",
       "\n",
       "Example without minimal solution\n",
       "--------------------------------\n",
       "\n",
-      "Addition (Added C at position 1): C->C->B->A\n",
-      "Addition (Added A at position 0): A->C->C->B->A\n",
-      "Addition (Added C at position 4): A->C->C->B->C->A\n",
-      "Subtraction (Removed A from position 5): A->C->C->B->C\n",
+      "Addition (Added B at position 1): C->B->B->A\n",
+      "Addition (Added B at position 1): C->B->B->B->A\n",
+      "Addition (Added A at position 1): C->A->B->B->B->A\n",
+      "Subtraction (Removed C from position 0): A->B->B->B->A\n",
+      "Addition (Added C at position 4): A->B->B->B->C->A\n",
+      "Subtraction (Removed A from position 5): A->B->B->B->C\n",
       "\n",
       "Example with minimal solution\n",
       "--------------------------------\n",
@@ -295,7 +298,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 6,
    "metadata": {
     "metadata": {}
    },
@@ -340,7 +343,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 7,
    "metadata": {
     "metadata": {}
    },
@@ -376,7 +379,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 8,
    "metadata": {
     "metadata": {}
    },
@@ -416,7 +419,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 9,
    "metadata": {
     "metadata": {}
    },
@@ -451,7 +454,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 10,
    "metadata": {
     "metadata": {}
    },
@@ -477,7 +480,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 11,
    "metadata": {
     "metadata": {}
    },

explainer/tutorial/explainer_tutorial_2.ipynb → tutorial/explainer_tutorial_2.ipynb

@@ -21,8 +21,8 @@
    "source": [
     "import sys\n",
     "sys.path.append('../')\n",
-    "from explainer_util import Trace\n",
-    "from explainer_signal import ExplainerSignal"
+    "from explainer.explainer_util import Trace\n",
+    "from explainer.explainer_signal import ExplainerSignal"
    ]
   },
   {
@@ -409,7 +409,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "100%|██████████| 119/119 [00:00<00:00, 2533615.11it/s]"
+      "100%|██████████| 119/119 [00:00<00:00, 2918843.13it/s]"
      ]
     },
     {

tutorial/tutorial.ipynb

@@ -488,7 +488,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.1"
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,