Browse Source

Minor changes

Román Cárdenas 3 years ago
parent
commit
4d90c6d202
2 changed files with 9 additions and 8 deletions
  1. 8 7
      annsim2023.py
  2. 1 1
      setup.sh

+ 8 - 7
annsim2023.py

@@ -5,12 +5,13 @@ if __name__ == '__main__':
     a = "adevs,xdevs-c,xdevs-rs,xdevs-cpp,xdevs-java-sequential"
     models = [['LI', 'HI', 'HO'], ['HOmod']]
     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 = "results.csv"
+        for m in models:
+            p = []
+            p.extend([f'{m}-{w}-{d}-0-0' for w in sizes[i] for d in sizes[i]])
+            p = ','.join(p)
+            n = 30
+            o = f"results_{m}.csv"
 
-    cmd = f"python3 devstone_comparative.py -a {a} -p {p} -n {n} -o {o}"
-    subprocess.run(cmd.split())
+            cmd = f"python3 devstone_comparative.py -a {a} -p {p} -n {n} -o {o}"
+            subprocess.run(cmd.split())

+ 1 - 1
setup.sh

@@ -63,5 +63,5 @@ mvn package
 cd ../xdevs.py || exit
 python3 setup.py install
 # Compile DEVStone for xDEVS Rust
-cd ../xdevs.rs || exits
+cd ../xdevs.rs || exit
 cargo build --release