Fixed power window tests

bootstrap/model_management.alc

@@ -224,7 +224,7 @@ Element function model_split(merged_model : Element, models : Element, tracabili
 	if (read_nr_out(models) == 0):
 		// No results needed, so stop immediately unless tracability is True
 		if (bool_not(tracability)):
-			return create_node()
+			return create_node()!
 
 	Element result
 	Element metamodel

bootstrap/modelling.alc

@@ -427,7 +427,7 @@ Void function unset_attribute(model : Element, element : String, attribute : Str
 		attr_link = set_pop(attr_links)
 		dict_delete(model["type_mapping"], reverseKeyLookup(model["model"], read_edge_dst(model["model"][attr_link])))
 		dict_delete(model["type_mapping"], attr_link)
-		dict_delete_node(model["model"], reverseKeyLookup(model["model"], read_edge_dst(model["model"][attr_link])))
+		dict_delete(model["model"], reverseKeyLookup(model["model"], read_edge_dst(model["model"][attr_link])))
 		delete_element(model["model"][attr_link])
 
 	return!

bootstrap/transform.alc

@@ -380,7 +380,6 @@ Void function rewrite(host_model : Element, schedule_model : Element, RHS : Stri
 	while (read_nr_out(labels_to_add) > 0):
 		// Add the elements linked to these labels
 		label = list_pop(labels_to_add, read_nr_out(labels_to_add) - 1)
-		//log("Instantiate label " + label)
 		if (is_edge(schedule_model["model"][RHS_map[label]])):
 			// Edge
 			src = read_attribute(schedule_model, reverse[cast_id2s(read_edge_src(schedule_model["model"][RHS_map[label]]))], "label")

core/core_algorithm.alc

@@ -679,8 +679,7 @@ Boolean function enact_action(pm : Element, element : String, prefix : String, u
 				model_create(result[key], outputs[key], user_id, get_model_id(key), "Model")
 			else:
 				model_overwrite(result[key], get_model_id(outputs[key]))
-
-	return result!
+		return True!
 
 Void function enact_PM(pm : Element, prefix : String, user_id : String):
 	Element worklist

models/matches.mvc

@@ -30,12 +30,12 @@ A B {
                 Pre_Query/Place {
                     label = "2"
                 }
-                Pre_ReachabilityGraph/State pre_4 {
-                    label = "4"
-                }
                 Pre_ReachabilityGraph/Place pre_3 {
                     label = "3"
                 }
+                Pre_ReachabilityGraph/State pre_4 {
+                    label = "4"
+                }
                 Pre_ReachabilityGraph/Contains (pre_4, pre_3) {
                     label = "5"
                 }