Yentl Van Tendeloo 8 лет назад
Родитель
Сommit
28ba0e42cd
1 измененных файлов с 26 добавлено и 26 удалено
  1. 26 26
      integration/test_constructors_models.py

+ 26 - 26
integration/test_constructors_models.py

@@ -217,37 +217,37 @@ def add_constraints(model):
 
 instantiate_scd = [
         "model",
-        "instantiate_model", "1", "2",
-        "instantiate_node", "2", "Class", "Place",
-        "instantiate_node", "2", "Class", "Transition",
-        "instantiate_node", "2", "SimpleAttribute", "Natural",
-        "instantiate_link", "2", "Association", "P2T", "Place", "Transition",
-        "instantiate_link", "2", "Association", "T2P", "Transition", "Place",
-        "model_define_attribute", "2", "Place", "tokens", False, "Natural",
-        "model_define_attribute", "2", "P2T", "weight", False, "Natural",
-        "model_define_attribute", "2", "T2P", "weight", False, "Natural",
-        "export_node", "2", "models/PetriNets_new",
+        "instantiate_model", "1", "3",
+        "instantiate_node", "3", "Class", "Place",
+        "instantiate_node", "3", "Class", "Transition",
+        "instantiate_node", "3", "SimpleAttribute", "Natural",
+        "instantiate_link", "3", "Association", "P2T", "Place", "Transition",
+        "instantiate_link", "3", "Association", "T2P", "Transition", "Place",
+        "model_define_attribute", "3", "Place", "tokens", False, "Natural",
+        "model_define_attribute", "3", "P2T", "weight", False, "Natural",
+        "model_define_attribute", "3", "T2P", "weight", False, "Natural",
+        "export_node", "3", "models/PetriNets_new",
         "exit",
     ]
 
 instantiate_pn = [
         "model",
-        "instantiate_model", "2", "3",
-        "instantiate_node", "3", "Place", "p1",
-        "instantiate_node", "3", "Place", "p2",
-        "instantiate_node", "3", "Transition", "t1",
-        "instantiate_node", "3", "Transition", "t2",
-        "instantiate_link", "3", "P2T", "p1_t1", "p1", "t1",
-        "instantiate_link", "3", "T2P", "t1_p2", "t1", "p2",
-        "instantiate_link", "3", "P2T", "p2_t2", "p2", "t2",
-        "instantiate_link", "3", "T2P", "t2_p1", "t2", "p1",
-        "instantiate_attribute", "3", "p1_t1", "weight", 1,
-        "instantiate_attribute", "3", "t1_p2", "weight", 2,
-        "instantiate_attribute", "3", "p2_t2", "weight", 3,
-        "instantiate_attribute", "3", "t2_p1", "weight", 4,
-        "instantiate_attribute", "3", "p1", "tokens", 5,
-        "instantiate_attribute", "3", "p2", "tokens", 6,
-        "export_node", "3", "models/PN_instance",
+        "instantiate_model", "3", "4",
+        "instantiate_node", "4", "Place", "p1",
+        "instantiate_node", "4", "Place", "p2",
+        "instantiate_node", "4", "Transition", "t1",
+        "instantiate_node", "4", "Transition", "t2",
+        "instantiate_link", "4", "P2T", "p1_t1", "p1", "t1",
+        "instantiate_link", "4", "T2P", "t1_p2", "t1", "p2",
+        "instantiate_link", "4", "P2T", "p2_t2", "p2", "t2",
+        "instantiate_link", "4", "T2P", "t2_p1", "t2", "p1",
+        "instantiate_attribute", "4", "p1_t1", "weight", 1,
+        "instantiate_attribute", "4", "t1_p2", "weight", 2,
+        "instantiate_attribute", "4", "p2_t2", "weight", 3,
+        "instantiate_attribute", "4", "t2_p1", "weight", 4,
+        "instantiate_attribute", "4", "p1", "tokens", 5,
+        "instantiate_attribute", "4", "p2", "tokens", 6,
+        "export_node", "4", "models/PN_instance",
         "exit",
     ]