Fixed some more errors, now semantical

core/core_algorithm.alc

@@ -1247,22 +1247,26 @@ Void function user_function_skip_init(user_id : String):
 					String tracability_link
 
 					// New location is available, so write
+					log("FUSE")
 					merged_formalism = model_fuse(set_copy(all_formalisms))
 					model_create(merged_formalism, "__merged_" + name, user_id, type_id, "Model")
 					merged_formalism_id = get_model_id("__merged_" + name)
 
 					// Add tracability links at this level
+					log("TRACE")
 					while (read_nr_out(all_formalisms) > 0):
 						source_formalism_id = get_model_id(list_read(set_pop(all_formalisms), 0))
 						tracability_link = instantiate_link(core, "tracability", "", merged_formalism_id, source_formalism_id)
 						instantiate_attribute(core, tracability_link, "type", "merged")
 
 					// Merge complete, now RAMify!
+					log("RAM")
 					ramified_formalism = ramify(merged_formalism)
 					model_create(ramified_formalism, name, user_id, type_id, "Model")
 					ramified_formalism_id = get_model_id(name)
 
 					// Add tracability link at this level
+					log("NEWTRACE")
 					tracability_link = instantiate_link(core, "tracability", "", ramified_formalism_id, merged_formalism_id)
 					instantiate_attribute(core, tracability_link, "type", "RAMified")
 

integration/test_powerwindow.py

@@ -169,7 +169,7 @@ class TestPowerWindow(unittest.TestCase):
                     "Encapsulated_PetriNet",
                     "",
                     "environment_to_EPN",
-                    ] + get_constructor(open("models/environment_to_EPN.mvc", "r").read()) + [
+                    ] + get_model_constructor(open("models/environment_to_EPN.mvc", "r").read()) + [
                 "transformation_add_AL",
                     "PetriNet",
                     "",

models/environment_to_EPN.mvc

@@ -1,4 +1,6 @@
 include "primitives.alh"
+include "modelling.alh"
+include "object_operations.alh"
 
 A B {
     Composite schedule {
@@ -34,7 +36,7 @@ A B {
                 Post_Encapsulated_PetriNet/PortPlace (cp_port, cp_place) {
                     label = "5"
                     value_tokens = $
-                        Integer value(model : Element, name : String, mapping : Element):
+                        Integer function value(model : Element, name : String, mapping : Element):
                             return 0!
                         $
                 }