Browse Source

Update the wrapper with model_move (and fixed missing file in bootstrap)

Yentl Van Tendeloo 7 years ago
parent
commit
437d2077e9
5 changed files with 239 additions and 172 deletions
  1. BIN
      bootstrap/bootstrap.m.gz
  2. 11 0
      bootstrap/main.alc
  3. 20 0
      wrappers/classes/modelverse.xml
  4. 4 0
      wrappers/modelverse.py
  5. 204 172
      wrappers/modelverse_SCCD.py

BIN
bootstrap/bootstrap.m.gz


+ 11 - 0
bootstrap/main.alc

@@ -0,0 +1,11 @@
+include "bootstrap/primitives.alc"
+include "utils.alh"
+include "core_algorithm.alh"
+include "task_manager.alh"
+
+Void function __main():
+	if (get_taskname() == "task_manager"):
+		task_management()
+	else:
+		new_task()
+	return!

+ 20 - 0
wrappers/classes/modelverse.xml

@@ -353,6 +353,20 @@
                         </state>
                     </state>
 
+                    <state id="model_move">
+                        <onentry>
+                            <raise event="request">
+                                <parameter expr="['model_move', self.parameters[0], self.parameters[1]]"/>
+                            </raise>
+                        </onentry>
+
+                        <transition cond="self.expect_response('Success')" target="../../wait_for_action/history">
+                            <raise event="result">
+                                <parameter expr="None"/>
+                            </raise>
+                        </transition>
+                    </state>
+
                     <state id="model_delete">
                         <onentry>
                             <raise event="request">
@@ -1557,6 +1571,12 @@
                             </script>
                         </transition>
 
+                        <transition cond="self.expect_action(None, 'model_move')" target="../../operations/model_move">
+                            <script>
+                                self.load_action(None)
+                            </script>
+                        </transition>
+
                         <transition cond="self.expect_action(None, 'model_delete')" target="../../operations/model_delete">
                             <script>
                                 self.load_action(None)

+ 4 - 0
wrappers/modelverse.py

@@ -227,6 +227,10 @@ def model_add(model_name, metamodel_name, model_code=""):
     INPUT("model_add", None, [model_name, metamodel_name, model_code])
     return OUTPUT()
 
+def model_move(source_name, target_name):
+    INPUT("model_move", None, [source_name, target_name])
+    return OUTPUT()
+
 def model_delete(model_name):
     INPUT("model_delete", None, [model_name])
     return OUTPUT()

File diff suppressed because it is too large
+ 204 - 172
wrappers/modelverse_SCCD.py