Commit 1c18ead2 authored by Jaime Arias's avatar Jaime Arias
Browse files

update scripts

parent 6fd36c68
This diff is collapsed.
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# In[1]: # In[1]:
ZERO = 10e-5 ZERO = 20e-5
TIMEOUT = 10 * 60 # 10 minutes = 600 seconds TIMEOUT = 10 * 60 # 10 minutes = 600 seconds
...@@ -118,7 +118,7 @@ def create_figure(df, model): ...@@ -118,7 +118,7 @@ def create_figure(df, model):
return figure return figure
# In[5]: # In[30]:
def get_axis_title(experiment, show_strategy=True): def get_axis_title(experiment, show_strategy=True):
...@@ -150,6 +150,7 @@ def get_axis_title(experiment, show_strategy=True): ...@@ -150,6 +150,7 @@ def get_axis_title(experiment, show_strategy=True):
'otfL': 'Lace', 'otfL': 'Lace',
'otfP': 'Pthreads', 'otfP': 'Pthreads',
'otfC': 'Cthreads', 'otfC': 'Cthreads',
'otfPR': 'otfPR',
'otf': 'Hybrid' 'otf': 'Hybrid'
} }
...@@ -819,35 +820,35 @@ table_explored_states_stats.head() ...@@ -819,35 +820,35 @@ table_explored_states_stats.head()
# # Examples # # 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]: # 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 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 table
# # Generate Figures # # Generate Figures
# In[27]: # In[25]:
# models # models
...@@ -857,7 +858,7 @@ models = df.model.unique() ...@@ -857,7 +858,7 @@ models = df.model.unique()
tools = df.tool.unique() tools = df.tool.unique()
# In[ ]: # In[26]:
# create all the figures of explored states # create all the figures of explored states
...@@ -876,7 +877,7 @@ for model in models: ...@@ -876,7 +877,7 @@ for model in models:
print("Error: {} was not plotted".format(model)) print("Error: {} was not plotted".format(model))
# In[ ]: # In[31]:
# create all the figures formula vs time # create all the figures formula vs time
......
...@@ -384,14 +384,14 @@ if __name__ == '__main__': ...@@ -384,14 +384,14 @@ if __name__ == '__main__':
# Default paths # Default paths
paths = create_default_paths() paths = create_default_paths()
# Timeout: 10 minutes # Timeout: 20 minutes
timeout = 10 timeout = 20
# Number of nodes # Number of nodes
nodes = [2] nodes = [4]
# Number of threads # Number of threads
threads = [8, 16] threads = [4]
# Formulas to be verified # Formulas to be verified
nb_formulas = 200 nb_formulas = 200
...@@ -410,25 +410,25 @@ if __name__ == '__main__': ...@@ -410,25 +410,25 @@ if __name__ == '__main__':
# }, { # }, {
"name": "name":
"robot", "robot",
"instances": ["robot20", "robot50"] #, "robot2", "robot5", "robot10"] "instances": ["robot20"] #"robot20", "robot50", "robot2", "robot5", "robot10"]
}, { # }, {
"name": "spool", # "name": "spool",
"instances": ["spool4", "spool5"] #, "spool1", "spool2", "spool3"] # "instances": ["spool4", "spool5"] #, "spool1", "spool2", "spool3"]
}] }]
# Tools to be compared # Tools to be compared
tools = [{ tools = [{
"name": "pmc-sog", "name": "pmc-sog",
"parameters": { "parameters": {
"parallelisation": ['otf'], #, 'otfP', 'otfPR', 'otfC'], "parallelisation": ['otf'], # 'otfPR', 'otfP', 'otfC'
"strategy": ['Cou99(poprem)', 'Cou99(poprem shy)'] #, 'default'] "strategy": ['Cou99(poprem)', 'Cou99(poprem shy)'] #, 'default']
} }
#}, { # }, {
# "name": "pnml2lts-mc", # "name": "pnml2lts-mc",
# "parameters": { # "parameters": {
# "size": ["90%"], # "size": ["90%"],
# "strategy": ['dfs', 'ndfs'] # "strategy": ['dfs', 'ndfs']
# } # }
}] }]
generate_multiple_sbatchs(tools, models, formulas, nodes, threads, timeout, generate_multiple_sbatchs(tools, models, formulas, nodes, threads, timeout,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment