Fixed PM2DEVS, still need valid distributions

models/WSC/PM_to_DEVS.mvc

@@ -353,7 +353,7 @@ Composite schedule {
                     $
                 value_parameters = $
                     String function value(model : Element, name : String, mapping : Element):
-                        return "[" + cast_string(set_len(allIncomingAssociationInstances(model, name, "PM/Next"))) + "]"!
+                        return "[" + cast_string(set_len(allIncomingAssociationInstances(model, mapping["0"], "PM/Next"))) + "]"!
                     $
             }
             Post_Trace (post_sync_0, post_sync_1) {

models/WSC/experiment_example.mvc

@@ -8,6 +8,7 @@ def simulate(nresources, seed):
     model = Root('root', [nresources])
     sim = Simulator(model)
     sim.setClassicDEVS()
+    sim.setVerbose()
     sim.simulate()
     return model.submodels['finish'].state
 
@@ -16,7 +17,8 @@ def main():
     for i in range(1, 3):
         results = results + str(i)
         for v in range(1, 3):
-            results = results + ' ' + simulate(i, v)
+            results = results + ' ' + str(simulate(i, v))
+            print(results)
         results = results + '\\n'
     print('Result: ' + results)
     return results

models/WSC/pm_example.mvc

@@ -3,14 +3,14 @@ Initial init {
 }
 Activity req {
     name = "define_requirements"
-    distribution = "lambda iteration: iteration"
+    distribution = "lambda iteration: iteration + 1"
 }
 SimpleMerge merge {
     name = "merge_0"
 }
 Activity model {
     name = "model_system"
-    distribution = "lambda iteration: iteration"
+    distribution = "lambda iteration: iteration + 1"
 }
 ParallelSplit split {
     name = "split_0"
@@ -18,22 +18,22 @@ ParallelSplit split {
 MultiInstance simulate {
     name = "simulate"
     nr_instances = 10
-    distribution = "lambda iteration: iteration"
+    distribution = "lambda iteration: iteration + 1"
 }
 Activity check {
     name = "check"
-    distribution = "lambda iteration: iteration"
+    distribution = "lambda iteration: iteration + 1"
 }
 Synchronization sync {
     name = "sync_0"
 }
 Activity evaluate {
     name = "evaluate"
-    distribution = "lambda iteration: iteration"
+    distribution = "lambda iteration: iteration + 1"
 }
 ExclusiveChoice choice {
     name = "xor_0"
-    distribution = "lambda iteration: 1 - 1/iteration"
+    distribution = "lambda iteration: 1 - 1/(iteration+1)"
 }
 Finish finish {
     name = "finish"

services/DEVS_batch/main.py

@@ -15,8 +15,7 @@ def pypdevs_service(port):
         f.write(experiment)
 
     main = getattr(__import__(model_name), "main")
-    for i in main():
-        service_set(port, i)
+    service_set(port, main())
 try:
     init(sys.argv[1])
     login("pypdevs_batch_service", "my_password")

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Tue May 15 15:50:20 2018
+Date:   Tue May 15 16:13:15 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server