Add query metamodel

integration/test_mvc.py

@@ -2151,33 +2151,25 @@ class TestModelverseCore(unittest.TestCase):
                     "SimpleClassDiagrams",
                     "PW_Plant",
                     ] + get_model_constructor(open("models/plant_PW.mvc", "r").read()) + [
-                "model_add",
-                    "PW_Plant",
-                    "plant_model",
-                    ] + get_model_constructor(open("models/plant_model.mvc", "r").read()) + [
                 "model_add",
                     "SimpleClassDiagrams",
                     "PW_Environment",
                     ] + get_model_constructor(open("models/environment_PW.mvc", "r").read()) + [
-                "model_add",
-                    "PW_Environment",
-                    "environment_model",
-                    ] + get_model_constructor(open("models/environment_model.mvc", "r").read()) + [
                 "model_add",
                     "SimpleClassDiagrams",
                     "PW_Control",
                     ] + get_model_constructor(open("models/control_PW.mvc", "r").read()) + [
                 "model_add",
-                    "PW_Control",
-                    "control_model",
-                    ] + get_model_constructor(open("models/control_model.mvc", "r").read()) + [
+                    "SimpleClassDiagrams",
+                    "Requirements",
+                    ] + get_model_constructor(open("models/requirements.mvc", "r").read()) + [
                 "model_list",
                 "transformation_add_MT_language",
                 "PetriNet",
                 "Encapsulated_PetriNet",
                 "PW_Plant",
-                "PW_Environment",
                 "PW_Control",
+                "Requirements",
                 "ReachabilityGraph",
                 "",
                 "All_RAM",
@@ -2234,9 +2226,7 @@ class TestModelverseCore(unittest.TestCase):
                      "  PW_Plant : SimpleClassDiagrams",
                      "  PW_Environment : SimpleClassDiagrams",
                      "  PW_Control : SimpleClassDiagrams",
-                     "  plant_model : PW_Plant",
-                     "  control_model : PW_Control",
-                     "  environment_model : PW_Environment",
+                     "  Requirements : SimpleClassDiagrams",
                      "  ReachabilityGraph : SimpleClassDiagrams",]),
                 "Ready for command...",
                 # transformation_add_MT_language
@@ -2256,6 +2246,7 @@ class TestModelverseCore(unittest.TestCase):
                 set(["  PetriNet",
                      "  Encapsulated_PetriNet",
                      "  PW_Plant",
+                     "  Requirements",
                      "  PW_Environment",
                      "  PW_Control",
                      "  ReachabilityGraph",
@@ -2282,7 +2273,6 @@ class TestModelverseCore(unittest.TestCase):
                 set(["  PetriNet",
                      "  Encapsulated_PetriNet",
                      "  PW_Plant",
-                     "  PW_Environment",
                      "  PW_Control",
                      "  ReachabilityGraph",
                     ]),

models/query.mvc

@@ -0,0 +1,20 @@
+include "primitives.alh"
+include "object_operations.alh"
+include "modelling.alh"
+
+SimpleClassDiagrams Query {
+    SimpleAttribute String {}
+    SimpleAttribute Natural {}
+
+    Class State {
+        name : String
+    }
+    Class Place {
+        name : String
+        tokens : Natural
+    }
+    Association Transition (State, State) {
+        name : String
+    }
+    Association Contains (State, Place) {}
+}