Sfoglia il codice sorgente

Add the necessary first building blocks for additional kinds of
transformation

Yentl Van Tendeloo 8 anni fa
parent
commit
70c6331247
3 ha cambiato i file con 21 aggiunte e 16 eliminazioni
  1. 1 0
      core/core_algorithm.alc
  2. 4 0
      core/core_formalism.mvc
  3. 16 16
      integration/test_mvc.py

+ 1 - 0
core/core_algorithm.alc

@@ -350,6 +350,7 @@ Void function user_function_skip_init(user_id : String):
 			output("    transformation_add_MT           -- Initialize a new model transformation")
 			output("    transformation_add_AL           -- [TODO] Initialize a new action language transformation")
 			output("    transformation_add_EXT          -- [TODO] Initialize a new external tool transformation")
+			output("    transformation_add_MANUAL       -- [TODO] Initialize a new manual transformation")
 			output("    transformation_execute          -- Execute a transformation on a set of input models")
 			output("    transformation_list             -- List all model transformations")
 			output("    transformation_list_full        -- List all model transformations with permissions")

+ 4 - 0
core/core_formalism.mvc

@@ -80,6 +80,10 @@ SimpleClassDiagrams CoreFormalism {
 
     Class ActionLanguage : Transformation {}
 
+    Class ExternalTool : Transformation {}
+
+    Class ManualTransformation : Transformation {}
+
     Association transformInput (Model, Transformation) {
         name : String
     }

+ 16 - 16
integration/test_mvc.py

@@ -58,7 +58,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Use the 'help' command for a list of possible commands",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root admin    45   core : CoreFormalism"]),
             ],
             mode))
@@ -95,7 +95,7 @@ class TestModelverseCore(unittest.TestCase):
                      "  core : CoreFormalism"]),
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    0   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
             ],
@@ -140,7 +140,7 @@ class TestModelverseCore(unittest.TestCase):
                      "  core : CoreFormalism"]),
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    0   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -154,7 +154,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Please give your command.",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    1   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -210,7 +210,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    0   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -224,7 +224,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Please give your command.",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    1   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -233,7 +233,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model overwrite success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    2   Empty : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -280,7 +280,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -288,7 +288,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    14   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    328   PetriNets_RAM : SimpleClassDiagrams",
@@ -338,7 +338,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -346,7 +346,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    14   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    328   PetriNets_RAM : SimpleClassDiagrams",
@@ -364,7 +364,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Waiting for model constructors...",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    14   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    14   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    328   PetriNets_RAM : SimpleClassDiagrams",
@@ -419,7 +419,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    22   PetriNets : SimpleClassDiagrams",
                      "  200  root admin    55   core : CoreFormalism"]),
                 "Ready for command...",
@@ -427,7 +427,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    22   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    22   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    352   PetriNets_RAM : SimpleClassDiagrams",
@@ -503,7 +503,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Model upload success!",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    22   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    27   my_pn : PetriNets",
                      "  200  root admin    65   core : CoreFormalism"]),
@@ -512,7 +512,7 @@ class TestModelverseCore(unittest.TestCase):
                 "Name of the RAMified transformation metamodel?",
                 "Ready for command...",
                 set(["  221  root admin    673   SimpleClassDiagrams : SimpleClassDiagrams",
-                     "  221  root admin    86   CoreFormalism : SimpleClassDiagrams",
+                     "  221  root admin    90   CoreFormalism : SimpleClassDiagrams",
                      "  200  root nobody    22   PetriNets : SimpleClassDiagrams",
                      "  200  root nobody    22   __merged_PetriNets_RAM : SimpleClassDiagrams",
                      "  200  root nobody    352   PetriNets_RAM : SimpleClassDiagrams",