setup.sh and clean.sh updated

.gitignore

@@ -8,3 +8,5 @@ bin/
 .DS_Store
 
 __pycache__
+
+.python-version

devstone_comparative.py

@@ -22,7 +22,6 @@ COMMANDS = {
             "parallel": "simulators/cadmium_v2/bin/parallel_main_devstone {model_type} {width} {depth} {int_cycles} {ext_cycles}",
         },
     },
-    "cdboost": "devstone/cdboost/build/cdboost-devstone --kind={model_type} --depth={depth} --width={width} --int-cycles={int_cycles} --ext-cycles={ext_cycles} --event-list=events_devstone.txt",
     "pypdevs": {
         "standard": {
             "python": "python3 devstone/pythonpdevs/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}",
@@ -34,13 +33,14 @@ COMMANDS = {
         },
     },
     "xdevs": {
-        "cpp": "simulators/xdevs-c++/src/xdevs/examples/DevStone/DevStone -w {width} -d {depth} -b {model_type} -m 1",
+        "c": "simulators/xdevs.c",
+        "cpp": "simulators/xdevs-c++/src/xdevs/examples/DevStone/DevStone -w {width} -d {depth} -b {model_type} -m 1",  # TODO
         # "go": ,  # TODO add this
         "java": {
-            "sequential": "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} coord false",
-            "parallel": "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} parallel false",
+            "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}",
+        "py": "python3 simulators/xdevs-python/perfdevs/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

@@ -10,7 +10,6 @@ git checkout devel # TODO set to a specific commit when available
 # Set up PythonPDEVS repository
 cd ../pythonpdevs
 git checkout 50164a92c6
-cd ../..
 # Set up xDEVS C repository
 cd ../xdevs.c
 git checkout 9c2a54ddd671a790528f6ba4d5a71c2732a431dd
@@ -56,9 +55,10 @@ make
 # TODO xDEVS C#
 # TODO xDEVS Go
 # Compile xDEVS java
-cd ../../../../../simulators/xdevs.java
-find -name "*.java" | grep src/* > sources.txt
-javac @sources.txt -encoding ISO-8859-1 -d out
+cd ../../../../../xdevs.java
+mvn clean
+mvn compile
+mvn package
 # Install xDEVS Python
 cd ../xdevs.py
 python3 setup.py install