Updated test_MvC to use the wrapper for the parts that already work

core/core_algorithm.alc

@@ -389,6 +389,7 @@ Element function user_function():
 	exec(root["bootstrap/transform.alc"]["initializers"])
 	exec(root["bootstrap/conformance_scd.alc"]["initializers"])
 	exec(root["bootstrap/metamodels.alc"]["initializers"])
+	exec(root["bootstrap/random.alc"]["initializers"])
 	exec(root["core/core_algorithm.alc"]["initializers"])
 
 	// Load in a hard-reference to the previously created model
@@ -1506,7 +1507,7 @@ String function cmd_transformation_list():
 	String type
 	String result
 
-	result = ""
+	result = "Success: "
 	models = allInstances(core, "Transformation")
 	while (read_nr_out(models) > 0):
 		m = set_pop(models)

integration/code/pn_design_to_runtime.mvc

@@ -1,4 +1,4 @@
-import models/RAM_PetriNets_Design_Runtime as RAM_PN_DR
+import models/RAM_PetriNet_Design_Runtime as RAM_PN_DR
 include "primitives.alh"
 include "modelling.alh"
 
@@ -8,15 +8,15 @@ RAM_PN_DR annotate {
         {Contains} Success success {}
         {Contains} ForAll copy_transitions {
             LHS {
-                Pre_PetriNets/Transition {
+                Pre_PetriNet/Transition {
                     label = "0"
                 }
             }
             RHS {
-                Post_PetriNets/Transition ct1 {
+                Post_PetriNet/Transition ct1 {
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Transition ct2 {
+                Post_PetriNet_Runtime/Transition ct2 {
                     label = "1"
                     value_executing = $
                         Boolean function value(model : Element, name : String, mapping : Element):
@@ -34,15 +34,15 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_places {
             LHS {
-                Pre_PetriNets/Place {
+                Pre_PetriNet/Place {
                     label = "0"
                 }
             }
             RHS {
-                Post_PetriNets/Place cp1 {
+                Post_PetriNet/Place cp1 {
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Place cp2 {
+                Post_PetriNet_Runtime/Place cp2 {
                     label = "1"
                     value_tokens = $
                         Integer function value(model : Element, name : String, mapping : Element):
@@ -60,19 +60,19 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_P2T {
             LHS {
-                Pre_PetriNets/Place cp2t_p{
+                Pre_PetriNet/Place cp2t_p{
                     label = "0"
                 }
-                Pre_PetriNets/Transition cp2t_t{
+                Pre_PetriNet/Transition cp2t_t{
                     label = "1"
                 }
-                Pre_PetriNets/P2T (cp2t_p, cp2t_t){
+                Pre_PetriNet/P2T (cp2t_p, cp2t_t){
                     label = "2"
                 }
-                Pre_PetriNets_Runtime/Place cp2t_p2{
+                Pre_PetriNet_Runtime/Place cp2t_p2{
                     label = "3"
                 }
-                Pre_PetriNets_Runtime/Transition cp2t_t2{
+                Pre_PetriNet_Runtime/Transition cp2t_t2{
                     label = "4"
                 }
                 Pre_D2R_PlaceLink (cp2t_p, cp2t_p2){
@@ -83,19 +83,19 @@ RAM_PN_DR annotate {
                 }
             }
             RHS {
-                Post_PetriNets/Place rhs_cp2t_p{
+                Post_PetriNet/Place rhs_cp2t_p{
                     label = "0"
                 }
-                Post_PetriNets/Transition rhs_cp2t_t{
+                Post_PetriNet/Transition rhs_cp2t_t{
                     label = "1"
                 }
-                Post_PetriNets/P2T rhs_cp2t_p2t (rhs_cp2t_p, rhs_cp2t_t){
+                Post_PetriNet/P2T rhs_cp2t_p2t (rhs_cp2t_p, rhs_cp2t_t){
                     label = "2"
                 }
-                Post_PetriNets_Runtime/Place rhs_cp2t_p2 {
+                Post_PetriNet_Runtime/Place rhs_cp2t_p2 {
                     label = "3"
                 }
-                Post_PetriNets_Runtime/Transition rhs_cp2t_t2 {
+                Post_PetriNet_Runtime/Transition rhs_cp2t_t2 {
                     label = "4"
                 }
                 Post_D2R_PlaceLink (rhs_cp2t_p, rhs_cp2t_p2){
@@ -104,7 +104,7 @@ RAM_PN_DR annotate {
                 Post_D2R_TransitionLink (rhs_cp2t_t, rhs_cp2t_t2){
                     label = "6"
                 }
-                Post_PetriNets_Runtime/P2T rhs_cp2t_p2t2(rhs_cp2t_p2, rhs_cp2t_t2) {
+                Post_PetriNet_Runtime/P2T rhs_cp2t_p2t2(rhs_cp2t_p2, rhs_cp2t_t2) {
                     label = "7"
                     value_weight = $
                         Integer function value(host_model : Element, name : String, mapping : Element):
@@ -115,19 +115,19 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_T2P {
             LHS {
-                Pre_PetriNets/Place ct2p_p{
+                Pre_PetriNet/Place ct2p_p{
                     label = "0"
                 }
-                Pre_PetriNets/Transition ct2p_t{
+                Pre_PetriNet/Transition ct2p_t{
                     label = "1"
                 }
-                Pre_PetriNets/T2P (ct2p_t, ct2p_p){
+                Pre_PetriNet/T2P (ct2p_t, ct2p_p){
                     label = "2"
                 }
-                Pre_PetriNets_Runtime/Place ct2p_p2{
+                Pre_PetriNet_Runtime/Place ct2p_p2{
                     label = "3"
                 }
-                Pre_PetriNets_Runtime/Transition ct2p_t2{
+                Pre_PetriNet_Runtime/Transition ct2p_t2{
                     label = "4"
                 }
                 Pre_D2R_PlaceLink (ct2p_p, ct2p_p2){
@@ -138,19 +138,19 @@ RAM_PN_DR annotate {
                 }
             }
             RHS {
-                Post_PetriNets/Place rhs_ct2p_p{
+                Post_PetriNet/Place rhs_ct2p_p{
                     label = "0"
                 }
-                Post_PetriNets/Transition rhs_ct2p_t{
+                Post_PetriNet/Transition rhs_ct2p_t{
                     label = "1"
                 }
-                Post_PetriNets/T2P (rhs_ct2p_t, rhs_ct2p_p){
+                Post_PetriNet/T2P (rhs_ct2p_t, rhs_ct2p_p){
                     label = "2"
                 }
-                Post_PetriNets_Runtime/Place rhs_ct2p_p2 {
+                Post_PetriNet_Runtime/Place rhs_ct2p_p2 {
                     label = "3"
                 }
-                Post_PetriNets_Runtime/Transition rhs_ct2p_t2 {
+                Post_PetriNet_Runtime/Transition rhs_ct2p_t2 {
                     label = "4"
                 }
                 Post_D2R_PlaceLink (rhs_ct2p_p, rhs_ct2p_p2){
@@ -159,7 +159,7 @@ RAM_PN_DR annotate {
                 Post_D2R_TransitionLink (rhs_ct2p_t, rhs_ct2p_t2){
                     label = "6"
                 }
-                Post_PetriNets_Runtime/T2P (rhs_ct2p_t2, rhs_ct2p_p2) {
+                Post_PetriNet_Runtime/T2P (rhs_ct2p_t2, rhs_ct2p_p2) {
                     label = "7"
                     value_weight = $
                         Integer function value(host_model : Element, name : String, mapping : Element):

integration/code/pn_print.mvc

@@ -7,12 +7,12 @@ RAM_PN_R print {
         {Contains} Success success {}
         {Contains} ForAll print_tokens {
             LHS {
-                Pre_PetriNets/Place {
+                Pre_PetriNet/Place {
                     label = "0"
                 }
             }
             RHS {
-                Post_PetriNets/Place {
+                Post_PetriNet/Place {
                     label = "0"
                     action = $
                         Void function action(model : Element, name : String, mapping : Element):

integration/code/pn_runtime_to_design.mvc

@@ -1,4 +1,4 @@
-import models/RAM_PetriNets_Design_Runtime as RAM_PN_DR
+import models/RAM_PetriNet_Design_Runtime as RAM_PN_DR
 include "primitives.alh"
 include "modelling.alh"
 
@@ -8,15 +8,15 @@ RAM_PN_DR annotate {
         {Contains} Success success {}
         {Contains} ForAll copy_transitions {
             LHS {
-                Pre_PetriNets_Runtime/Transition {
+                Pre_PetriNet_Runtime/Transition {
                     label = "0"
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Transition ct1 {
+                Post_PetriNet_Runtime/Transition ct1 {
                     label = "0"
                 }
-                Post_PetriNets/Transition ct2 {
+                Post_PetriNet/Transition ct2 {
                     label = "1"
                     value_name = $
                         Integer function value(model : Element, name : String, mapping : Element):
@@ -30,15 +30,15 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_places {
             LHS {
-                Pre_PetriNets_Runtime/Place {
+                Pre_PetriNet_Runtime/Place {
                     label = "0"
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Place cp1 {
+                Post_PetriNet_Runtime/Place cp1 {
                     label = "0"
                 }
-                Post_PetriNets/Place cp2 {
+                Post_PetriNet/Place cp2 {
                     label = "1"
                     value_tokens = $
                         Integer function value(host_model : Element, name : String, mapping : Element):
@@ -56,19 +56,19 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_P2T {
             LHS {
-                Pre_PetriNets_Runtime/Place cp2t_p{
+                Pre_PetriNet_Runtime/Place cp2t_p{
                     label = "0"
                 }
-                Pre_PetriNets_Runtime/Transition cp2t_t{
+                Pre_PetriNet_Runtime/Transition cp2t_t{
                     label = "1"
                 }
-                Pre_PetriNets_Runtime/P2T (cp2t_p, cp2t_t){
+                Pre_PetriNet_Runtime/P2T (cp2t_p, cp2t_t){
                     label = "2"
                 }
-                Pre_PetriNets/Place cp2t_p2{
+                Pre_PetriNet/Place cp2t_p2{
                     label = "3"
                 }
-                Pre_PetriNets/Transition cp2t_t2{
+                Pre_PetriNet/Transition cp2t_t2{
                     label = "4"
                 }
                 Pre_R2D_PlaceLink (cp2t_p, cp2t_p2){
@@ -79,19 +79,19 @@ RAM_PN_DR annotate {
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Place rhs_cp2t_p{
+                Post_PetriNet_Runtime/Place rhs_cp2t_p{
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Transition rhs_cp2t_t{
+                Post_PetriNet_Runtime/Transition rhs_cp2t_t{
                     label = "1"
                 }
-                Post_PetriNets_Runtime/P2T rhs_cp2t_p2t (rhs_cp2t_p, rhs_cp2t_t){
+                Post_PetriNet_Runtime/P2T rhs_cp2t_p2t (rhs_cp2t_p, rhs_cp2t_t){
                     label = "2"
                 }
-                Post_PetriNets/Place rhs_cp2t_p2 {
+                Post_PetriNet/Place rhs_cp2t_p2 {
                     label = "3"
                 }
-                Post_PetriNets/Transition rhs_cp2t_t2 {
+                Post_PetriNet/Transition rhs_cp2t_t2 {
                     label = "4"
                 }
                 Post_R2D_PlaceLink (rhs_cp2t_p, rhs_cp2t_p2){
@@ -100,7 +100,7 @@ RAM_PN_DR annotate {
                 Post_R2D_TransitionLink (rhs_cp2t_t, rhs_cp2t_t2){
                     label = "6"
                 }
-                Post_PetriNets/P2T rhs_cp2t_p2t2(rhs_cp2t_p2, rhs_cp2t_t2) {
+                Post_PetriNet/P2T rhs_cp2t_p2t2(rhs_cp2t_p2, rhs_cp2t_t2) {
                     label = "7"
                     value_weight = $
                         Integer function value(host_model : Element, name : String, mapping : Element):
@@ -111,19 +111,19 @@ RAM_PN_DR annotate {
         }
         {Contains} ForAll copy_T2P {
             LHS {
-                Pre_PetriNets_Runtime/Place ct2p_p{
+                Pre_PetriNet_Runtime/Place ct2p_p{
                     label = "0"
                 }
-                Pre_PetriNets_Runtime/Transition ct2p_t{
+                Pre_PetriNet_Runtime/Transition ct2p_t{
                     label = "1"
                 }
-                Pre_PetriNets_Runtime/T2P (ct2p_t, ct2p_p){
+                Pre_PetriNet_Runtime/T2P (ct2p_t, ct2p_p){
                     label = "2"
                 }
-                Pre_PetriNets/Place ct2p_p2{
+                Pre_PetriNet/Place ct2p_p2{
                     label = "3"
                 }
-                Pre_PetriNets/Transition ct2p_t2{
+                Pre_PetriNet/Transition ct2p_t2{
                     label = "4"
                 }
                 Pre_R2D_PlaceLink (ct2p_p, ct2p_p2){
@@ -134,19 +134,19 @@ RAM_PN_DR annotate {
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Place rhs_ct2p_p{
+                Post_PetriNet_Runtime/Place rhs_ct2p_p{
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Transition rhs_ct2p_t{
+                Post_PetriNet_Runtime/Transition rhs_ct2p_t{
                     label = "1"
                 }
-                Post_PetriNets_Runtime/T2P (rhs_ct2p_t, rhs_ct2p_p){
+                Post_PetriNet_Runtime/T2P (rhs_ct2p_t, rhs_ct2p_p){
                     label = "2"
                 }
-                Post_PetriNets/Place rhs_ct2p_p2 {
+                Post_PetriNet/Place rhs_ct2p_p2 {
                     label = "3"
                 }
-                Post_PetriNets/Transition rhs_ct2p_t2 {
+                Post_PetriNet/Transition rhs_ct2p_t2 {
                     label = "4"
                 }
                 Post_R2D_PlaceLink (rhs_ct2p_p, rhs_ct2p_p2){
@@ -155,7 +155,7 @@ RAM_PN_DR annotate {
                 Post_R2D_TransitionLink (rhs_ct2p_t, rhs_ct2p_t2){
                     label = "6"
                 }
-                Post_PetriNets/T2P (rhs_ct2p_t2, rhs_ct2p_p2) {
+                Post_PetriNet/T2P (rhs_ct2p_t2, rhs_ct2p_p2) {
                     label = "7"
                     value_weight = $
                         Integer function value(host_model : Element, name : String, mapping : Element):

integration/code/pn_simulate.alc

@@ -19,7 +19,7 @@ Boolean function simulate(model : Element):
 
 	log("Got types: " + set_to_string(dict_keys(model["metamodel"]["model"])))
 
-	all_transitions = allInstances(model, "PetriNets_Runtime/Transition")
+	all_transitions = allInstances(model, "PetriNet_Runtime/Transition")
 	enabled_transitions = create_node()
 
 	while (0 < read_nr_out(all_transitions)):
@@ -27,7 +27,7 @@ Boolean function simulate(model : Element):
 		enabled = True
 
 		// Find all incoming transitions
-		in_arcs = allIncomingAssociationInstances(model, under_study, "PetriNets_Runtime/P2T")
+		in_arcs = allIncomingAssociationInstances(model, under_study, "PetriNet_Runtime/P2T")
 
 		while (0 < read_nr_out(in_arcs)):
 			arc_under_study = set_pop(in_arcs)
@@ -56,7 +56,7 @@ Boolean function simulate(model : Element):
 	String working_place
 	Integer new_value
 
-	workset = allIncomingAssociationInstances(model, transition, "PetriNets_Runtime/P2T")
+	workset = allIncomingAssociationInstances(model, transition, "PetriNet_Runtime/P2T")
 	while (0 < read_nr_out(workset)):
 		working_arc = set_pop(workset)
 		working_place = reverseKeyLookup(model["model"], read_edge_src(model["model"][working_arc]))
@@ -64,7 +64,7 @@ Boolean function simulate(model : Element):
 		instantiate_attribute(model, working_place, "tokens", new_value)
 
 	// Add tokens
-	workset = allOutgoingAssociationInstances(model, transition, "PetriNets_Runtime/T2P")
+	workset = allOutgoingAssociationInstances(model, transition, "PetriNet_Runtime/T2P")
 	while (0 < read_nr_out(workset)):
 		working_arc = set_pop(workset)
 		working_place = reverseKeyLookup(model["model"], read_edge_dst(model["model"][working_arc]))

integration/code/pn_simulate.mvc

@@ -1,4 +1,4 @@
-import models/RAM_PetriNets_Runtime_Runtime as RAM_PN_R
+import models/RAM_PetriNet_Runtime_Runtime as RAM_PN_R
 include "primitives.alh"
 include "modelling.alh"
 
@@ -8,18 +8,18 @@ RAM_PN_R s {
         {Contains} Success success {}
         {Contains} Atomic mark {
             LHS {
-                Pre_PetriNets_Runtime/Transition {
+                Pre_PetriNet_Runtime/Transition {
                     label = "1"
                 }
             }
             NAC {
-				Pre_PetriNets_Runtime/Transition mark_nac_t {
+				Pre_PetriNet_Runtime/Transition mark_nac_t {
 					label = "1"
 				}
-				Pre_PetriNets_Runtime/Place mark_nac_p{
+				Pre_PetriNet_Runtime/Place mark_nac_p{
 					label = "10"
 				}
-				Pre_PetriNets_Runtime/P2T (mark_nac_p, mark_nac_t){
+				Pre_PetriNet_Runtime/P2T (mark_nac_p, mark_nac_t){
 					label = "11"
 				}
 				constraint = $
@@ -32,7 +32,7 @@ RAM_PN_R s {
 					$
             }
             RHS {
-                Post_PetriNets_Runtime/Transition {
+                Post_PetriNet_Runtime/Transition {
                     label = "1"
                     value_executing = $
                         Boolean function value(host_model : Element, name : String, mapping : Element):
@@ -43,71 +43,71 @@ RAM_PN_R s {
         }
         {Contains} ForAll consume {
             LHS {
-                Pre_PetriNets_Runtime/Transition lhs_consume_t{
+                Pre_PetriNet_Runtime/Transition lhs_consume_t{
                     label = "0"
                     constraint_executing = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
-                Pre_PetriNets_Runtime/Place lhs_consume_p{
+                Pre_PetriNet_Runtime/Place lhs_consume_p{
                     label = "1"
                 }
-                Pre_PetriNets_Runtime/P2T lhs_consume_p2t(lhs_consume_p, lhs_consume_t){
+                Pre_PetriNet_Runtime/P2T lhs_consume_p2t(lhs_consume_p, lhs_consume_t){
                     label = "2"
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Transition rhs_consume_t {
+                Post_PetriNet_Runtime/Transition rhs_consume_t {
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Place rhs_consume_p {
+                Post_PetriNet_Runtime/Place rhs_consume_p {
                     label = "1"
                     value_tokens = $
                         Integer function value(host_model : Element, name : String, mapping : Element):
                             return integer_subtraction(read_attribute(host_model, name, "tokens"), read_attribute(host_model, mapping["2"], "weight"))!
                         $
                 }
-                Post_PetriNets_Runtime/P2T (rhs_consume_p, rhs_consume_t){
+                Post_PetriNet_Runtime/P2T (rhs_consume_p, rhs_consume_t){
                     label = "2"
                 }
             }
         }
         {Contains} ForAll produce {
             LHS {
-                Pre_PetriNets_Runtime/Transition lhs_produce_t{
+                Pre_PetriNet_Runtime/Transition lhs_produce_t{
                     label = "0"
                     constraint_executing = $
                         Boolean function constraint(value : Boolean):
                             return value!
                         $
                 }
-                Pre_PetriNets_Runtime/Place lhs_produce_p{
+                Pre_PetriNet_Runtime/Place lhs_produce_p{
                     label = "1"
                 }
-                Pre_PetriNets_Runtime/T2P (lhs_produce_t, lhs_produce_p){
+                Pre_PetriNet_Runtime/T2P (lhs_produce_t, lhs_produce_p){
                     label = "2"
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Transition rhs_produce_t{
+                Post_PetriNet_Runtime/Transition rhs_produce_t{
                     label = "0"
                 }
-                Post_PetriNets_Runtime/Place rhs_produce_p{
+                Post_PetriNet_Runtime/Place rhs_produce_p{
                     label = "1"
                     value_tokens = $
                         Integer function value(host_model : Element, name : String, mapping : Element):
                             return integer_addition(read_attribute(host_model, name, "tokens"), read_attribute(host_model, mapping["2"], "weight"))!
                         $
                 }
-                Post_PetriNets_Runtime/T2P (rhs_produce_t, rhs_produce_p){
+                Post_PetriNet_Runtime/T2P (rhs_produce_t, rhs_produce_p){
                     label = "2"
                 }
             }
         }
         {Contains} Atomic unmark_transition {
             LHS {
-                Pre_PetriNets_Runtime/Transition {
+                Pre_PetriNet_Runtime/Transition {
                     label = "0"
                     constraint_executing = $
                         Boolean function constraint(value : Boolean):
@@ -116,7 +116,7 @@ RAM_PN_R s {
                 }
             }
             RHS {
-                Post_PetriNets_Runtime/Transition {
+                Post_PetriNet_Runtime/Transition {
                     label = "0"
                     value_executing = $
                         Boolean function value(host_model : Element, name : String, mapping : Element):

kernel/modelverse_jit/jit.py

@@ -464,7 +464,7 @@ class ModelverseJit(object):
         """Checks if the function with the given body id is obviously non-jittable. If it's
            non-jittable, then a `JitCompilationFailedException` exception is thrown."""
         if body_id is None:
-            raise ValueError('body_id cannot be None')
+            raise ValueError('body_id cannot be None: ' + suggested_name)
         elif body_id in self.no_jit_entry_points:
             # We're not allowed to jit this function or have tried and failed before.
             raise JitCompilationFailedException(
@@ -570,7 +570,7 @@ class ModelverseJit(object):
     def jit_compile(self, task_root, body_id, suggested_name=None):
         """Tries to jit the function defined by the given entry point id and parameter list."""
         if body_id is None:
-            raise ValueError('body_id cannot be None')
+            raise ValueError('body_id cannot be None: ' + suggested_name)
         elif body_id in self.jitted_entry_points:
             raise primitive_functions.PrimitiveFinished(
                 self.jit_globals[self.jitted_entry_points[body_id]])

wrappers/modelverse.py

@@ -21,7 +21,7 @@ from hutn_compiler.compiler import main as do_compile
 class ModelverseException(Exception):
     pass
 
-class UnknownException(ModelverseException):
+class UnknownError(ModelverseException):
     pass
 
 class UnknownIdentifier(ModelverseException):
@@ -265,15 +265,15 @@ def model_list():
     _input("model_list")
     output = _handle_output("Success: ", split=" ")
     if output == "":
-        return []
+        return set([])
 
-    lst = []
+    lst = set([])
     value = output.strip().split("\n")
     for v in value:
         m, mm = v.split(":")
         m = m.strip()
         mm = mm.strip()
-        lst.append((m, mm))
+        lst.add((m, mm))
 
     return lst
 
@@ -284,14 +284,19 @@ def model_list_full():
     if  mode != MODE_MODELLING:
         raise InvalidMode()
     _input("model_list_full")
-    lst = []
-    value = _output().strip().split("\n")
+    output = _handle_output("Success: ", split=" ")
+    if output == "":
+        return set([])
+
+    lst = set([])
+    value = output.strip().split("\n")
     for v in value:
+        print("READ " + v)
         m, mm = v.split(":")
         m = m.strip()
         mm = mm.strip()
         perm, own, grp, m = m.split(" ")
-        lst.append((m, mm, own, grp, perm))
+        lst.add((m, mm, own, grp, perm))
 
     return lst
 
@@ -331,7 +336,7 @@ def model_overwrite(model_name, new_model=None):
 def user_logout():
     """Log out the current user and break the connection."""
     # return None
-    # raises UnknownException
+    # raises UnknownError
     global mode
     if  mode != MODE_MODELLING:
         raise InvalidMode()
@@ -341,7 +346,7 @@ def user_logout():
 def user_delete():
     """Removes the current user and break the connection."""
     # return None
-    # raises UnknownException
+    # raises UnknownError
     global mode
     if  mode != MODE_MODELLING:
         raise InvalidMode()
@@ -351,7 +356,7 @@ def user_delete():
 def model_render(model, mapper):
     """Fetch a rendered verion of a model."""
     # return JSON_representation
-    # raises UnknownException
+    # raises UnknownError
     # raises UnknownIdentifier
     # raises InterfaceMismatch
     global mode
@@ -369,8 +374,8 @@ def transformation_between(source, target):
     _input(["transformation_between", source, target])
     output = _handle_output("Success: ", split=" ")
     if output == "":
-        return []
-    lst = [v for v in output.split("\n")]
+        return set([])
+    lst = set([v for v in output.split("\n")])
 
 def transformation_add_MT_language(metamodels, RAMified_name):
     """Create a new Model Transformation language out of a set of metamodels."""
@@ -467,6 +472,7 @@ def transformation_execute_MT(operation_name, input_models_dict, output_models_d
 
     # We are now executing, so everything we get is part of the dialog, except if it is the string for transformation termination
     while _output() not in ["Success", "Failure"]:
+        print("Got output: " + str(_last_output()))
         reply = callback(_last_output())
         if reply is not None:
             _input(reply)
@@ -479,19 +485,37 @@ def transformation_execute_MT(operation_name, input_models_dict, output_models_d
 
 def transformation_list():
     """List existing model operations."""
-    raise NotImplementedError()
+    global mode
+    if mode != MODE_MODELLING:
+        raise InvalidMode()
 
-def transformation_list_full():
-    """List detailed information on model operations."""
-    raise NotImplementedError()
+    _input("transformation_list")
+    output = _handle_output("Success: ", split=" ")
+    if output == "":
+        return set([])
+
+    lst = set([])
+    value = output.strip().split("\n")
+    for v in value:
+        t, m = v.strip().split(" ", 1)
+        t = t[1:-1].strip()
+        m = m.strip().split(":")[0].strip()
+        lst.add((t, m))
+
+    return lst
 
 def transformation_detail():
     """List full details of a a model operation."""
     raise NotImplementedError()
 
-def transformation_RAMify():
+def transformation_RAMify(metamodel_name, RAMified_metamodel_name):
     """Ramify an existing metamodel."""
-    raise NotImplementedError()
+    global mode
+    if mode != MODE_MODELLING:
+        raise InvalidMode()
+
+    _input(["transformation_RAMify", metamodel_name, RAMified_metamodel_name])
+    _handle_output("Success")
 
 def process_execute():
     """Execute a process model."""
@@ -557,15 +581,15 @@ def element_list(model_name):
 
     try:
         _input("list_full")
-        lst = []
+        lst = set([])
         output = _handle_output("Success: ", split=" ")
         if output == "":
-            return []
+            return set([])
         for v in output.split("\n"):
             m, mm = v.split(":")
             m = m.strip()
             mm = mm.strip()
-            lst.append((m, mm))
+            lst.add((m, mm))
         return lst
 
     finally:
@@ -582,14 +606,14 @@ def types(model_name):
 
     try:
         _input("types")
-        lst = []
+        lst = set([])
         output = _handle_output("Success: ", split=" ")
         if output == "":
-            return []
+            return set([])
         for v in output.split("\n"):
             m, mm = v.split(":")
             m = m.strip()
-            lst.append(m)
+            lst.add(m)
         return lst
 
     finally:
@@ -606,15 +630,15 @@ def types_full(model_name):
 
     try:
         _input("types")
-        lst = []
+        lst = set([])
         output = _handle_output("Success: ", split=" ")
         if output == "":
-            return []
+            return set([])
         for v in output.split("\n"):
             m, mm = v.split(":")
             m = m.strip()
             mm = mm.strip()
-            lst.append((m, mm))
+            lst.add((m, mm))
         return lst
 
     finally:
@@ -686,7 +710,7 @@ def read_attrs(model_name, ID):
     finally:
         model_exit()
 
-def instantiate(model_name, typename, edge=None):
+def instantiate(model_name, typename, edge=None, ID=""):
     """Create a new instance of the specified typename, between the selected elements (if not None), and with the provided ID (if any)"""
     # return instantiated_ID
     # raises UnknownError
@@ -700,9 +724,9 @@ def instantiate(model_name, typename, edge=None):
 
     try:
         if edge is None:
-            _input(["instantiate_node", typename, ""])
+            _input(["instantiate_node", typename, ID])
         else:
-            _input(["instantiate_edge", typename, "", edge[0], edge[1]])
+            _input(["instantiate_edge", typename, ID, edge[0], edge[1]])
         return _handle_output("Success: ", split=" ")
     finally:
         model_exit()
@@ -793,9 +817,9 @@ def read_outgoing(model_name, ID, typename):
         _input(["read_outgoing", ID, typename])
         output = _handle_output("Success: ", split=" ")
         if output == "":
-            return []
+            return set([])
         else:
-            return output.split("\n")
+            return set(output.split("\n"))
     finally:
         model_exit()
 
@@ -814,9 +838,9 @@ def read_incoming(model_name, ID, typename):
         _input(["read_incoming", ID, typename])
         output = _handle_output("Success: ", split=" ")
         if output == "":
-            return []
+            return set([])
         else:
-            return output.split("\n")
+            return set(output.split("\n"))
     finally:
         model_exit()