Added clean script

clean.sh

@@ -0,0 +1,4 @@
+rm -rf simulators
+
+rm -rf devstone/*/build
+

devstone_comparative.py

@@ -4,6 +4,7 @@ import re
 import subprocess
 import sys
 import time
+import os
 
 sys.setrecursionlimit(10000)
 
@@ -13,14 +14,14 @@ XDEVS_PYTHON_CMD = "python3 simulators/xdevs-python/perfdevs/examples/devstone/m
 XDEVS_PYTHON_F_CMD = "python3 simulators/xdevs-python/perfdevs/examples/devstone/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles} -f"
 XDEVS_PYTHON_C_CMD = "python3 simulators/xdevs-python/perfdevs/examples/devstone/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles} -c"
 XDEVS_PYTHON_FC_CMD = "python3 simulators/xdevs-python/perfdevs/examples/devstone/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles} -f -c"
-XDEVS_JAVA_CMD = "java -classpath simulators/xdevs-java/out/production/xdevs xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} coord false"
-XDEVS_JAVA_CHAINED_CMD = "java -classpath simulators/xdevs-java/out/production/xdevs xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} chained false"
-XDEVS_JAVA_PARALLEL_CMD = "java -classpath simulators/xdevs-java/out/production/xdevs xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} parallel false"
-XDEVS_JAVA_PARALLEL_CHAINED_CMD = "java -classpath simulators/xdevs-java/out/production/xdevs xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} chainedparallel false"
+XDEVS_JAVA_CMD = "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} coord false"
+XDEVS_JAVA_CHAINED_CMD = "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} chained false"
+XDEVS_JAVA_PARALLEL_CMD = "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} parallel false"
+XDEVS_JAVA_PARALLEL_CHAINED_CMD = "java -classpath simulators/xdevs-java/out/ xdevs.core.devstone.DEVStone {model_type} {depth} {width} {int_cycles} {ext_cycles} chainedparallel false"
 PYPDEVS_CMD = "python3 devstone/pythonpdevs/main.py -m {model_type} -d {depth} -w {width} -i {int_cycles} -e {ext_cycles}"
 PYPDEVS_MIN_CMD = ""
 CADMIUM_CMD = "devstone/cadmium/build/cadmium-dynamic-devstone --kind={model_type} --depth={depth} --width={width} --int-cycles={int_cycles} --ext-cycles={ext_cycles} --event-list=events_devstone.txt"
-CADMIUM_CONC_CMD = "devstone/cadmium/build/cadmium-dynamic-conc-devstone --kind={model_type} --depth={depth} --width={width} --int-cycles={int_cycles} --ext-cycles={ext_cycles} --event-list=events_devstone.txt --threads=" + threads
+CADMIUM_CONC_CMD = "devstone/cadmium/build/cadmium-dynamic-conc-devstone --kind={model_type} --depth={depth} --width={width} --int-cycles={int_cycles} --ext-cycles={ext_cycles} --event-list=events_devstone.txt --threads=" + str(threads)
 CDBOOST_CMD = "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"
 ADEVS_CMD = "devstone/adevs/build/DEVStone"  # TODO
 

setup.sh

@@ -1,6 +1,6 @@
 # DOWNLOAD AND SET ALL THE GIT REPOSITORIES WITH THE SOURCE CODE OF ENGINES
-git submodule --init --recursive
-cd simulators
+#git submodule update --init --recursive
+git submodule update --recursive
 # Set up CDBoost repository
 cd simulators/cdboost
 git checkout 90e7074edb3ab6a655104bbc82adc57fcfafa373
@@ -15,13 +15,14 @@ cd ../xdevs-java
 git checkout 9315e71b46e576b98536150ab52bc900f91e53a8
 # Set up xDEVS Python repository
 cd ../xdevs-python
-git checkout 224482d46a222d5d7c71ad5b2f6b4ba7264a809d
+git checkout e578d581452394556bb0a85f03f5427fd5e72857
 # Set up PythonPDEVS repository
 cd ../pythonpdevs
 git checkout 190a70532a96a76445b007c4e0f9cb5a4ce03e55
-cd ..
+cd ../..
 
 # COMPILE THE DEVSTONE PROJECT FOR ALL THE DIFFERENT ENGINES
+cd devstone
 # Set up aDEVS project
 cd adevs
 mkdir build
@@ -29,15 +30,24 @@ cd build
 cmake ..
 make
 # Set up Cadmium project
-cd ../cadmium
+cd ../../cadmium
 mkdir build
 cd build
 cmake ..
 make
 # Set up CDBoost project
-cd ../cdboost
+cd ../../cdboost
 mkdir build
 cd build
 cmake ..
 make
-
+# Compile xDEVS java
+cd ../../../simulators/xdevs-java
+find -name "*.java" | grep src/* > sources.txt
+javac @sources.txt -d out
+# build xDEVS Python
+cd ../xdevs-python
+python3 setup.py install
+# build PythonPDEVS
+cd ../pythonpdevs/src
+python3 setup.py install --user

simulators/adevs

@@ -1 +0,0 @@
-Subproject commit ae4ed330151416f20366d04074e3b1e38e08beec

simulators/cadmium

@@ -1 +0,0 @@
-Subproject commit b6636f791d3fbff41b6b72e1d9e34ce18152065d

simulators/cdboost

@@ -1 +0,0 @@
-Subproject commit 90e7074edb3ab6a655104bbc82adc57fcfafa373

simulators/pythonpdevs

@@ -1 +0,0 @@
-Subproject commit 190a70532a96a76445b007c4e0f9cb5a4ce03e55

simulators/xdevs-java

@@ -1 +0,0 @@
-Subproject commit 9315e71b46e576b98536150ab52bc900f91e53a8

simulators/xdevs-python

@@ -1 +0,0 @@
-Subproject commit d900b34b9af3cb81c7f2eab8d860d04f21fa2a79