More fixes to PM

core/core_algorithm.alc

@@ -501,7 +501,7 @@ Boolean function enact_action(pm : Element, element : String, prefix : String, u
 		// As there are no inheritance relations between full models, we can just read out the typename
 		name = read_attribute(pm, consumes_link, "name")
 		dict_add(inputs, name, string_join(prefix, read_attribute(pm, elem, "name")))
-		dict_add(types, name, get_attribute(pm, followAssociation(pm, elem), "type"))
+		dict_add(types, name, read_attribute(pm, readAssociationDestination(pm, elem), "type"))
 
 	// Find all outputs and their types (i.e., key)
 	lst = allAssociationDestinations(pm, element, "Produces")
@@ -568,7 +568,7 @@ Boolean function enact_action(pm : Element, element : String, prefix : String, u
 			while (read_nr_out(output_keys) > 0):
 				key = set_pop(output_keys)
 				desired_metamodel_id = get_model_id(key)
-				split_off_model = model_split(merged_model, get_full_model(desired_metamodel_id), key + "/"))
+				split_off_model = model_split(merged_model, get_full_model(desired_metamodel_id), key + "/")
 
 				// Check if the destination model already exists
 				if (get_model_id(outputs[key]) == ""):

models/combine_EPN.mvc

@@ -59,14 +59,14 @@ A B {
                 }
                 Pre_Encapsulated_PetriNet/Port pre_p2t_2 {
                     label = "2"
-                }
-                Pre_Encapsulated_PetriNet/PortPlace (pre_p2t_2, pre_p2t_1){
-                    label = "3"
                     constraint_selected = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
+                Pre_Encapsulated_PetriNet/PortPlace (pre_p2t_2, pre_p2t_1){
+                    label = "3"
+                }
                 Pre_Encapsulated_PetriNet/Place pre_p2t_4 {
                     label = "4"
                 }
@@ -126,14 +126,14 @@ A B {
                 }
                 Pre_Encapsulated_PetriNet/Port pre_p2t_2 {
                     label = "2"
-                }
-                Pre_Encapsulated_PetriNet/PortPlace (pre_p2t_2, pre_p2t_1){
-                    label = "3"
                     constraint_selected = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
+                Pre_Encapsulated_PetriNet/PortPlace (pre_p2t_2, pre_p2t_1){
+                    label = "3"
+                }
                 Pre_Encapsulated_PetriNet/Place pre_p2t_4 {
                     label = "4"
                 }
@@ -193,14 +193,14 @@ A B {
                 }
                 Pre_Encapsulated_PetriNet/Port pre_rem_2 {
                     label = "2"
-                }
-                Pre_Encapsulated_PetriNet/PortPlace (pre_rem_2, pre_rem_1){
-                    label = "3"
                     constraint_selected = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
+                Pre_Encapsulated_PetriNet/PortPlace (pre_rem_2, pre_rem_1){
+                    label = "3"
+                }
                 Pre_Encapsulated_PetriNet/Place pre_rem_4 {
                     label = "4"
                 }
@@ -231,14 +231,14 @@ A B {
                 }
                 Pre_Encapsulated_PetriNet/Port pre_uns_2 {
                     label = "2"
-                }
-                Pre_Encapsulated_PetriNet/PortPlace (pre_uns_2, pre_uns_1){
-                    label = "3"
                     constraint_selected = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
+                Pre_Encapsulated_PetriNet/PortPlace (pre_uns_2, pre_uns_1){
+                    label = "3"
+                }
             }
             RHS {
                 Post_Encapsulated_PetriNet/Place post_uns_1 {
@@ -255,7 +255,7 @@ A B {
     OnSuccess (merge_T2P, remove_old) {}
     OnSuccess (remove_old, unselect) {}
     OnSuccess (unselect, select) {}
-    OnFailure (select, finish) {}
+    OnFailure (select, success) {}
 
     OnFailure (unselect_all, select) {}
     OnFailure (merge_P2T, merge_T2P) {}