reset version of sbatch generator

scripts/sbatch_generator.py

@@ -384,14 +384,14 @@ if __name__ == '__main__':
     # Default paths
     paths = create_default_paths()
 
-    # Timeout: 10 minutes
+    # Timeout: 5 minutes
     timeout = 10
 
     # Number of nodes
     nodes = [1]
 
     # Number of threads
-    threads = [1, 8, 16]
+    threads = [1, 8, 12, 16, 20, 40]
 
     # Formulas to be verified
     nb_formulas = 200
@@ -414,32 +414,29 @@ if __name__ == '__main__':
     }, {
         "name": "spool",
         "instances": ["spool1", "spool2", "spool3", "spool4", "spool5"]
+    }, {
+        "name": "kanban",
+        "instances": ["kanban5", "kanban10", "kanban20"]
+    }, {
+        "name":
+        "cloud",
+        "instances": ["cloud5by2", "cloud10by5", "cloud20by10", "cloud40by20"]
     }]
-    #, {
-    #    "name": "kanban",
-    #    "instances": ["kanban5", "kanban10", "kanban20"]
-    #}, {
-    #    "name":
-    #    "cloud",
-    #    "instances": ["cloud5by2", "cloud10by5", "cloud20by10", "cloud40by20"]
-    #}]
 
     # Tools to be compared
     tools = [{
         "name": "pmc-sog",
         "parameters": {
-            "parallelisation": ['otfP', 'otfL'],
-            "strategy": ['Cou99(poprem)']
-            # "strategy": ['default', 'Cou99(poprem)', 'Cou99(poprem shy)']
+            "parallelisation": ['otfP', 'otfL', 'otfC'],
+            "strategy": ['default', 'Cou99(poprem)', 'Cou99(poprem shy)']
+        }
+    }, {
+        "name": "pnml2lts-mc",
+        "parameters": {
+            "size": ["90%"],
+            "strategy": ['dfs', 'ndfs']
         }
     }]
-    #}, {
-    #    "name": "pnml2lts-mc",
-    #    "parameters": {
-    #        "size": ["90%"],
-    #        "strategy": ['dfs', 'ndfs']
-    #    }
-    #}]
 
     generate_multiple_sbatchs(tools, models, formulas, nodes, threads, timeout,
                               paths)