Upgrading xDEVS rust version

Dockerfile

@@ -5,12 +5,14 @@ RUN apt-get update && apt-get install -y \
   cmake \
   curl \
   git \
-  openjdk-11-jdk-headless \
+  default-jdk \
   libboost-all-dev \
-  python3.8 \
+  maven \
+  python3 \
   python3-pip \
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+RUN source "$HOME/.cargo/env"
 RUN rustup update
 RUN pip3 install setuptools flask
 

annsim2023.py

@@ -2,15 +2,15 @@ import subprocess
 
 
 if __name__ == '__main__':
-    a = "adevs,xdevs-c,xdevs-cpp,xdevs-rs,xdevs-java-sequential"
+    a = "adevs,xdevs-c,xdevs-rs,xdevs-cpp,xdevs-java-sequential"
     models = [['LI', 'HI', 'HO'], ['HOmod']]
-    sizes = [list(range(20, 401, 20)), list(range(10, 101, 10))]
+    sizes = [list(range(20, 401, 20)), list(range(5, 51, 5))]
     p = []
     for i, models in enumerate(models):
         p.extend([f'{m}-{w}-{d}-0-0' for m in models for w in sizes[i] for d in sizes[i]])
     p = ','.join(p)
     n = 30
-    o = "annsim2023.csv"
+    o = "results.csv"
 
     cmd = f"python3 devstone_comparative.py -a {a} -p {p} -n {n} -o {o}"
     subprocess.run(cmd.split())

setup.sh

@@ -14,54 +14,54 @@ git checkout 50164a92c6
 cd ../xdevs.c
 git checkout 9c2a54ddd671a790528f6ba4d5a71c2732a431dd
 # Set up xDEVS C++ repository
-cd ../xdevs.cpp
+cd ../xdevs.cpp || exit
 git checkout 4a5b9cf7b6498e88e760dfba177a761240999955
 # TODO xDEVS C#
 # TODO xDEVS Go
 # Set up xDEVS Java repository
-cd ../xdevs.java
+cd ../xdevs.java || exit
 git checkout 94b7d15ab3e79220e8145f9576e69948db4b4fb6
 # Set up xDEVS Python repository
-cd ../xdevs.py
+cd ../xdevs.py || exit
 git checkout b53a6f170350af8296af43d1b2334e173e95990c
 # Set up xDEVS Rust repository
-cd ../xdevs.rs
-git checkout 9105a2ebbfb176c7333e3765ac2c79d52a2cc03b
+cd ../xdevs.rs || exit
+git checkout 7d4179e61e44f53bb67e2a32abdb3a1ca41752af
 # Go back to root directory
 cd ../..
 
 # COMPILE THE DEVSTONE PROJECT FOR ALL THE DIFFERENT ENGINES
 # Compile DEVStone for aDEVS
-cd devstone/adevs
+cd devstone/adevs || exit
 cmake -S . -B build/ -D CMAKE_BUILD_TYPE=Release
 cmake --build build/ --target devstone
 # Compile DEVStone for Cadmium v1
-cd ../cadmium
+cd ../cadmium || exit
 cmake -S . -B build/ -D CMAKE_BUILD_TYPE=Release
 cmake --build build/ --target devstone
 # Compile DEVStone for Cadmium v2
-cd ../../simulators/cadmium_v2
+cd ../../simulators/cadmium_v2 || exit
 cmake -S . -B build/ -D CMAKE_BUILD_TYPE=Release
 cmake --build build/ --target main_devstone parallel_main_devstone
 # Install PythonPDEVS
-cd ../pythonpdevs/src
+cd ../pythonpdevs/src || exit
 python3 setup.py install --user  # TODO this fails
 # Compile DEVStone for xDEVS C
-cd ../../xdevs.c/examples/devstone/
+cd ../../xdevs.c/examples/devstone/ || exit
 make
 # Compile DEVStone for xDEVS C++
-cd ../../../xdevs.cpp/src/xdevs/examples/DevStone/
+cd ../../../xdevs.cpp/src/xdevs/examples/DevStone/ || exit
 make
 # TODO xDEVS C#
 # TODO xDEVS Go
 # Compile xDEVS java
-cd ../../../../../xdevs.java
+cd ../../../../../xdevs.java || exit
 mvn clean
 mvn compile
 mvn package
 # Install xDEVS Python
-cd ../xdevs.py
+cd ../xdevs.py || exit
 python3 setup.py install
 # Compile DEVStone for xDEVS Rust
-cd ../xdevs.rs
+cd ../xdevs.rs || exits
 cargo build --release