Fixed error in test_operation_on_SCCD

bootstrap/core_algorithm.alc

@@ -13,7 +13,6 @@ include "utils.alh"
 include "conformance_finding.alh"
 include "typing.alh"
 
-
 String core_model_location = "models/core"
 
 Element core = ?
@@ -370,13 +369,15 @@ Boolean function pm_finished(worklist : Element, pm : String):
 			return True!
 	return False!
 
-Element function merge_models(models_dict : Element, operation_id : String):
-	log("Start merge")
+Element function merge_models(models_dict : Element, operation_name : String):
+	core = import_node(core_model_location)
 	// 0) Find operation signature
 
 	Element input_metamodels
 	Element iter
 	String edge
+	String operation_id
+	operation_id = get_model_id(operation_name)
 
 	input_metamodels = dict_create()
 	iter = allOutgoingAssociationInstances(core, operation_id, "transformInput")
@@ -423,13 +424,12 @@ Element function merge_models(models_dict : Element, operation_id : String):
 			output("Merged metamodel in operation is not of type SimpleClassDiagrams")
 			return read_root()!
 
-		log("Join OK")
 		return model_join(model_tuples, merged_metamodel, read_root())!
 	else:
 		return read_root()!
 
 Element function split_model(model : Element, metamodels_dict : Element):
-	log("Splitting model")
+	core = import_node(core_model_location)
 	Element model_tuples
 	Element keys
 	String key
@@ -446,28 +446,23 @@ Element function split_model(model : Element, metamodels_dict : Element):
 			return read_root()!
 		set_add_node(model_tuples, create_tuple(key, mm))
 
-	log("Split OK")
 	return model_split(model, model_tuples, read_root())!
 
 Element function get_model(model_name : String, metamodel_name : String):
-	log("Fetching full model")
+	core = import_node(core_model_location)
 	return get_full_model(get_model_id(model_name), get_model_id(metamodel_name))!
 
 Void function store_model(model_name : String, metamodel_name : String, model : Element):
-	log("Storing model")
+	core = import_node(core_model_location)
 	if (get_model_id(model_name) == ""):
 		// New model
-		log("Create new model")
 		model_create(model, model_name, get_model_id(metamodel_name), "Model")
-		log("Created")
 	else:
-		log("Overwriting existing model")
 		model_overwrite(model, get_model_id(model_name), get_model_id(metamodel_name))
-		log("Done")
 	return!
 
 String function get_ramified_metamodel(model_name : String):
-	log("Executed get_ramified_metamodel!")
+	core = import_node(core_model_location)
 	String operation_id
 	Element trace_links
 	String merged_metamodel_id
@@ -475,7 +470,6 @@ String function get_ramified_metamodel(model_name : String):
 	String ramified_metamodel_id
 
 	operation_id = get_model_id(model_name)
-	log("Reading tracability links for " + cast_v2s(read_attribute(core, operation_id, "name")))
 	trace_links = allOutgoingAssociationInstances(core, operation_id, "tracability")
 	merged_metamodel_id = ""
 
@@ -484,7 +478,6 @@ String function get_ramified_metamodel(model_name : String):
 
 		if (value_eq(read_attribute(core, trace_link_id, "type"), "operatesOn")):
 			merged_metamodel_id = readAssociationDestination(core, trace_link_id)
-			log("Reading extra tracability links for " + cast_v2s(read_attribute(core, merged_metamodel_id, "name")))
 			trace_links = allOutgoingAssociationInstances(core, merged_metamodel_id, "tracability")
 			ramified_metamodel_id = ""
 
@@ -493,9 +486,7 @@ String function get_ramified_metamodel(model_name : String):
 				if (value_eq(read_attribute(core, trace_link_id, "type"), "RAMified")):
 					ramified_metamodel_id = readAssociationDestination(core, trace_link_id)
 
-					log("Returning: " + cast_v2s(read_attribute(core, ramified_metamodel_id, "name")))
 					return read_attribute(core, ramified_metamodel_id, "name")!
-	log("None found")
 	return read_root()!
 
 Element function execute_operation(operation_id : String, input_models : Element, tracability_model : Element):

models/test_operations_in_SCCD.mvc

@@ -46,7 +46,7 @@ transition (manager_main_init, manager_main_did_transform) {
                 models = dict_create()
                 dict_add(models, "A", "ModelA")
                 dict_add(models, "B", "ModelB")
-                m = merge_models(models, get_model("TransformY", get_ramified_metamodel("TransformY")))
+                m = merge_models(models, "TransformY")
 
                 // Do transformation
                 transform(m, get_model("TransformY", get_ramified_metamodel("TransformY")))
@@ -55,8 +55,8 @@ transition (manager_main_init, manager_main_did_transform) {
                 Element metamodels
                 Element split
                 metamodels = dict_create()
-                dict_add(models, "C", "MetamodelC")
-                dict_add(models, "B", "MetamodelB")
+                dict_add(metamodels, "C", "MetamodelC")
+                dict_add(metamodels, "B", "MetamodelB")
                 split = split_model(m, metamodels)
 
                 // Store the results
@@ -78,7 +78,7 @@ transition (manager_main_did_transform, manager_main_did_actionlanguage) {
                 models = dict_create()
                 dict_add(models, "C", "ModelC")
                 dict_add(models, "B", "ModelB")
-                m = merge_models(models, get_model("OperationZ", "ActionLanguage"))
+                m = merge_models(models, "OperationZ")
 
                 // Do transformation
                 Element func
@@ -89,8 +89,8 @@ transition (manager_main_did_transform, manager_main_did_actionlanguage) {
                 Element metamodels
                 Element split
                 metamodels = dict_create()
-                dict_add(models, "A", "MetamodelA")
-                dict_add(models, "B", "MetamodelB")
+                dict_add(metamodels, "A", "MetamodelA")
+                dict_add(metamodels, "B", "MetamodelB")
                 split = split_model(m, metamodels)
 
                 // Store the results