Merge branch 'pn_debugging' of https://msdl.uantwerpen.be/git/yentl/modelverse into pn_debugging

bootstrap/core_algorithm.alc

@@ -1239,15 +1239,12 @@ String function cmd_transformation_execute(transformation_name : String, source_
 					// Check if exists
 					if (get_entry_id(tracability_name) == ""):
 						// No, so create
-                        log("Tracability model being created...")
 						tracability_model = instantiate_model(get_full_model(get_entry_id("formalisms/Tracability"), get_entry_id("formalisms/SimpleClassDiagrams")))
 						model_create(tracability_model, tracability_name, get_entry_id("formalisms/Tracability"), "Model")
 					else:
-                        log("Tracability model being created.lready exists...")
 						// Yes, so read out
 						tracability_model = get_full_model(get_entry_id(tracability_name), get_entry_id("formalisms/Tracability"))
 				else:
-                    log("No tracability...")
 					tracability_model = read_root()
 
 				result = execute_operation(transformation_id, inputs, tracability_model)

interface/PDEVS/console.py

@@ -230,7 +230,11 @@ if __name__ == '__main__':
     # TODO: Make this a transformation to a trace metamodel
     print("Add ProductionSystem simulator")
     try:
-        transformation_add_AL({"ProductionSystemRuntime": "formalisms/ProductionSystemRuntime", "ParallelDEVS": "formalisms/ParallelDEVS"}, {}, "models/ps_simulator", open("../../integration/code/ps_simulator.alc", "r").read())
+        def traceability_PS2DEVS_runtime():
+            instantiate(None, "Association", ("ProductionSystemRuntime/Machine", "ParallelDEVS/BaseDEVSBlock"), ID="PS2DEVS_typelink")
+            instantiate(None, "Association", ("ProductionSystemRuntime/Machine", "ParallelDEVS/DEVSInstance"), ID="PS2DEVS_instancelink")
+
+        transformation_add_AL({"ProductionSystemRuntime": "formalisms/ProductionSystemRuntime", "ParallelDEVS": "formalisms/ParallelDEVS"}, {}, "models/ps_simulator", open("../../integration/code/ps_simulator.alc", "r").read(), traceability_PS2DEVS_runtime)
     except ModelExists:
         pass
     

models/production_system_runtime.mvc

@@ -39,4 +39,4 @@ Association Op_To_M(Operator, Machine) {}
 Association Gen_To_Part(Generator, Part) {}
 
 Association Conv_To_I(ConveyorBelt, Item) {}
-Association Proc_To_I(Processor, Item) {}
+Association Proc_To_I(Processor, Item) {}