Updating xDEVS Python version

devstone_comparative.py

@@ -16,7 +16,7 @@ RE_SIM_TIMES = r"Model creation time: ?([0-9.e-]+) ?.*Engine set ?up time: ?([0-
 COMMANDS = {
     "adevs": "devstone/adevs/bin/devstone {model_type} {width} {depth} {int_cycles} {ext_cycles}",
     "cadmium": {
-        "v1": "devstone/cadmium/build/cadmium-dynamic-devstone --kind={model_type} --depth={depth} --width={width} --int-cycles={int_cycles} --ext-cycles={ext_cycles}",
+        "v1": "devstone/cadmium/build/cadmium-dynamic-devstone --kind={model_type} --width={width} --depth={depth} --int-cycles={int_cycles} --ext-cycles={ext_cycles}",
         "v2": {
             "sequential": "simulators/cadmium_v2/bin/main_devstone {model_type} {width} {depth} {int_cycles} {ext_cycles}",
             "parallel": "simulators/cadmium_v2/bin/parallel_main_devstone {model_type} {width} {depth} {int_cycles} {ext_cycles}",
@@ -24,8 +24,8 @@ COMMANDS = {
     },
     "pypdevs": {
         "standard": {
-            "python": "python3 devstone/pythonpdevs/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",
-            "pypy": "pypy3 devstone/pythonpdevs/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",
+            "python": "python3 devstone/pythonpdevs/main.py -m {model_type} -w {width} -d {depth} -i {int_cycles} -e {ext_cycles}",
+            "pypy": "pypy3 devstone/pythonpdevs/main.py -m {model_type} -w {width} -d {depth} -i {int_cycles} -e {ext_cycles}",
         },
         "minimal": {
             "python": "python3 devstone/pythonpdevs-minimal/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",
@@ -33,14 +33,14 @@ COMMANDS = {
         },
     },
     "xdevs": {
-        "c": "simulators/xdevs.c",
-        "cpp": "simulators/xdevs-c++/src/xdevs/examples/DevStone/DevStone -w {width} -d {depth} -b {model_type} -m 1",  # TODO
+        "c": "simulators/xdevs.c/examples/devstone/devstone -w {width} -d {depth} -b {model_type} -m 1",
+        "cpp": "simulators/xdevs-c++/src/xdevs/examples/DevStone/DevStone -w {width} -d {depth} -b {model_type} -m 1",
         # "go": ,  # TODO add this
         "java": {
             "sequential": "java -cp simulators/xdevs.java/target/xdevs-2.0.1-jar-with-dependencies.jar xdevs.lib.performance.DevStoneSimulation --model={model_type} --width={width} --depth={depth} --delay-distribution=Constant-{int_cycles} --coordinator=Coordinator",
             "parallel": "java -cp simulators/xdevs.java/target/xdevs-2.0.1-jar-with-dependencies.jar xdevs.lib.performance.DevStoneSimulation --model={model_type} --width={width} --depth={depth} --delay-distribution=Constant-{int_cycles} --coordinator=CoordinatorParallel",
         },
-        "py": "python3 simulators/xdevs-python/perfdevs/examples/devstone/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",  # TODO
+        "py": "python3 simulators/xdevs.py/xdevs/examples/devstone/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",  # TODO
         "rs": "cargo run --release --manifest-path simulators/xdevs.rs/Cargo.toml {model_type} {width} {depth} {int_cycles} {ext_cycles}",
     },
 }

setup.sh

@@ -23,7 +23,7 @@ cd ../xdevs.java
 git checkout 9482cf31a873b63f529aa328e913ade9e8edad55
 # Set up xDEVS Python repository
 cd ../xdevs.py
-git checkout 143541d23c48c21f8b2380bdd966384363d306b5
+git checkout b53a6f170350af8296af43d1b2334e173e95990c
 # Set up xDEVS Rust repository
 cd ../xdevs.rs
 git checkout 9105a2ebbfb176c7333e3765ac2c79d52a2cc03b
@@ -45,7 +45,7 @@ cmake -S . -B build/ -D CMAKE_BUILD_TYPE=Release
 cmake --build build/ --target main_devstone parallel_main_devstone
 # Install PythonPDEVS
 cd ../pythonpdevs/src
-python3 setup.py install --user
+python3 setup.py install --user  # TODO this fails
 # Compile DEVStone for xDEVS C
 cd ../../xdevs.c/examples/devstone/
 make

simulators/xdevs.py

@@ -1 +1 @@
-Subproject commit 143541d23c48c21f8b2380bdd966384363d306b5
+Subproject commit b53a6f170350af8296af43d1b2334e173e95990c