Browse Source

Removed in models as well

Yentl Van Tendeloo 7 years ago
parent
commit
fc8b3b604f
4 changed files with 6 additions and 6 deletions
  1. 2 2
      models/combine_EPN.mvc
  2. 1 1
      models/epn_print.alc
  3. 1 1
      models/pn_print.alc
  4. 2 2
      models/reachabilitygraph_print.mvc

+ 2 - 2
models/combine_EPN.mvc

@@ -52,9 +52,9 @@ Composite schedule {
                     name_4 = read_attribute(model, mapping["4"], "name")
                     name_5 = read_attribute(model, mapping["5"], "name")
 
-                    if bool_not((name_0 + "/") + name_1 == name_2):
+                    if bool_not(name_0 + "/" + name_1 == name_2):
                         return False!
-                    if bool_not((name_3 + "/") + name_4 == name_5):
+                    if bool_not(name_3 + "/" + name_4 == name_5):
                         return False!
                     return True!
                 $

+ 1 - 1
models/epn_print.alc

@@ -17,7 +17,7 @@ Boolean function pn_print(model : Element):
 		name = read_attribute(model, place, "name")
 		tokens = read_attribute(model, place, "tokens")
 
-		log((("  " + name) + ": ") + cast_v2s(tokens))
+		log("  " + name + ": " + cast_v2s(tokens))
 
 	log("Transitions:")
 	all_places = allInstances(model, "Encapsulated_PetriNet/Transition")

+ 1 - 1
models/pn_print.alc

@@ -17,7 +17,7 @@ Boolean function pn_print(model : Element):
 		name = read_attribute(model, place, "name")
 		tokens = read_attribute(model, place, "tokens")
 
-		log((("  " + name) + ": ") + cast_v2s(tokens))
+		log("  " + name + ": " + cast_v2s(tokens))
 
 	log("Transitions:")
 	all_places = allInstances(model, "PetriNet/Transition")

+ 2 - 2
models/reachabilitygraph_print.mvc

@@ -24,7 +24,7 @@ Composite schedule {
                         while (set_len(all_values) > 0):
                             place = set_pop(all_values)
                             dict_add(dict_values, read_attribute(model, place, "name"), read_attribute(model, place, "tokens"))
-                        output((cast_v2s(read_attribute(model, name, "name")) + ": ") + dict_to_string(dict_values))
+                        output(cast_v2s(read_attribute(model, name, "name")) + ": " + dict_to_string(dict_values))
                         return!
                     $
             }
@@ -54,7 +54,7 @@ Composite schedule {
                 label = "2"
                 action = $
                     Void function action(model : Element, name : String, mapping : Element):
-                        output((((cast_v2s(read_attribute(model, mapping["0"], "name")) + " --[") + cast_v2s(read_attribute(model, name, "name"))) + "]--> ") + cast_v2s(read_attribute(model, mapping["1"], "name")))
+                        output(cast_v2s(read_attribute(model, mapping["0"], "name")) + " --[" + cast_v2s(read_attribute(model, name, "name")) + "]--> " + cast_v2s(read_attribute(model, mapping["1"], "name")))
                         return!
                     $
             }