Browse Source

Fix FSA live modelling

Yentl Van Tendeloo 7 years ago
parent
commit
e00f901c5a
3 changed files with 21 additions and 4 deletions
  1. 1 1
      examples/live_modelling_DTCBD.py
  2. 19 2
      examples/live_modelling_FSA.py
  3. 1 1
      wrappers/modelverse_SCCD.py

+ 1 - 1
examples/live_modelling_DTCBD.py

@@ -30,7 +30,7 @@ transformation_add_AL({}, {}, "models/DTCBD/restartSim", open("models/generic/re
 model_add("models/live_modelling_DTCBD", "formalisms/ProcessModel", open("models/DTCBD/PM_live_modelling.mvc", 'r').read())
 model_add("models/live_modelling_DTCBD", "formalisms/ProcessModel", open("models/DTCBD/PM_live_modelling.mvc", 'r').read())
 
 
 def modify_model(model):
 def modify_model(model):
-    time.sleep(5)
+    time.sleep(10)
 
 
     if len(all_instances(model, "Design/ProbeBlock")) > 2:
     if len(all_instances(model, "Design/ProbeBlock")) > 2:
         import time
         import time

+ 19 - 2
examples/live_modelling_FSA.py

@@ -11,7 +11,7 @@ model_add("formalisms/FSA/Design_MM", "formalisms/SimpleClassDiagrams", open("mo
 model_add("formalisms/FSA/PartialRuntime_MM", "formalisms/SimpleClassDiagrams", open("models/FiniteStateAutomata/metamodels/FSA_MM_partial_runtime.mvc", 'r').read())
 model_add("formalisms/FSA/PartialRuntime_MM", "formalisms/SimpleClassDiagrams", open("models/FiniteStateAutomata/metamodels/FSA_MM_partial_runtime.mvc", 'r').read())
 model_add("formalisms/FSA/FullRuntime_MM", "formalisms/SimpleClassDiagrams", open("models/FiniteStateAutomata/metamodels/FSA_MM_runtime.mvc", 'r').read())
 model_add("formalisms/FSA/FullRuntime_MM", "formalisms/SimpleClassDiagrams", open("models/FiniteStateAutomata/metamodels/FSA_MM_runtime.mvc", 'r').read())
 
 
-model_add("models/FSA_model", "formalisms/FSA/Design_MM", open("models/FiniteStateAutomata/models/alarms.mvc", 'r').read())
+model_add("models/FSA_model", "formalisms/FSA/Design_MM", open("models/FiniteStateAutomata/models/alarm.mvc", 'r').read())
 
 
 transformation_add_MANUAL({"Design": "formalisms/FSA/Design_MM"}, {"Design": "formalisms/FSA/Design_MM"}, "models/FSA/edit")
 transformation_add_MANUAL({"Design": "formalisms/FSA/Design_MM"}, {"Design": "formalisms/FSA/Design_MM"}, "models/FSA/edit")
 
 
@@ -27,4 +27,21 @@ transformation_add_AL({"PartialRuntime": "formalisms/FSA/PartialRuntime_MM", "Fu
 transformation_add_AL({"FullRuntime": "formalisms/FSA/FullRuntime_MM"}, {"FullRuntime": "formalisms/FSA/FullRuntime_MM"}, "models/FSA/simulate", open("models/FiniteStateAutomata/transformations/simulate.alc", 'r').read())
 transformation_add_AL({"FullRuntime": "formalisms/FSA/FullRuntime_MM"}, {"FullRuntime": "formalisms/FSA/FullRuntime_MM"}, "models/FSA/simulate", open("models/FiniteStateAutomata/transformations/simulate.alc", 'r').read())
 transformation_add_AL({}, {}, "models/FSA/restartSim", open("models/generic/restart_simulation.alc", 'r').read())
 transformation_add_AL({}, {}, "models/FSA/restartSim", open("models/generic/restart_simulation.alc", 'r').read())
 
 
-model_add("models/live_modelling_FSA", "formalisms/ProcessModel", open("models/FSA/PM_live_modelling.mvc", 'r').read())
+model_add("models/live_modelling_FSA", "formalisms/ProcessModel", open("models/FiniteStateAutomata/PM_live_modelling.mvc", 'r').read())
+
+def modify_model(model):
+    time.sleep(10)
+
+    states = all_instances(model, "Design/State")
+    print("Searching")
+    for state in states:
+        if (read_attrs(model, state)["name"] == "detected"):
+            print("Modified!")
+            delete_element(model, state)
+            break
+    else:
+        print("Nothing to do...")
+        while 1:
+            time.sleep(0.1)
+
+process_execute("models/live_modelling_FSA", {"design_model": "models/FSA_model"}, {"models/FSA/edit": modify_model})

+ 1 - 1
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)
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
 
-Date:   Thu May 17 13:27:44 2018
+Date:   Thu May 17 13:53:07 2018
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
 Model name:   MvK Server