Fixes to benchmarks

README.md

@@ -17,6 +17,7 @@ conda env create -f environment.yml
 git submodule update --init --recursive
 ```
 
+
 - Check the installation by running the tests
 
 ```

benchmarks/README.md

@@ -6,6 +6,7 @@ The files found in [./benchmarks/programs](../benchmarks/programs) correspond to
 
 We use the following scripts to automatize the jobs for the benchmarks.
 
+
 ##### [./run_bm.sh](./run_bm.sh) 
 - Generates specialized run scripts by duplicating the provided [template for the domain](./runscripts/runscript_asprilo-abc.xml) and replacing special parameters: (Horizon, number of models, and additional).
 - Calls `./bgen` to generate benchmarking scripts from the benchmarking tool.
@@ -72,11 +73,13 @@ optional arguments:
 
 ## *asprilo* Benchmarks from paper
 
-1. Setup path to atlingo in folder in [./run_bm.sh](./run_bm.sh)
+1. Setup path to atlingo in folder in [./run_bm.sh](./run_bm.sh) and the desired mode
 
 1. Run all benchmarks from script `./batch_all_asprilo-abc.sh`
 
 2. Compute ods files `./compute_all_ods.sh`
 
 3. Plot results `./plot_script_asprilo-abc.sh`
 
+
+The benchmarks can run in a linux OS, if you are using a different system you would need to compile a runsolver and replace [./programs/runsolver-3.4](./programs/runsolver-3.4).

benchmarks/batch_all_asprilo-abc.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
-#Activate conda env
-# source /usr/local/apps/anaconda3/etc/profile.d/conda.sh
-# conda activate temporal-automata
 make copy-programs
 cd ..
 make clean -s
@@ -11,49 +8,49 @@ make asprilo-clean-instances
 make asprilo-abc-robots-instance
 
 ./run_bm.sh asprilo-abc afw 24 1
-# ./run_bm.sh asprilo-abc afw 25 1
-# ./run_bm.sh asprilo-abc afw 26 1
-# ./run_bm.sh asprilo-abc afw 27 1
-# ./run_bm.sh asprilo-abc afw 28 1
-# ./run_bm.sh asprilo-abc afw 29 1
-# ./run_bm.sh asprilo-abc afw 30 1
-
-# ./run_bm.sh asprilo-abc telingo 24 1
-# ./run_bm.sh asprilo-abc telingo 25 1
-# ./run_bm.sh asprilo-abc telingo 26 1
-# ./run_bm.sh asprilo-abc telingo 27 1
-# ./run_bm.sh asprilo-abc telingo 28 1
-# ./run_bm.sh asprilo-abc telingo 29 1
-# ./run_bm.sh asprilo-abc telingo 30 1
-
-# ./run_bm.sh asprilo-abc dfa-mso 24 1
-# ./run_bm.sh asprilo-abc dfa-mso 25 1
-# ./run_bm.sh asprilo-abc dfa-mso 26 1
-# ./run_bm.sh asprilo-abc dfa-mso 27 1
-# ./run_bm.sh asprilo-abc dfa-mso 28 1
-# ./run_bm.sh asprilo-abc dfa-mso 29 1
-# ./run_bm.sh asprilo-abc dfa-mso 30 1
-
-# ./run_bm.sh asprilo-abc dfa-stm 24 1
-# ./run_bm.sh asprilo-abc dfa-stm 25 1
-# ./run_bm.sh asprilo-abc dfa-stm 26 1
-# ./run_bm.sh asprilo-abc dfa-stm 27 1
-# ./run_bm.sh asprilo-abc dfa-stm 28 1
-# ./run_bm.sh asprilo-abc dfa-stm 29 1
-# ./run_bm.sh asprilo-abc dfa-stm 30 1
-
-# ./run_bm.sh asprilo-abc nc 24 1
-# ./run_bm.sh asprilo-abc nc 25 1
-# ./run_bm.sh asprilo-abc nc 26 1
-# ./run_bm.sh asprilo-abc nc 27 1
-# ./run_bm.sh asprilo-abc nc 28 1
-# ./run_bm.sh asprilo-abc nc 29 1
-# ./run_bm.sh asprilo-abc nc 30 1
+./run_bm.sh asprilo-abc afw 25 1
+./run_bm.sh asprilo-abc afw 26 1
+./run_bm.sh asprilo-abc afw 27 1
+./run_bm.sh asprilo-abc afw 28 1
+./run_bm.sh asprilo-abc afw 29 1
+./run_bm.sh asprilo-abc afw 30 1
+
+./run_bm.sh asprilo-abc telingo 24 1
+./run_bm.sh asprilo-abc telingo 25 1
+./run_bm.sh asprilo-abc telingo 26 1
+./run_bm.sh asprilo-abc telingo 27 1
+./run_bm.sh asprilo-abc telingo 28 1
+./run_bm.sh asprilo-abc telingo 29 1
+./run_bm.sh asprilo-abc telingo 30 1
+
+./run_bm.sh asprilo-abc dfa-mso 24 1
+./run_bm.sh asprilo-abc dfa-mso 25 1
+./run_bm.sh asprilo-abc dfa-mso 26 1
+./run_bm.sh asprilo-abc dfa-mso 27 1
+./run_bm.sh asprilo-abc dfa-mso 28 1
+./run_bm.sh asprilo-abc dfa-mso 29 1
+./run_bm.sh asprilo-abc dfa-mso 30 1
+
+./run_bm.sh asprilo-abc dfa-stm 24 1
+./run_bm.sh asprilo-abc dfa-stm 25 1
+./run_bm.sh asprilo-abc dfa-stm 26 1
+./run_bm.sh asprilo-abc dfa-stm 27 1
+./run_bm.sh asprilo-abc dfa-stm 28 1
+./run_bm.sh asprilo-abc dfa-stm 29 1
+./run_bm.sh asprilo-abc dfa-stm 30 1
+
+./run_bm.sh asprilo-abc nc 24 1
+./run_bm.sh asprilo-abc nc 25 1
+./run_bm.sh asprilo-abc nc 26 1
+./run_bm.sh asprilo-abc nc 27 1
+./run_bm.sh asprilo-abc nc 28 1
+./run_bm.sh asprilo-abc nc 29 1
+./run_bm.sh asprilo-abc nc 30 1
 
 
 python size-table.py
 
-# make clean -s
+make clean -s
 
-# cd ..
-# make clean -s
+cd ..
+make clean -s