updated paths for result storing

benchmarks/testPyPDEVS.py

@@ -100,14 +100,14 @@ def run_devstone(model_type, depth, width, mode, out, memory, stats, DCP, *, cla
     return None, None, None
 
 def defaultArguments(parser):
-    parser.add_argument("-p", "--path", type=Path, default=Path("./Results-PyPDEVS"), help="Path to the results directory")
+    parser.add_argument("-p", "--path", type=Path, default=Path("./Results/PyPDEVS"), help="Path to the results directory")
     parser.add_argument("-f", '--filename', type=str, default="", help="Name of the output file")
     parser.add_argument("-a", "--append", action="store_true", help="Append to the output file instead of overwriting.")
 
-    parser.add_argument("-md", "--max-depth", default=8, type=int, help="Max depth for the generated models")
+    parser.add_argument("-D", "--max-depth", default=8, type=int, help="Max depth for the generated models")
     parser.add_argument("-ds", "--depth-stepsize", type=int, help="Determines for which depths a model is generated.")
 
-    parser.add_argument("-mw", "--max-width", default=8, type=int, help="Max width for the generated models")
+    parser.add_argument("-W", "--max-width", default=8, type=int, help="Max width for the generated models")
     parser.add_argument("-ws", "--width-stepsize", type=int, help="Determines for which depths a model is generated.")
 
     parser.add_argument("-r", "--repetitions", default=1, type=int, help="The number of times a simulation is repeated")

plotting Agents.md

@@ -0,0 +1,7 @@
+m=./benchmarks/Results/PyPDEVS/Time/minimal
+p=./benchmarks/Results/PyPDEVS/Time/parallel
+a=./benchmarks/Results/Agents/Time/parallel
+
+nohup uv run benchmarks/compare.py param $m/LI.csv $p/LI.csv $a/LI.csv -w 100 -p Agents/LI > /dev/null 2>&1 &
+nohup uv run benchmarks/compare.py param $m/LI.csv $p/LI.csv $a/LI.csv -d 100 -p Agents/LI > /dev/null 2>&1 &
+nohup uv run benchmarks/compare.py total $m/LI.csv $p/LI.csv $a/LI.csv -p Agents/LI > /dev/null 2>&1 &

plotting PyPDEVS.md

@@ -3,8 +3,8 @@
 
 ### Regular Models vs Dynamic Models with OLD DCP
 ````bash
-d=./benchmarks/Results-PyPDEVS/Time/dynamic
-do=./benchmarks/Results-PyPDEVS/Time/dynamic-old
+d=./benchmarks/Results/PyPDEVS/Time/dynamic
+do=./benchmarks/Results/PyPDEVS/Time/dynamic-old
 nohup uv run benchmarks/compare.py param $d/LI.csv $do/dLI.csv -w 100 -p dynamic/old > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $d/LI.csv $do/dLI.csv -d 100 -p dynamic/old > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $d/LI.csv $do/dLI.csv -p dynamic/old > /dev/null 2>&1 &
@@ -20,7 +20,7 @@ nohup uv run benchmarks/compare.py total $d/HO.csv $do/dHO.csv -p dynamic/old >
 
 ### Regular Models vs Dynamic Models
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv -w 100 -p dynamic > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv -d 100 -p dynamic > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv -p dynamic > /dev/null 2>&1 &
@@ -36,7 +36,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv -p dynamic > /
 
 ### Multi-Gen Dynamic
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv -w 100 -p dynamic/multi-gen > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv -d 100 -p dynamic/multi-gen > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/dLI-2.csv -p dynamic/multi-gen > /dev/null 2>&1 &
@@ -52,7 +52,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/dHO-2.csv
 
 ### Modified Dynamic
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/mdLI.csv -w 100 -p dynamic/modified > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/mdLI.csv -d 100 -p dynamic/modified > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/mdLI.csv -p dynamic/modified > /dev/null 2>&1 &
@@ -68,7 +68,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/mdHO.csv
 
 ### Regular Models vs Dynamic Models
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic
 nohup uv run benchmarks/compare.py param $src/dLI.csv $src/dLI-memoised.csv -w 100 -p dynamic/memoised > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/dLI.csv $src/dLI-memoised.csv -d 100 -p dynamic/memoised > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/dLI.csv $src/dLI-memoised.csv -p dynamic/memoised > /dev/null 2>&1 &
@@ -84,7 +84,7 @@ nohup uv run benchmarks/compare.py total $src/dHO.csv $src/dHO-memoised.csv -p d
 
 ### Compared
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -w 100 -p dynamic/compared > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -d 100 -p dynamic/compared > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -p dynamic/compared > /dev/null 2>&1 &
@@ -101,7 +101,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/dHO-2.csv
 ## Dynamic Classic
 ### Regular Models vs Dynamic Models
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic-classic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic-classic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv -w 100 -p dynamic-classic > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv -d 100 -p dynamic-classic > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv -p dynamic-classic > /dev/null 2>&1 &
@@ -117,7 +117,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv -p dynamic-cla
 
 ### Multi-Gen Dynamic
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic-classic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic-classic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv -w 100 -p dynamic-classic/multi-gen > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv -d 100 -p dynamic-classic/multi-gen > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/dLI-2.csv -p dynamic-classic/multi-gen > /dev/null 2>&1 &
@@ -133,7 +133,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/dHO-2.csv
 
 ### Modified Dynamic
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic-classic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic-classic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/mdLI.csv -w 100 -p dynamic-classic/modified > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/mdLI.csv -d 100 -p dynamic-classic/modified > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/mdLI.csv -p dynamic-classic/modified > /dev/null 2>&1 &
@@ -149,7 +149,7 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/mdHO.csv
 
 ### Compared
 ```bash
-src=./benchmarks/Results-PyPDEVS/Time/dynamic-classic
+src=./benchmarks/Results/PyPDEVS/Time/dynamic-classic
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -w 100 -p dynamic-classic/compared > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -d 100 -p dynamic-classic/compared > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $src/LI.csv $src/dLI.csv $src/dLI-2.csv $src/mdLI.csv -p dynamic-classic/compared > /dev/null 2>&1 &
@@ -165,11 +165,11 @@ nohup uv run benchmarks/compare.py total $src/HO.csv $src/dHO.csv $src/dHO-2.csv
 
 ## Comparison between Simulators
 ```bash
-m=./benchmarks/Results-PyPDEVS/Time/minimal
-c=./benchmarks/Results-PyPDEVS/Time/classic
-p=./benchmarks/Results-PyPDEVS/Time/parallel
-d=./benchmarks/Results-PyPDEVS/Time/dynamic
-dc=./benchmarks/Results-PyPDEVS/Time/dynamic-classic
+m=./benchmarks/Results/PyPDEVS/Time/minimal
+c=./benchmarks/Results/PyPDEVS/Time/classic
+p=./benchmarks/Results/PyPDEVS/Time/parallel
+d=./benchmarks/Results/PyPDEVS/Time/dynamic
+dc=./benchmarks/Results/PyPDEVS/Time/dynamic-classic
 nohup uv run benchmarks/compare.py param $m/LI.csv $p/LI.csv $d/LI.csv $dc/LI.csv -w 100 -p LI > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py param $m/LI.csv $p/LI.csv $d/LI.csv $dc/LI.csv -d 100 -p LI > /dev/null 2>&1 &
 nohup uv run benchmarks/compare.py total $m/LI.csv $p/LI.csv $d/LI.csv $dc/LI.csv -p LI > /dev/null 2>&1 &
@@ -189,7 +189,7 @@ nohup uv run benchmarks/compare.py total $m/HOmod.csv $p/HOmod.csv $d/HOmod.csv
 
 # Plotting Memory Usage of the different models
 ```bash
-SRC=./benchmarks/Results-PyPDEVS/Memory/dynamic
+SRC=./benchmarks/Results/PyPDEVS/Memory/dynamic
 nohup uv run benchmarks/compareMemory.py $SRC/LI.sqlite -tu m -p dynamic > /dev/null 2>&1 &
 nohup uv run benchmarks/compareMemory.py $SRC/LI.sqlite $SRC/dLI.sqlite -tu m -p dynamic > /dev/null 2>&1 &
 nohup uv run benchmarks/compareMemory.py $SRC/dLI.sqlite $SRC/dLI-2.sqlite -tu m -p dynamic > /dev/null 2>&1 &
@@ -211,10 +211,10 @@ nohup uv run benchmarks/compareMemory.py $SRC/dHO.sqlite $SRC/dHO-2.sqlite $SRC/
 
 ## Memory Comparison between Simulators
 ```bash
-m=./benchmarks/Results-PyPDEVS/Memory/minimal
-p=./benchmarks/Results-PyPDEVS/Memory/parallel
-d=./benchmarks/Results-PyPDEVS/Memory/dynamic
-dc=./benchmarks/Results-PyPDEVS/Memory/dynamic-classic
+m=./benchmarks/Results/PyPDEVS/Memory/minimal
+p=./benchmarks/Results/PyPDEVS/Memory/parallel
+d=./benchmarks/Results/PyPDEVS/Memory/dynamic
+dc=./benchmarks/Results/PyPDEVS/Memory/dynamic-classic
 nohup uv run benchmarks/compareMemory.py $m/LI.sqlite $p/LI.sqlite $d/LI.sqlite $dc/LI.sqlite -n "LI-compared" > /dev/null 2>&1 &
 nohup uv run benchmarks/compareMemory.py $m/HI.sqlite $p/HI.sqlite $d/HI.sqlite $dc/HI.sqlite -n "HI-compared" > /dev/null 2>&1 &
 nohup uv run benchmarks/compareMemory.py $m/HO.sqlite $p/HO.sqlite $d/HO.sqlite $dc/HO.sqlite -n "HO-compared" > /dev/null 2>&1 &