Fixed import error

bootstrap/metamodels.alc

@@ -86,21 +86,21 @@ String function petrinet_constraints(model : Element):
 	all_elems = allInstances(model, model["metamodel"]["model"]["Place"])
 	while (0 < read_nr_out(all_elems)):
 		elem_constraint = set_pop(all_elems)
-		if (integer_lt(readAttribute(model, elem_constraint, "tokens"), 0)):
+		if (integer_lt(read_attribute(model, getName(model, elem_constraint), "tokens"), 0)):
 			return "Negative number of tokens in Place " + getName(model, elem_constraint)
 
 	// Check P2T transitions to have positive weight
 	all_elems = allInstances(model, model["metamodel"]["model"]["P2T"])
 	while (0 < read_nr_out(all_elems)):
 		elem_constraint = set_pop(all_elems)
-		if (integer_lt(readAttribute(model, elem_constraint, "weight"), 0)):
+		if (integer_lt(read_attribute(model, getName(model, elem_constraint), "weight"), 0)):
 			return "Negative weight in arc " + getName(model, elem_constraint)
 
 	// Check T2P transitions to have positive weight
 	all_elems = allInstances(model, model["metamodel"]["model"]["T2P"])
 	while (0 < read_nr_out(all_elems)):
 		elem_constraint = set_pop(all_elems)
-		if (integer_lt(readAttribute(model, elem_constraint, "weight"), 0)):
+		if (integer_lt(read_attribute(model, getName(model, elem_constraint), "weight"), 0)):
 			return "Negative weight in arc " + getName(model, elem_constraint)
 
 	return "OK"

integration/test_pn_interface.py

@@ -98,7 +98,6 @@ help_root =         ["Currently no model is loaded, so your operations are limit
                      "  delete -- Delete a previously made model",
                      "  list   -- Show a list of all stored models",
                      "  help   -- Show a list of possible commands"]
-verify_ok =         ["OK"]
 verify_fail_weight= ["Negative weight in arc p2t"]
 verify_fail_tokens= ["Negative number of tokens in Place p1"]
 verify_fail_structure = ["Source of model edge not typed by source of type: p2t"]
@@ -260,7 +259,7 @@ class TestPetrinetInterface(unittest.TestCase):
     def pn_interface_verify_OK(self, mode):
         self.assertTrue(run_file(all_files,
             do_instantiate_simple + ["verify"],
-            did_instantiate_simple + verify_full, mode))
+            did_instantiate_simple + ["OK"], mode))
 
     def test_po_pn_interface_verify_fail_tokens(self):
         self.pn_interface_verify_fail_tokens("PO")