瀏覽代碼

Fixed name of transition in control_to_EPN

Yentl Van Tendeloo 8 年之前
父節點
當前提交
e5cd448ece
共有 2 個文件被更改,包括 18 次插入7 次删除
  1. 0 1
      bootstrap/transform.alc
  2. 18 6
      models/control_to_EPN.mvc

+ 0 - 1
bootstrap/transform.alc

@@ -21,7 +21,6 @@ Element function make_matching_schedule(schedule_model : Element, LHS : String,
 	schedule = create_node()
 	workset = create_node()
 	all_elements = allAssociationDestinations(schedule_model, LHS, "LHS_contains")
-	log("All elements: " + set_to_string(all_elements))
 	full_all_elements = set_copy(all_elements)
 	required_size = read_nr_out(all_elements)
 

+ 18 - 6
models/control_to_EPN.mvc

@@ -440,6 +440,10 @@ All_RAM Control2EPN {
 
                 Post_Encapsulated_PetriNet/Transition post_ct_16 {
                     label = "16"
+                    value_name = $
+                        String function value(model : Element, name : String, mapping : Element):
+                            return string_join(read_attribute(model, mapping["0"], "name"), read_type(model, mapping["2"]))!
+                        $
                 }
 
                 Post_Encapsulated_PetriNet/P2T (post_ct_3, post_ct_16) {
@@ -644,11 +648,11 @@ All_RAM Control2EPN {
                         s_err_type = read_type(host_model, mapping["1"])
                         p_name = read_attribute(host_model, mapping["13"], "name")
 
-                        if (s_err_type == "Up"):
+                        if (s_err_type == "PW_Control/Up"):
                             return (p_name == "up")!
-                        elif (s_err_type == "Neutral"):
+                        elif (s_err_type == "PW_Control/Neutral"):
                             return (p_name == "neutral")!
-                        elif (s_err_type == "Down"):
+                        elif (s_err_type == "PW_Control/Down"):
                             return (p_name == "down")!
                         else:
                             return False!
@@ -693,6 +697,10 @@ All_RAM Control2EPN {
                 }
                 Post_Encapsulated_PetriNet/Transition post_fi_7 {
                     label = "7"
+                    value_name = $
+                        String function value(model : Element, name : String, mapping : Element):
+                            return string_join(read_attribute(model, mapping["0"], "name"), "_onInterrupt")!
+                        $
                 }
                 Post_Encapsulated_PetriNet/P2T (post_fi_2, post_fi_7) {
                     label = "8"
@@ -757,11 +765,11 @@ All_RAM Control2EPN {
                         s_err_type = read_type(host_model, mapping["0"])
                         p_name = read_attribute(host_model, mapping["7"], "name")
 
-                        if (s_err_type == "Up"):
+                        if (s_err_type == "PW_Control/Up"):
                             return (p_name == "up")!
-                        elif (s_err_type == "Neutral"):
+                        elif (s_err_type == "PW_Control/Neutral"):
                             return (p_name == "neutral")!
-                        elif (s_err_type == "Down"):
+                        elif (s_err_type == "PW_Control/Down"):
                             return (p_name == "down")!
                         else:
                             return False!
@@ -800,6 +808,10 @@ All_RAM Control2EPN {
 
                 Post_Encapsulated_PetriNet/Transition post_fis_9 {
                     label = "9"
+                    value_name = $
+                        String function value(model : Element, name : String, mapping : Element):
+                            return string_join(read_attribute(model, mapping["0"], "name"), "_onInterrupt")!
+                        $
                 }
                 Post_Encapsulated_PetriNet/P2T (post_fis_3, post_fis_9) {
                     label = "10"