Jelajahi Sumber

Cleaned up logs and added conformance_add function

Yentl Van Tendeloo 7 tahun lalu
induk
melakukan
7a3c35e2fa
1 mengubah file dengan 7 tambahan dan 22 penghapusan
  1. 7 22
      bootstrap/core_algorithm.alc

+ 7 - 22
bootstrap/core_algorithm.alc

@@ -1074,29 +1074,17 @@ String function cmd_model_rendered(model_name : String, mapper_name : String):
 	String trace_link_2_id
 
 	allowed_rendered = "Success: "
-	log("Find outgoing for AS " + model_name)
 	trace_links = allOutgoingAssociationInstances(core, get_entry_id(model_name), "tracability")
 	while (set_len(trace_links) > 0):
 		trace_link_id = set_pop(trace_links)
 		if (value_eq(read_attribute(core, trace_link_id, "type"), "CS_perceptualized")):
 			rendered = readAssociationDestination(core, trace_link_id)
-			log("Got rendered version: " + rendered)
-
-			log("Find outgoing for CS " + rendered)
 			trace_links_2 = allOutgoingAssociationInstances(core, rendered, "tracability")
 			while (set_len(trace_links_2) > 0):
 				trace_link_2_id = set_pop(trace_links_2)
-				log("Checking " + trace_link_2_id)
-				log("Read destination " + readAssociationDestination(core, trace_link_2_id))
-				log("Expect " + get_entry_id(mapper_name))
-				log("Name: " + cast_v2s(read_attribute(core, readAssociationDestination(core, trace_link_2_id), "name")))
-				log("Mapper name: " + mapper_name)
 				if (value_eq(read_attribute(core, readAssociationDestination(core, trace_link_2_id), "name"), mapper_name)):
-					log("Check link type: " + cast_v2s(read_attribute(core, trace_link_2_id, "type")))
 					if (value_eq(read_attribute(core, trace_link_2_id, "type"), "CS_mapper")):
-						log("Found rendered: " + rendered)
 						allowed_rendered = string_join(allowed_rendered, read_attribute(core, rendered, "name")) + "\n"
-				log("Unusable link")
 
 	return allowed_rendered!
 
@@ -1114,10 +1102,6 @@ String function cmd_model_render(model_name : String, mapper_name : String, rend
 
 	model_ID = get_entry_id(model_name)
 
-	log("Render AS: " + model_name)
-	log("Mapper: " + mapper_name)
-	log("Render CS: " + rendered_name)
-
 	if (model_ID != ""):
 		mapper_ID = get_entry_id(mapper_name)
 
@@ -1175,13 +1159,8 @@ String function cmd_model_render(model_name : String, mapper_name : String, rend
 
 					// Link all information in the megamodel
 					String tr_link
-					log("Create TL CS_perceptualized from " + model_name)
-					log("    to " + rendered_name)
 					tr_link = instantiate_link(core, "tracability", "", get_entry_id(model_name), get_entry_id(rendered_name))
 					instantiate_attribute(core, tr_link, "type", "CS_perceptualized")
-					log("Create TL CS_mapper from " + rendered_name)
-					log("    to " + mapper_name)
-					log("   ID " + get_entry_id(mapper_name))
 					tr_link = instantiate_link(core, "tracability", "", get_entry_id(rendered_name), get_entry_id(mapper_name))
 					instantiate_attribute(core, tr_link, "type", "CS_mapper")
 
@@ -2100,6 +2079,12 @@ String function cmd_folder_create(folder_name : String):
 	else:
 		return "Folder alreay exists: " + folder_name!
 
+String function cmd_conformance_add(model_name : String, metamodel_name : String):
+	// Create a new instanceOf relation now
+	String instance_of
+	instance_of = instantiate_link(core, "instanceOf", "", get_entry_id(model_name), get_entry_id(metamodel_name))
+	return "Success"!
+
 Void function user_function_skip_init(user_id : String):
 	String cmd
 	String result
@@ -2211,7 +2196,7 @@ Void function user_function_skip_init(user_id : String):
 			output(cmd_folder_create(single_input("Folder name?")))
 		elif (cmd == "add_conformance"):
 			// TODO
-			cmd = "FAIL"
+			output(cmd_conformance_add(single_input("Model name?"), single_input("Metamodel name?")))
 		elif (cmd == "remove_conformance"):
 			// TODO
 			cmd = "FAIL"