浏览代码

Remove context from actions

Yentl Van Tendeloo 7 年之前
父节点
当前提交
3607613325
共有 2 个文件被更改,包括 24 次插入47 次删除
  1. 11 22
      wrappers/classes/modelverse.xml
  2. 13 25
      wrappers/modelverse_SCCD.py

+ 11 - 22
wrappers/classes/modelverse.xml

@@ -6,7 +6,7 @@
     <method name="load_action">
     <method name="load_action">
         <parameter name="context"/>
         <parameter name="context"/>
         <body>
         <body>
-            action = self.actions[None].pop(0)
+            action = self.actions.pop(0)
             self.parameters = action["parameters"]
             self.parameters = action["parameters"]
             self.current_ID = action["ID"]
             self.current_ID = action["ID"]
             self.action_name = action["name"]
             self.action_name = action["name"]
@@ -67,9 +67,9 @@
         <parameter name="expected"/>
         <parameter name="expected"/>
         <body>
         <body>
             if isinstance(expected, list):
             if isinstance(expected, list):
-                return self.actions[None] and self.actions[None][0]["name"] in expected
+                return self.actions and self.actions[0]["name"] in expected
             else:
             else:
-                return self.actions[None] and self.actions[None][0]["name"] == expected
+                return self.actions and self.actions[0]["name"] == expected
         </body>
         </body>
     </method>
     </method>
 
 
@@ -90,7 +90,7 @@
         <parameter name="taskname" default="None"/>
         <parameter name="taskname" default="None"/>
         <body>
         <body>
             self.controller.taskname = taskname
             self.controller.taskname = taskname
-            self.actions = {None: []}
+            self.actions = []
             self.responses = []
             self.responses = []
             self.http_clients = []
             self.http_clients = []
             self.registered_metamodel = {}
             self.registered_metamodel = {}
@@ -1816,7 +1816,7 @@
                                 <transition cond="self.expect_action(None, 'exit')" target="../../../../leaving_manual"/>
                                 <transition cond="self.expect_action(None, 'exit')" target="../../../../leaving_manual"/>
                                 <transition cond="self.expect_action(None, 'drop')" target="../../../../leaving_manual_drop"/>
                                 <transition cond="self.expect_action(None, 'drop')" target="../../../../leaving_manual_drop"/>
 
 
-                                <transition cond="self.actions[None] and self.actions[None][0]['parameters'][0] != self.current_model" target="../../../../leaving_manual"/>
+                                <transition cond="self.actions and self.actions[0]['parameters'][0] != self.current_model" target="../../../../leaving_manual"/>
                             </state>
                             </state>
 
 
                             <state id="scripted">
                             <state id="scripted">
@@ -1978,27 +1978,16 @@
                             </transition>
                             </transition>
                         </state>
                         </state>
 
 
-                        <transition cond="None is not None and self.actions[None]" target="../history">
-                            <script>
-                                print("Got unexpected operation: " + str(self.actions[None].pop(0)))
-                            </script>
-
-                            <raise event="exception">
-                                <parameter expr="'IllegalContextOperation'"/>
-                                <parameter expr="'Operation not allowed in a context!'"/>
-                            </raise>
-                        </transition>
-
-                        <transition cond="None is None and self.actions[None]" target="../../leaving_manual"/>
+                        <transition cond="self.actions" target="../../leaving_manual"/>
                     </state>
                     </state>
 
 
                     <state id="finished"/>
                     <state id="finished"/>
 
 
                     <history id="history" type="deep"/>
                     <history id="history" type="deep"/>
 
 
-                    <transition cond="None is None and self.actions[None]" target="history">
+                    <transition cond="self.actions" target="history">
                         <script>
                         <script>
-                            print("Got unknown operation: " + str(self.actions[None].pop(0)))
+                            print("Got unknown operation: " + str(self.actions.pop(0)))
                         </script>
                         </script>
 
 
                         <raise event="exception">
                         <raise event="exception">
@@ -2012,7 +2001,7 @@
                     <state id="init">
                     <state id="init">
                         <onentry>
                         <onentry>
                             <script>
                             <script>
-                                self.current_model = self.actions[None][0]["parameters"][0]
+                                self.current_model = self.actions[0]["parameters"][0]
                             </script>
                             </script>
                         </onentry>
                         </onentry>
 
 
@@ -2051,7 +2040,7 @@
 
 
                             <script>
                             <script>
                                 self.responses.pop(0)
                                 self.responses.pop(0)
-                                self.actions[None].pop(0)
+                                self.actions.pop(0)
                             </script>
                             </script>
                         </transition>
                         </transition>
                     </state>
                     </state>
@@ -2096,7 +2085,7 @@
                         <parameter name="context_ID"/>
                         <parameter name="context_ID"/>
                         <parameter name="parameters"/>
                         <parameter name="parameters"/>
                         <script>
                         <script>
-                            self.actions[None].append({"name": action_name, "ID": ID, "parameters": parameters})
+                            self.actions.append({"name": action_name, "ID": ID, "parameters": parameters})
                         </script>
                         </script>
                     </transition>
                     </transition>
 
 

+ 13 - 25
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:   Wed May 23 11:35:42 2018
+Date:   Wed May 23 11:39:36 2018
 
 
 Model author: Yentl Van Tendeloo
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
 Model name:   MvK Server
@@ -45,7 +45,7 @@ class Modelverse(RuntimeClassBase):
     def user_defined_constructor(self, taskname = None):
     def user_defined_constructor(self, taskname = None):
         if taskname == None: taskname = None
         if taskname == None: taskname = None
         self.controller.taskname = taskname
         self.controller.taskname = taskname
-        self.actions = {None: []}
+        self.actions = []
         self.responses = []
         self.responses = []
         self.http_clients = []
         self.http_clients = []
         self.registered_metamodel = {}
         self.registered_metamodel = {}
@@ -58,7 +58,7 @@ class Modelverse(RuntimeClassBase):
     
     
     # user defined method
     # user defined method
     def load_action(self, context):
     def load_action(self, context):
-        action = self.actions[None].pop(0)
+        action = self.actions.pop(0)
         self.parameters = action["parameters"]
         self.parameters = action["parameters"]
         self.current_ID = action["ID"]
         self.current_ID = action["ID"]
         self.action_name = action["name"]
         self.action_name = action["name"]
@@ -108,9 +108,9 @@ class Modelverse(RuntimeClassBase):
     # user defined method
     # user defined method
     def expect_action(self, context, expected):
     def expect_action(self, context, expected):
         if isinstance(expected, list):
         if isinstance(expected, list):
-            return self.actions[None] and self.actions[None][0]["name"] in expected
+            return self.actions and self.actions[0]["name"] in expected
         else:
         else:
-            return self.actions[None] and self.actions[None][0]["name"] == expected
+            return self.actions and self.actions[0]["name"] == expected
     
     
     
     
     # user defined method
     # user defined method
@@ -1806,15 +1806,10 @@ class Modelverse(RuntimeClassBase):
         self.states["/initialized/behaviour/wait_for_action"].addTransition(_initialized_behaviour_wait_for_action_0)
         self.states["/initialized/behaviour/wait_for_action"].addTransition(_initialized_behaviour_wait_for_action_0)
         
         
         # transition /initialized/behaviour/wait_for_action/modelling
         # transition /initialized/behaviour/wait_for_action/modelling
-        _initialized_behaviour_wait_for_action_modelling_0 = Transition(self, self.states["/initialized/behaviour/wait_for_action/modelling"], [self.states["/initialized/behaviour/wait_for_action/history"]])
-        _initialized_behaviour_wait_for_action_modelling_0.setAction(self._initialized_behaviour_wait_for_action_modelling_0_exec)
+        _initialized_behaviour_wait_for_action_modelling_0 = Transition(self, self.states["/initialized/behaviour/wait_for_action/modelling"], [self.states["/initialized/behaviour/leaving_manual"]])
         _initialized_behaviour_wait_for_action_modelling_0.setTrigger(None)
         _initialized_behaviour_wait_for_action_modelling_0.setTrigger(None)
         _initialized_behaviour_wait_for_action_modelling_0.setGuard(self._initialized_behaviour_wait_for_action_modelling_0_guard)
         _initialized_behaviour_wait_for_action_modelling_0.setGuard(self._initialized_behaviour_wait_for_action_modelling_0_guard)
         self.states["/initialized/behaviour/wait_for_action/modelling"].addTransition(_initialized_behaviour_wait_for_action_modelling_0)
         self.states["/initialized/behaviour/wait_for_action/modelling"].addTransition(_initialized_behaviour_wait_for_action_modelling_0)
-        _initialized_behaviour_wait_for_action_modelling_1 = Transition(self, self.states["/initialized/behaviour/wait_for_action/modelling"], [self.states["/initialized/behaviour/leaving_manual"]])
-        _initialized_behaviour_wait_for_action_modelling_1.setTrigger(None)
-        _initialized_behaviour_wait_for_action_modelling_1.setGuard(self._initialized_behaviour_wait_for_action_modelling_1_guard)
-        self.states["/initialized/behaviour/wait_for_action/modelling"].addTransition(_initialized_behaviour_wait_for_action_modelling_1)
         
         
         # transition /initialized/behaviour/wait_for_action/modelling/recognized
         # transition /initialized/behaviour/wait_for_action/modelling/recognized
         _initialized_behaviour_wait_for_action_modelling_recognized_0 = Transition(self, self.states["/initialized/behaviour/wait_for_action/modelling/recognized"], [self.states["/initialized/behaviour/operations/element_list"]])
         _initialized_behaviour_wait_for_action_modelling_recognized_0 = Transition(self, self.states["/initialized/behaviour/wait_for_action/modelling/recognized"], [self.states["/initialized/behaviour/operations/element_list"]])
@@ -2153,7 +2148,7 @@ class Modelverse(RuntimeClassBase):
         self.raiseInternalEvent(Event("request", None, [['service_stop']]))
         self.raiseInternalEvent(Event("request", None, [['service_stop']]))
     
     
     def _initialized_behaviour_going_manual_init_enter(self):
     def _initialized_behaviour_going_manual_init_enter(self):
-        self.current_model = self.actions[None][0]["parameters"][0]
+        self.current_model = self.actions[0]["parameters"][0]
     
     
     def _initialized_behaviour_going_manual_search_enter(self):
     def _initialized_behaviour_going_manual_search_enter(self):
         self.raiseInternalEvent(Event("request", None, [['model_types', self.current_model]]))
         self.raiseInternalEvent(Event("request", None, [['model_types', self.current_model]]))
@@ -2276,21 +2271,14 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('', pop=False)
         return self.expect_response_partial('', pop=False)
     
     
     def _initialized_behaviour_wait_for_action_0_exec(self, parameters):
     def _initialized_behaviour_wait_for_action_0_exec(self, parameters):
-        print("Got unknown operation: " + str(self.actions[None].pop(0)))
+        print("Got unknown operation: " + str(self.actions.pop(0)))
         self.raiseInternalEvent(Event("exception", None, ['UnknownOperation', 'Operation is unknown']))
         self.raiseInternalEvent(Event("exception", None, ['UnknownOperation', 'Operation is unknown']))
     
     
     def _initialized_behaviour_wait_for_action_0_guard(self, parameters):
     def _initialized_behaviour_wait_for_action_0_guard(self, parameters):
-        return None is None and self.actions[None]
-    
-    def _initialized_behaviour_wait_for_action_modelling_0_exec(self, parameters):
-        print("Got unexpected operation: " + str(self.actions[None].pop(0)))
-        self.raiseInternalEvent(Event("exception", None, ['IllegalContextOperation', 'Operation not allowed in a context!']))
+        return self.actions
     
     
     def _initialized_behaviour_wait_for_action_modelling_0_guard(self, parameters):
     def _initialized_behaviour_wait_for_action_modelling_0_guard(self, parameters):
-        return None is not None and self.actions[None]
-    
-    def _initialized_behaviour_wait_for_action_modelling_1_guard(self, parameters):
-        return None is None and self.actions[None]
+        return self.actions
     
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_0_exec(self, parameters):
     def _initialized_behaviour_wait_for_action_modelling_recognized_0_exec(self, parameters):
         self.load_action(None)
         self.load_action(None)
@@ -3351,7 +3339,7 @@ class Modelverse(RuntimeClassBase):
         return self.expect_action(None, 'drop')
         return self.expect_action(None, 'drop')
     
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_manual_2_guard(self, parameters):
     def _initialized_behaviour_wait_for_action_modelling_recognized_manual_2_guard(self, parameters):
-        return self.actions[None] and self.actions[None][0]['parameters'][0] != self.current_model
+        return self.actions and self.actions[0]['parameters'][0] != self.current_model
     
     
     def _initialized_behaviour_wait_for_action_modelling_recognized_scripted_0_exec(self, parameters):
     def _initialized_behaviour_wait_for_action_modelling_recognized_scripted_0_exec(self, parameters):
         self.raiseInternalEvent(Event("request", None, ['exit']))
         self.raiseInternalEvent(Event("request", None, ['exit']))
@@ -3383,7 +3371,7 @@ class Modelverse(RuntimeClassBase):
     def _initialized_behaviour_going_manual_OK_1_exec(self, parameters):
     def _initialized_behaviour_going_manual_OK_1_exec(self, parameters):
         self.raiseInternalEvent(Event("exception", None, ['UnknownMetamodellingHierarchy', 'Conformance relation not found']))
         self.raiseInternalEvent(Event("exception", None, ['UnknownMetamodellingHierarchy', 'Conformance relation not found']))
         self.responses.pop(0)
         self.responses.pop(0)
-        self.actions[None].pop(0)
+        self.actions.pop(0)
     
     
     def _initialized_behaviour_going_manual_OK_1_guard(self, parameters):
     def _initialized_behaviour_going_manual_OK_1_guard(self, parameters):
         return self.expect_response_partial('No conformance relation can be found ', pop=False)
         return self.expect_response_partial('No conformance relation can be found ', pop=False)
@@ -3399,7 +3387,7 @@ class Modelverse(RuntimeClassBase):
         ID = parameters[1]
         ID = parameters[1]
         context_ID = parameters[2]
         context_ID = parameters[2]
         parameters = parameters[3]
         parameters = parameters[3]
-        self.actions[None].append({"name": action_name, "ID": ID, "parameters": parameters})
+        self.actions.append({"name": action_name, "ID": ID, "parameters": parameters})
     
     
     def _initialized_queue_queue_1_exec(self, parameters):
     def _initialized_queue_queue_1_exec(self, parameters):
         parameters = parameters[0]
         parameters = parameters[0]