Merge branch 'master' into MvC

integration/test_pn_interface.py

@@ -596,9 +596,9 @@ Element function constraint(model : Element, name : String):
           greeting + prompt * 3 +
             load + loaded +
             read_node("t1", "Transition", [], [("executing", "Boolean", False)]) + prompt +
-            read_node("p1", "Place", [], [("tokens", "Natural", 1)]) + prompt +
-            read_node("p2", "Place", [], [("tokens", "Natural", 2)]) + prompt +
-            read_node("p3", "Place", [], [("tokens", "Natural", 3)]) + prompt +
+            read_node("p1", "Place", [], [("tokens", "Natural", 1), ("name", "String", '"p1"')]) + prompt +
+            read_node("p2", "Place", [], [("tokens", "Natural", 2), ("name", "String", '"p2"')]) + prompt +
+            read_node("p3", "Place", [], [("tokens", "Natural", 3), ("name", "String", '"p3"')]) + prompt +
             prompt +
             ramify + prompt + 
             prompt +
@@ -607,9 +607,9 @@ Element function constraint(model : Element, name : String):
             load + loaded +
             ["OK"] + prompt +
             read_node("t1", "Transition", [], [("executing", "Boolean", False)]) + prompt +
-            read_node("p1", "Place", [], [("tokens", "Natural", 0)]) + prompt +
-            read_node("p2", "Place", [], [("tokens", "Natural", 1)]) + prompt +
-            read_node("p3", "Place", [], [("tokens", "Natural", 5)]) + prompt, 
+            read_node("p1", "Place", [], [("tokens", "Natural", 0), ("name", "String", '"p1"')]) + prompt +
+            read_node("p2", "Place", [], [("tokens", "Natural", 1), ("name", "String", '"p2"')]) + prompt +
+            read_node("p3", "Place", [], [("tokens", "Natural", 5), ("name", "String", '"p3"')]) + prompt, 
           "PO"))
 
     def test_po_pn_interface_transform_pn_to_runtime(self):