Merges demo_icpm24

.github/workflows/test_gedi.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - main
       - bpm24
-      - demo-icpm24
   workflow_dispatch:
 
 # Specifies the jobs that are to be run
@@ -184,3 +183,65 @@ jobs:
     - name: Run test
       run:
         python main.py -a config_files/test/experiment_test.json
+
+  test_grid_experiments_script:
+    runs-on: ubuntu-latest
+
+    # Setting up a python envronment  for the test script to run
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install build-essential python3 python3-dev
+
+    - name: Install feeed
+      run: |
+        python -m pip install --upgrade pip
+        pip install .
+
+    - name: Run test
+      run:
+        python gedi/utils/execute_grid_experiments.py config_files/test
+
+    - name: Convert output and validation to same encoding
+      run: iconv -f UTF-8 -t ASCII output/features/generated/2_bpic_features/2_ense_enseef_feat.csv > data/validation/2_ense_enseef_feat.csv
+
+    - name: Compare output
+      run: diff data/validation/2_ense_enseef_feat.csv output/features/generated/2_bpic_features/2_ense_enseef_feat.csv
+
+  test_abbrv:
+    runs-on: ubuntu-latest
+
+    # Setting up a python envronment  for the test script to run
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install build-essential python3 python3-dev
+
+    - name: Install feeed
+      run: |
+        python -m pip install --upgrade pip
+        pip install .
+
+    - name: Run test
+      run:
+        python main.py -a config_files/test/test_abbrv_generation.json
+
+    - name: Compare output
+      run: 
+        diff data/validation/2_ense_rmcv_feat.csv output/test/igedi_table_1/2_ense_rmcv_feat.csv

gedi/__init__.py

@@ -1,3 +1,3 @@
 from .run import gedi
 
-__all__=[ 'gedi']
+__all__=['gedi']

main.py

@@ -1,54 +1,12 @@
 import config
-import pandas as pd
 from datetime import datetime as dt
-from gedi.generator import GenerateEventLogs
-from gedi.features import EventLogFeatures
-from gedi.augmentation import InstanceAugmentator
-from gedi.benchmark import BenchmarkTest
-from gedi.plotter import BenchmarkPlotter, FeaturesPlotter, AugmentationPlotter, GenerationPlotter
+from gedi.run import gedi, run
 from utils.default_argparse import ArgParser
 from utils.param_keys import *
 
-def run(kwargs:dict, model_paramas_list: list, filename_list:list):
-    """
-    This function chooses the running option for the program.
-    @param kwargs: dict
-        contains the running parameters and the event-log file information
-    @param model_params_list: list
-        contains a list of model parameters, which are used to analyse this different models.
-    @param filename_list: list
-        contains the list of the filenames to load multiple event-logs
-    @return:
-    """
-    params = kwargs[PARAMS]
-    ft = EventLogFeatures(None)
-    augmented_ft = InstanceAugmentator()
-    gen = pd.DataFrame(columns=['log'])
-
-    for model_params in model_params_list:
-        if model_params.get(PIPELINE_STEP) == 'instance_augmentation':
-            augmented_ft = InstanceAugmentator(aug_params=model_params, samples=ft.feat)
-            AugmentationPlotter(augmented_ft, model_params)
-        elif model_params.get(PIPELINE_STEP) == 'event_logs_generation':
-            gen = pd.DataFrame(GenerateEventLogs(model_params).log_config)
-            #gen = pd.read_csv("output/features/generated/grid_2objectives_enseef_enve/2_enseef_enve_feat.csv")
-            #GenerationPlotter(gen, model_params, output_path="output/plots")
-        elif model_params.get(PIPELINE_STEP) == 'benchmark_test':
-            benchmark = BenchmarkTest(model_params, event_logs=gen['log'])
-            # BenchmarkPlotter(benchmark.features, output_path="output/plots")
-        elif model_params.get(PIPELINE_STEP) == 'feature_extraction':
-            ft = EventLogFeatures(**kwargs, logs=gen['log'], ft_params=model_params)
-            FeaturesPlotter(ft.feat, model_params)
-        elif model_params.get(PIPELINE_STEP) == "evaluation_plotter":
-            GenerationPlotter(gen, model_params, output_path=model_params['output_path'], input_path=model_params['input_path'])
-
-
 if __name__=='__main__':
     start_gedi = dt.now()
     print(f'INFO: GEDI starting {start_gedi}')
-
     args = ArgParser().parse('GEDI main')
-    model_params_list = config.get_model_params_list(args.alg_params_json)
-    run({'params':""}, model_params_list, [])
-
-    print(f'SUCCESS: GEDI took {dt.now()-start_gedi} sec.')
+    gedi(args.alg_params_json)
+    print(f'SUCCESS: GEDI took {dt.now()-start_gedi} sec.')