Andrea Maldonado commited on
Commit
10ab34e
·
1 Parent(s): 979c342

Removes run -o parameters

Browse files
Files changed (3) hide show
  1. config.py +0 -65
  2. gedi/features.py +1 -1
  3. main.py +3 -9
config.py CHANGED
@@ -2,7 +2,6 @@ import json
2
  import os
3
  import warnings
4
 
5
- from gedi.utils.io_helpers import sort_files
6
  from tqdm import tqdm
7
  from utils.param_keys import INPUT_NAME, FILENAME, FOLDER_PATH, PARAMS
8
 
@@ -22,67 +21,3 @@ def get_model_params_list(alg_json_file: str) :#-> list[dict]:
22
  return [
23
  {ALGORITHM_NAME: 'pca', NDIM: TENSOR_NDIM},
24
  ]
25
- def get_run_params(alg_params_json: str) -> dict:
26
- """
27
- Loads the running configuration given from a json file or the default dictionary from the code.
28
- @param alg_params_json: str
29
- Path to the json data with the running configuration
30
- @return: dict
31
- Running Configuration
32
- """
33
- if alg_params_json is not None:
34
- return json.load(open(alg_params_json))
35
- else:
36
- warnings.warn('The default run option is used instead of a .json-file.\n'
37
- ' Use a configuration from the `config_files`-folder together with the args `-o`.')
38
- return {
39
- RUN_OPTION: COMPARE,
40
- PLOT_TYPE: COLOR_MAP, # 'heat_map', 'color_map', '3d_map', 'explained_var_plot'
41
- PLOT_TICS: True,
42
- N_COMPONENTS: 2,
43
- INPUT_NAME: 'runningExample',
44
- SAVE_RESULTS: True,
45
- LOAD_RESULTS: True
46
- }
47
-
48
- def get_files_and_kwargs(params: dict):
49
- """
50
- This method returns the filename list of the trajectory and generates the kwargs for the DataTrajectory.
51
- The method is individually created for the available data set.
52
- Add new trajectory options, if different data set are used.
53
- @param params: dict
54
- running configuration
55
- @return: tuple
56
- list of filenames of the trajectories AND
57
- kwargs with the important arguments for the classes
58
- """
59
- try:
60
- input_name = params[INPUT_NAME]
61
- except KeyError as e:
62
- raise KeyError(f'Run option parameter is missing the key: `{e}`. This parameter is mandatory.')
63
-
64
- #TODO: generate parent directories if they don't exist
65
- if input_name == 'test':
66
- filename_list = list(tqdm(sort_files(os.listdir('data/test'))))
67
- kwargs = {FILENAME: filename_list, FOLDER_PATH: 'data/test'}
68
- elif input_name == 'realLogs':
69
- filename_list = list(tqdm(sort_files(os.listdir('data/real_event_logs'))))
70
- kwargs = {FILENAME: filename_list, FOLDER_PATH: 'data/real_event_logs'}
71
- elif input_name == 'gen5':
72
- filename_list = list(tqdm(sort_files(os.listdir('data/event_log'))))[:5]
73
- kwargs = {FILENAME: filename_list, FOLDER_PATH: 'data/event_log'}
74
- elif input_name == 'gen20':
75
- filename_list = list(tqdm(sort_files(os.listdir('data/event_log'))))[:20]
76
- kwargs = {FILENAME: filename_list, FOLDER_PATH: 'data/event_log'}
77
- elif input_name == 'runningExample':
78
- filename_list = ['running-example.xes']
79
- kwargs = {FILENAME: filename_list[0], FOLDER_PATH: 'data/'}
80
- elif input_name == 'metaFeatures':
81
- filename_list = ['log_features.csv']
82
- kwargs = {FILENAME: filename_list[0], FOLDER_PATH: 'results/'}
83
- else:
84
- raise ValueError(f'No data trajectory was found with the name `{input_name}`.')
85
-
86
- #filename_list.pop(file_element)
87
- kwargs[PARAMS] = params
88
- return filename_list, kwargs
 
2
  import os
3
  import warnings
4
 
 
5
  from tqdm import tqdm
6
  from utils.param_keys import INPUT_NAME, FILENAME, FOLDER_PATH, PARAMS
7
 
 
21
  return [
22
  {ALGORITHM_NAME: 'pca', NDIM: TENSOR_NDIM},
23
  ]
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
gedi/features.py CHANGED
@@ -28,7 +28,7 @@ class EventLogFile:
28
  return str(os.path.join(self.root_path, self.filename))
29
 
30
  class EventLogFeatures(EventLogFile):
31
- def __init__(self, filename, folder_path='data/event_log', params=None, logs=None, ft_params=None):
32
  super().__init__(filename, folder_path)
33
  if ft_params == None:
34
  self.params = None
 
28
  return str(os.path.join(self.root_path, self.filename))
29
 
30
  class EventLogFeatures(EventLogFile):
31
+ def __init__(self, filename=None, folder_path='data/event_log', params=None, logs=None, ft_params=None):
32
  super().__init__(filename, folder_path)
33
  if ft_params == None:
34
  self.params = None
main.py CHANGED
@@ -22,7 +22,7 @@ def run(kwargs:dict, model_paramas_list: list, filename_list:list):
22
  @return:
23
  """
24
  params = kwargs[PARAMS]
25
- run_option = params[RUN_OPTION]
26
  ft = EventLogFeatures(None)
27
  augmented_ft = InstanceAugmentator()
28
  gen = pd.DataFrame(columns=['log'])
@@ -60,13 +60,7 @@ if __name__=='__main__':
60
  print(f'INFO: GEDI starting {start_gedi}')
61
 
62
  args = ArgParser().parse('GEDI main')
63
- run_params = config.get_run_params(args.run_params_json)
64
- filename_list, kwargs = config.get_files_and_kwargs(run_params)
65
-
66
- if args.result_load_files is None:
67
- model_params_list = config.get_model_params_list(args.alg_params_json)
68
- run(kwargs, model_params_list, filename_list)
69
- else:
70
- load(args.result_load_files, kwargs)
71
 
72
  print(f'SUCCESS: GEDI took {dt.now()-start_gedi} sec.')
 
22
  @return:
23
  """
24
  params = kwargs[PARAMS]
25
+ run_option = 'baseline'
26
  ft = EventLogFeatures(None)
27
  augmented_ft = InstanceAugmentator()
28
  gen = pd.DataFrame(columns=['log'])
 
60
  print(f'INFO: GEDI starting {start_gedi}')
61
 
62
  args = ArgParser().parse('GEDI main')
63
+ model_params_list = config.get_model_params_list(args.alg_params_json)
64
+ run({'params':""}, model_params_list, [])
 
 
 
 
 
 
65
 
66
  print(f'SUCCESS: GEDI took {dt.now()-start_gedi} sec.')