update scripts

scripts/plot-results.py

@@ -4,7 +4,7 @@
 # In[1]:
 
 
-ZERO = 10e-5
+ZERO = 20e-5
 TIMEOUT = 10 * 60 # 10 minutes = 600 seconds
 
 
@@ -118,7 +118,7 @@ def create_figure(df, model):
     return figure
 
 
-# In[5]:
+# In[30]:
 
 
 def get_axis_title(experiment, show_strategy=True):
@@ -150,6 +150,7 @@ def get_axis_title(experiment, show_strategy=True):
         'otfL': 'Lace',
         'otfP': 'Pthreads',
         'otfC': 'Cthreads',
+        'otfPR': 'otfPR',
         'otf': 'Hybrid'
     }
     
@@ -819,35 +820,35 @@ table_explored_states_stats.head()
 
 # # Examples
 
-# In[25]:
+# In[21]:
 
 
-create_figure_explored_states(table_explored_states, 'robot50')
+create_figure_explored_states(table_explored_states, 'robot20')
 
 
-# In[24]:
+# In[22]:
 
 
-create_figure(df, "robot50")
+create_figure(df, "robot20")
 
 
 # In[23]:
 
 
-log_figure = create_log_figure(table_time, table_error, "robot50", "pmc-sog_otf_couv99-default_2_16", "pnml2lts-mc_dfs_1_16", True, open_logs_callback)
+log_figure = create_log_figure(table_time, table_error, "robot20", "pmc-sog_otf_couv99-default_4_4", "pnml2lts-mc_dfs_1_16", True, open_logs_callback)
 log_figure
 
 
-# In[26]:
+# In[24]:
 
 
-table = get_table(table_time, table_error, "robot50", "pmc-sog_otf_couv99-default_2_16", "pnml2lts-mc_dfs_1_16")
+table = get_table(table_time, table_error, "robot20", "pmc-sog_otf_couv99-default_4_4", "pnml2lts-mc_dfs_1_16")
 table
 
 
 # # Generate Figures
 
-# In[27]:
+# In[25]:
 
 
 # models
@@ -857,7 +858,7 @@ models = df.model.unique()
 tools = df.tool.unique()
 
 
-# In[ ]:
+# In[26]:
 
 
 # create all the figures of explored states
@@ -876,7 +877,7 @@ for model in models:
         print("Error: {} was not plotted".format(model))
 
 
-# In[ ]:
+# In[31]:
 
 
 # create all the figures formula vs time

scripts/sbatch_generator.py

@@ -384,14 +384,14 @@ if __name__ == '__main__':
     # Default paths
     paths = create_default_paths()
 
-    # Timeout: 10 minutes
-    timeout = 10
+    # Timeout: 20 minutes
+    timeout = 20
 
     # Number of nodes
-    nodes = [2]
+    nodes = [4]
 
     # Number of threads
-    threads = [8, 16]
+    threads = [4]
 
     # Formulas to be verified
     nb_formulas = 200
@@ -410,25 +410,25 @@ if __name__ == '__main__':
     # }, {
         "name":
         "robot",
-        "instances": ["robot20", "robot50"] #, "robot2", "robot5", "robot10"]
-    }, {
-        "name": "spool",
-        "instances": ["spool4", "spool5"] #, "spool1", "spool2", "spool3"]
+        "instances": ["robot20"] #"robot20", "robot50", "robot2", "robot5", "robot10"]
+    # }, {
+    #   "name": "spool",
+    #    "instances": ["spool4", "spool5"] #, "spool1", "spool2", "spool3"]
     }]
 
     # Tools to be compared
     tools = [{
         "name": "pmc-sog",
         "parameters": {
-            "parallelisation": ['otf'], #, 'otfP', 'otfPR', 'otfC'],
+            "parallelisation": ['otf'],  # 'otfPR', 'otfP', 'otfC'
             "strategy": ['Cou99(poprem)', 'Cou99(poprem shy)'] #, 'default']
         }
-    #}, {
-    #    "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,