Made the PM compliant with the test file

integration/test_powerwindow.py

@@ -143,14 +143,14 @@ class TestPowerWindow(unittest.TestCase):
                     "",
                     "Encapsulated_PetriNet",
                     "",
-                    "Plant2EPN",
+                    "plant_to_EPN",
                     ] + get_model_constructor(open("models/plant_to_EPN.mvc", "r").read()) + [
                 "transformation_add_AL",
                     "PetriNet",
                     "",
                     "ReachabilityGraph",
                     "",
-                    "reachability_analyse",
+                    "reachability",
                     ] + get_constructor(open("integration/code/reachability.alc", "r").read()) + [
                 "transformation_add_AL",
                     "PW_Environment",
@@ -284,8 +284,8 @@ class TestPowerWindow(unittest.TestCase):
                      "  Requirements : SimpleClassDiagrams",
                      "  Network : SimpleClassDiagrams",
                      "  Query : SimpleClassDiagrams",
-                     "  reachability_analyse : ActionLanguage",
-                     "  Plant2EPN : All_RAM",
+                     "  reachability : ActionLanguage",
+                     "  plant_to_EPN : All_RAM",
                      "  define_req : ManualOperation",
                      "  refine_plant : ManualOperation",
                      "  refine_control : ManualOperation",

models/pm_req_analyse.mvc

@@ -6,7 +6,7 @@ ProcessModel analyse_requirements {
         name = "define_req"
     }
     Exec make_initial_models {
-        name = "make_initial"
+        name = "make_initial_models"
     }
 
     ForkJoin forkjoin1 {}
@@ -61,15 +61,15 @@ ProcessModel analyse_requirements {
     }
     Data plant_model {
         name = "plant_model"
-        type = "Plant_PW"
+        type = "PW_Plant"
     }
     Data environment_model {
         name = "environment_model"
-        type = "Environment_PW"
+        type = "PW_Environment"
     }
     Data control_model {
         name = "control_model"
-        type = "Control_PW"
+        type = "PW_Control"
     }
     Data plant_EPN {
         name = "plant_EPN"