Merge pull request #8 from Raiduy/custom-num-runs-feature

Add multiple repetitions per run functionality.

Author: iivanoo

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.venv
 */__pycache__/*
 examples/linux-ps-profiling/primer
 examples/linux-powerjoular-profiling/primer

examples/hello-world/RunnerConfig.py

@@ -61,6 +61,7 @@ def create_run_table_model(self) -> RunTableModel:
                 {factor1: ['example_treatment1']},                   # all runs having treatment "example_treatment1" will be excluded
                 {factor1: ['example_treatment2'], factor2: [True]},  # all runs having the combination ("example_treatment2", True) will be excluded
             ],
+            repetitions = 3,
             data_columns=['avg_cpu', 'avg_mem']
         )
         return self.run_table_model

experiment-runner/ConfigValidator/Config/Models/RunTableModel.py

@@ -12,6 +12,7 @@ class RunTableModel:
     def __init__(self,
                  factors: List[FactorModel],
                  exclude_variations: List[Dict[FactorModel, List[SupportsStr]]] = None,
+                 repetitions: int = 1,
                  data_columns: List[str] = None,
                  shuffle: bool = False
                  ):
@@ -20,6 +21,9 @@ def __init__(self,
         if data_columns is None:
             data_columns = []
 
+        if repetitions < 1:
+            raise BaseError("Negative number of repetitions detected!")
+
         if len(set([factor.factor_name for factor in factors])) != len(factors):
             raise BaseError("Duplicate factor name detected!")
 
@@ -28,6 +32,7 @@ def __init__(self,
 
         self.__factors = factors
         self.__exclude_variations = exclude_variations
+        self.__repetitions = repetitions
         self.__data_columns = data_columns
         self.__shuffle = shuffle
 
@@ -76,16 +81,18 @@ def __filter_list(full_list: List[Tuple]):
                 column_names.append(data_column)
 
         experiment_run_table = []
-        for i, combo in enumerate(filtered_list):
-            row_list = list(combo)
-            row_list.insert(0, f'run_{i}')  # __run_id
-            row_list.insert(1, RunProgress.TODO)  # __done
+        for j in range(self.__repetitions):
+            for i, combo in enumerate(filtered_list):
+                row_list = list(combo)
+                row_list.insert(0, f'run_{i}_repetition_{j}')  # __run_id
+                row_list.insert(1, RunProgress.TODO)  # __done
 
-            if self.__data_columns:
-                for _ in self.__data_columns:
-                    row_list.append(" ")
-            experiment_run_table.append(dict(zip(column_names, row_list)))
+                if self.__data_columns:
+                    for _ in self.__data_columns:
+                        row_list.append(" ")
+                experiment_run_table.append(dict(zip(column_names, row_list)))
 
         if self.__shuffle:
             random.shuffle(experiment_run_table)
         return experiment_run_table
+

requirements.txt

@@ -1,3 +1,4 @@
+pandas
 psutil
 tabulate
 dill