소스 검색

Fixes to PN transformation algorithm

Yentl Van Tendeloo 8 년 전
부모
커밋
30570327c1
1개의 변경된 파일17개의 추가작업 그리고 17개의 파일을 삭제
  1. 17 17
      integration/test_pn_interface.py

+ 17 - 17
integration/test_pn_interface.py

@@ -733,7 +733,7 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "pre_consume_p", "label", "1",
                 "attr_add_code", "pre_consume_p", "constraint",
             ] + constructor_consume_place_constraint + [
-                "instantiate", "Pre_P2T", "pre_consume_p2t",
+                "instantiate", "Pre_P2T", "pre_consume_p2t", "pre_consume_p", "pre_consume_t",
                 "attr_add", "pre_consume_p2t", "label", "2",
                 "instantiate", "LHS_contains", "", "lhs_consume", "pre_consume_t",
                 "instantiate", "LHS_contains", "", "lhs_consume", "pre_consume_p",
@@ -744,9 +744,9 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "post_consume_t", "label", "0",
                 "instantiate", "Post_Place", "post_consume_p",
                 "attr_add", "post_consume_p", "label", "1",
-                "attr_add_code", "post_consume_p2t", "action", 
+                "attr_add_code", "post_consume_p", "action", 
             ] + constructor_consume_place_action + [
-                "instantiate", "Post_P2T", "post_consume_p2t",
+                "instantiate", "Post_P2T", "post_consume_p2t", "post_consume_p", "post_consume_t",
                 "attr_add", "post_consume_p2t", "label", "2",
                 "instantiate", "RHS_contains", "", "rhs_consume", "post_consume_t",
                 "instantiate", "RHS_contains", "", "rhs_consume", "post_consume_p",
@@ -766,8 +766,8 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "pre_produce_p", "label", "1",
                 "attr_add_code", "pre_produce_p", "constraint",
             ] + constructor_produce_place_constraint + [
-                "instantiate", "Pre_T2P", "pre_produce_t2p",
-                "attr_add", "pre_consume_t2p", "label", "2",
+                "instantiate", "Pre_T2P", "pre_produce_t2p", "pre_produce_t", "pre_produce_p",
+                "attr_add", "pre_produce_t2p", "label", "2",
                 "instantiate", "LHS_contains", "", "lhs_produce", "pre_produce_t",
                 "instantiate", "LHS_contains", "", "lhs_produce", "pre_produce_p",
                 "instantiate", "LHS_contains", "", "lhs_produce", "pre_produce_t2p",
@@ -777,15 +777,15 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "post_produce_t", "label", "0",
                 "instantiate", "Post_Place", "post_produce_p",
                 "attr_add", "post_produce_p", "label", "1",
-                "attr_add_code", "post_produce_p2t", "action", 
+                "attr_add_code", "post_produce_p", "action", 
             ] + constructor_produce_place_action + [
-                "instantiate", "Post_T2P", "post_produce_t2p",
-                "attr_add", "post_consume_t2p", "label", "2",
+                "instantiate", "Post_T2P", "post_produce_t2p", "post_produce_t", "post_produce_p",
+                "attr_add", "post_produce_t2p", "label", "2",
                 "instantiate", "RHS_contains", "", "rhs_produce", "post_produce_t",
                 "instantiate", "RHS_contains", "", "rhs_produce", "post_produce_p",
                 "instantiate", "RHS_contains", "", "rhs_produce", "post_produce_t2p",
                 # Atomic of rule 3 "produce"
-                "instantiate", "Atomic", "consume",
+                "instantiate", "Atomic", "produce",
                 "instantiate", "AtomicLHS", "", "produce", "lhs_produce",
                 "instantiate", "AtomicRHS", "", "produce", "rhs_produce",
                 # Rule 4: unmark marked transition
@@ -802,7 +802,7 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "post_unmark_t", "label", "0",
                 "attr_add_code", "post_unmark_t", "action", 
             ] + constructor_unmark_transition_action + [
-                "instantiate", "RHS_contains", "", "rhs_unmark_t", "post_unmark_t",
+                "instantiate", "RHS_contains", "", "rhs_unmark_transition", "post_unmark_t",
                 # Atomic of rule 4 "unmark transition"
                 "instantiate", "Atomic", "unmark_transition",
                 "instantiate", "AtomicLHS", "", "produce", "lhs_unmark_transition",
@@ -821,7 +821,7 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "attr_add", "post_unmark_p", "label", "0",
                 "attr_add_code", "post_unmark_p", "action", 
             ] + constructor_unmark_place_action + [
-                "instantiate", "RHS_contains", "", "rhs_unmark_p", "post_unmark_p",
+                "instantiate", "RHS_contains", "", "rhs_unmark_place", "post_unmark_p",
                 # Atomic of rule 5 "unmark place"
                 "instantiate", "Atomic", "unmark_place",
                 "instantiate", "AtomicLHS", "", "produce", "lhs_unmark_place",
@@ -839,15 +839,15 @@ Void function action(host_model : Element, name : String, mapping : Element):
                 "instantiate", "Contains", "", "main", "unmark_transition",
                 "instantiate", "Contains", "", "main", "unmark_place",
                 # Scheduling order
-                "instantiate", "OnSuccess", "", "mark", "success",
-                "instantiate", "OnFailure", "", "mark", "failure",
-                "instantiate", "OnSucces", "", "consume", "consume",
+                "instantiate", "OnSuccess", "", "mark", "consume",
+                "instantiate", "OnFailure", "", "mark", "success",
+                "instantiate", "OnSuccess", "", "consume", "consume",
                 "instantiate", "OnFailure", "", "consume", "produce",
-                "instantiate", "OnSucces", "", "produce", "produce",
+                "instantiate", "OnSuccess", "", "produce", "produce",
                 "instantiate", "OnFailure", "", "produce", "unmark_transition",
-                "instantiate", "OnSucces", "", "unmark_transition", "unmark_place",
+                "instantiate", "OnSuccess", "", "unmark_transition", "unmark_place",
                 "instantiate", "OnFailure", "", "unmark_transition", "failure",
-                "instantiate", "OnSucces", "", "unmark_place", "unmark_place",
+                "instantiate", "OnSuccess", "", "unmark_place", "unmark_place",
                 "instantiate", "OnFailure", "", "unmark_place", "success",
                 # Composite initial
                 "instantiate", "Initial", "", "main", "mark",