Browse Source

Updated two example scripts

Yentl Van Tendeloo 3 years ago
parent
commit
27a3038e36

+ 3 - 3
bootstrap/conformance_scd.alc

@@ -264,13 +264,13 @@ String function conformance_scd(model : Element):
 			if (attr_value < list_len(allInstances(model, metamodel_element))):
 				return "Upper cardinality violated for class: " + metamodel_element!
 
-	// Check all ComplexAttributes recursively
+	// Check all ActionLanguage recursively
 	Element all_complex_types
 	Element complex_instances
 	String complex_instance
 	String complex_type
 	String result
-	all_complex_types = allInstances(model["metamodel"]["metamodel"], "ComplexAttribute")
+	all_complex_types = allInstances(model["metamodel"]["metamodel"], "ActionLanguage")
 	while (set_len(all_complex_types) > 0):
 		complex_type = set_pop(all_complex_types)
 		complex_instances = allInstances(model, complex_type)
@@ -282,7 +282,7 @@ String function conformance_scd(model : Element):
 			result = check_location_conformance(model["model"][complex_instance], complex_type)
 
 			if (result != "OK"):
-				return "Complex attribute doesn't match for: " + complex_instance + "\n Message: " + result!
+				return "ActionLanguage attribute doesn't match for: " + complex_instance + "\n Message: " + result!
 
 	// Structure seems fine, now do global constraints
 	Element global_constraints

+ 2 - 2
models/ParallelDEVS/metamodels/PDEVS.mvc

@@ -1,4 +1,4 @@
-ComplexAttribute ActionCode {}
+ActionLanguage ActionCode {}
 SimpleAttribute String {}
 
 Class BaseDEVSBlock {
@@ -32,4 +32,4 @@ Class OutputPort: Port {}
 
 Association DEVSBlockToPort(BaseDEVSBlock, Port) {}
 Association DEVSInstanceToPort(DEVSInstance, Port) {}
-Association Channel (Port, Port) {}
+Association Channel (Port, Port) {}

+ 0 - 0
services/DEVS/models/.keepme