Updated Addis' file

addis/PM_to_SCCD.mvc

@@ -302,11 +302,17 @@ Composite schedule {
                     String class
 
                     comp_children = allIncomingAssociationInstances(model, mapping["1"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(comp_children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(comp_children) >0:
+                        parent = readAssociationSource(model, set_pop(comp_children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $
@@ -390,11 +396,17 @@ Composite schedule {
                     String class
 
                     children = allIncomingAssociationInstances(model, mapping["3"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(children) >0:
+                        parent = readAssociationSource(model, set_pop(children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $
@@ -825,11 +837,17 @@ Composite schedule {
                     String class
 
                     children = allIncomingAssociationInstances(model, mapping["5"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(children) >0:
+                        parent = readAssociationSource(model, set_pop(children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $
@@ -978,11 +996,17 @@ Composite schedule {
                     String class
 
                     children = allIncomingAssociationInstances(model, mapping["3"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(children) >0:
+                        parent = readAssociationSource(model, set_pop(children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $
@@ -1153,11 +1177,17 @@ Composite schedule {
                     String class
 
                     children = allIncomingAssociationInstances(model, mapping["1"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(children) >0:
+                        parent = readAssociationSource(model, set_pop(children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $
@@ -1288,11 +1318,17 @@ Composite schedule {
                     String class
 
                     children = allIncomingAssociationInstances(model, mapping["2"], "composite_children")
-                    parent = readAssociationSource(model, set_pop(children))
-                    class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
-                    class = readAssociationSource(model, set_pop(class_beh))
-                    if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
-                        return True!
+                    if list_len(children) >0:
+                        parent = readAssociationSource(model, set_pop(children))
+                        class_beh = allIncomingAssociationInstances(model, parent, "behaviour")
+                        if list_len(class_beh) >0:
+                            class = readAssociationSource(model, set_pop(class_beh))
+                            if (value_eq(read_attribute(model, class, "name"), "Orchestrator")):
+                                return True!
+                            else:
+                                return False!
+                        else:
+                            return False!
                     else:
                         return False!
                 $

bootstrap/transform.alc

@@ -492,7 +492,7 @@ Boolean function transform_composite(host_model : Element, schedule_model : Elem
 
 	current = set_pop(allAssociationDestinations(schedule_model, composite, "Initial"))
 	while (is_nominal_instance(schedule_model, current, "Rule")):
-		//log("Executing " + current)
+		log("Executing " + current)
 		// Still a rule that we must execute
 		typename = read_type(schedule_model, current)
 		if (typename == "Atomic"):