Even more fixes

models/combine_EPN.mvc

@@ -9,31 +9,31 @@ A B {
 
         {Contains} ForAll link {
             LHS {
-                Pre_Architecture/Group pre_0{
+                Pre_Architecture/Group pre_l_0{
                     label = "0"
                 }
-                Pre_Architecture/Port pre_1{
+                Pre_Architecture/Port pre_l_1{
                     label = "1"
                 }
-                Pre_Architecture/Contains pre_10 (pre_0, pre_1){
+                Pre_Architecture/Contains pre_l_10 (pre_l_0, pre_l_1){
                     label = "10"
                 }
-                Pre_Encapsulated_PetriNet/Port pre_2{
+                Pre_Encapsulated_PetriNet/Port pre_l_2{
                     label = "2"
                 }
-                Pre_Architecture/Group pre_3{
+                Pre_Architecture/Group pre_l_3{
                     label = "3"
                 }
-                Pre_Architecture/Port pre_4{
+                Pre_Architecture/Port pre_l_4{
                     label = "4"
                 }
-                Pre_Architecture/Contains pre_11 (pre_3, pre_4){
+                Pre_Architecture/Contains pre_l_11 (pre_l_3, pre_l_4){
                     label = "11"
                 }
-                Pre_Encapsulated_PetriNet/Port pre_5{
+                Pre_Encapsulated_PetriNet/Port pre_l_5{
                     label = "5"
                 }
-                Pre_Architecture/Connects (pre_1, pre_4){
+                Pre_Architecture/Connects (pre_l_1, pre_l_4){
                     label = "6"
                 }
 
@@ -61,34 +61,34 @@ A B {
                     $
             }
             RHS {
-                Post_Architecture/Group post_0{
+                Post_Architecture/Group post_l_0{
                     label = "0"
                 }
-                Post_Architecture/Port post_1{
+                Post_Architecture/Port post_l_1{
                     label = "1"
                 }
-                Post_Architecture/Contains post_10 (post_0, post_1){
+                Post_Architecture/Contains post_l_10 (post_l_0, post_l_1){
                     label = "10"
                 }
-                Post_Encapsulated_PetriNet/Port post_2{
+                Post_Encapsulated_PetriNet/Port post_l_2{
                     label = "2"
                 }
-                Post_Architecture/Group post_3{
+                Post_Architecture/Group post_l_3{
                     label = "3"
                 }
-                Post_Architecture/Port post_4{
+                Post_Architecture/Port post_l_4{
                     label = "4"
                 }
-                Post_Architecture/Contains post_11 (post_3, post_4){
+                Post_Architecture/Contains post_l_11 (post_l_3, post_l_4){
                     label = "11"
                 }
-                Post_Encapsulated_PetriNet/Port post_5{
+                Post_Encapsulated_PetriNet/Port post_l_5{
                     label = "5"
                 }
-                Post_Architecture/Connects (post_1, post_4){
+                Post_Architecture/Connects (post_l_1, post_l_4){
                     label = "6"
                 }
-                Post_Encapsulated_PetriNet/Related (post_2, post_5){
+                Post_Encapsulated_PetriNet/Related (post_l_2, post_l_5){
                     label = "7"
                 }
             }
@@ -96,19 +96,19 @@ A B {
 
         {Contains} ForAll remove_old {
             LHS {
-                Pre_Encapsulated_PetriNet/Port pre_0 {
+                Pre_Encapsulated_PetriNet/Port pre_ro_0 {
                     label = "0"
                 }
-                Pre_Encapsulated_PetriNet/Port pre_1 {
+                Pre_Encapsulated_PetriNet/Port pre_ro_1 {
                     label = "1"
                 }
-                Pre_Encapsulated_PetriNet/Place pre_2 {
+                Pre_Encapsulated_PetriNet/Place pre_ro_2 {
                     label = "2"
                 }
-                Pre_Encapsulated_PetriNet/Related (pre_0, pre_1) {
+                Pre_Encapsulated_PetriNet/Related (pre_ro_0, pre_ro_1) {
                     label = "3"
                 }
-                Pre_Encapsulated_PetriNet/PortPlace (pre_1, pre_2) {
+                Pre_Encapsulated_PetriNet/PortPlace (pre_ro_1, pre_ro_2) {
                     label = "4"
                 }
             }

models/pm_req_analyse.mvc

@@ -30,22 +30,22 @@ ProcessModel analyse_requirements {
     Exec plant_to_EPN {
         name = "plant_to_EPN"
     }
+    Exec print_plant_EPN{
+        name = "epn_print"
+    }
     Exec environment_to_EPN {
         name = "environment_to_EPN"
     }
-    Exec control_to_EPN {
-        name = "control_to_EPN"
+    Exec print_env_EPN{
+        name = "epn_print"
     }
 
-    Exec print_plant_EPN{
-        name = "epn_print"
+    Exec control_to_EPN {
+        name = "control_to_EPN"
     }
     Exec print_control_EPN{
         name = "epn_print"
     }
-    Exec print_env_EPN{
-        name = "epn_print"
-    }
 
     Join join2 {}
 
@@ -53,7 +53,6 @@ ProcessModel analyse_requirements {
         name = "combine_EPN"
     }
 
-
     Exec print_pn {
         name = "pn_print"
     }