Updated all test files to use AttributeValue

integration/code/cbd_design.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD CausalBlockDiagrams_Design{
-    Class Float {
+    AttributeValue Float {
         $
             if (bool_not(is_physical_float(self))):
                 return "Float has no float value"!
@@ -11,7 +11,7 @@ SCD CausalBlockDiagrams_Design{
         $
     }
 
-    Class String {
+    AttributeValue String {
         $
             if (bool_not(is_physical_string(self))):
                 return "String has no string value"!
@@ -24,10 +24,7 @@ SCD CausalBlockDiagrams_Design{
     Class ICBlock{}
 
     Class ConstantBlock{
-        value : Float {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        value : Float
     }
 
     Class AdditionBlock{}
@@ -38,10 +35,7 @@ SCD CausalBlockDiagrams_Design{
     Class IntegratorBlock{}
     Class DerivatorBlock{}
     Class ProbeBlock{
-        name : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        name : String
     }
 
     Association Link(Block, Block){}

integration/code/cbd_runtime.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD CausalBlockDiagrams_Runtime{
-    Class Float {
+    AttributeValue Float {
         $
             if (bool_not(is_physical_float(self))):
                 return "Float has no float value"!
@@ -11,7 +11,7 @@ SCD CausalBlockDiagrams_Runtime{
         $
     }
 
-    Class String {
+    AttributeValue String {
         $
             if (bool_not(is_physical_string(self))):
                 return "String has no string value"!
@@ -21,30 +21,18 @@ SCD CausalBlockDiagrams_Runtime{
     }
 
     Class Block{
-        signal : Float {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        signal : Float
     }
     Class ICBlock{
-        last_in : Float {
-            target_lower_cardinality = 0
-            target_upper_cardinality = 1
-        }
+        last_in : Float
     }
 
     Class ConstantBlock{
-        value : Float {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        value : Float
     }
 
     Class ProbeBlock{
-        name : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        name : String
     }
 
     Class AdditionBlock{}
@@ -53,10 +41,7 @@ SCD CausalBlockDiagrams_Runtime{
     Class InverseBlock{}
     Class DelayBlock{}
     Class IntegratorBlock{
-        last_out : Float {
-            target_lower_cardinality = 0
-            target_upper_cardinality = 1
-        }
+        last_out? : Float
     }
 
     Class DerivatorBlock{}
@@ -64,15 +49,8 @@ SCD CausalBlockDiagrams_Runtime{
         lower_cardinality = 1
         upper_cardinality = 1
 
-        start_time : Float {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
-
-        current_time : Float {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        start_time : Float
+        current_time : Float
     }
 
     Association Link(Block, Block){

integration/code/fsa_design.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD FiniteStateAutomata_Design{
-    Class String {
+    AttributeValue String {
         $
             if (bool_not(is_physical_string(self))):
                 return "String has no string value"!
@@ -12,10 +12,7 @@ SCD FiniteStateAutomata_Design{
     }
 
     Class State {
-        name : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        name : String
     }
 
     Class InitialState {
@@ -24,14 +21,8 @@ SCD FiniteStateAutomata_Design{
     }
 
     Association Transition (State, State) {
-        event : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
-
-        raise : String {
-            target_upper_cardinality = 1
-        }
+        event : String
+        raise? : String
     }
 
     Inheritance (InitialState, State){}

integration/code/fsa_runtime.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD FiniteStateAutomata_Runtime{
-    Class String {
+    AttributeValue String {
         $
             if (bool_not(is_physical_string(self))):
                 return "String has no string value"!
@@ -12,10 +12,7 @@ SCD FiniteStateAutomata_Runtime{
     }
 
     Class State {
-        name : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
+        name : String
     }
 
     Class InitialState {
@@ -24,14 +21,8 @@ SCD FiniteStateAutomata_Runtime{
     }
 
     Association Transition (State, State){
-        event : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
-
-        raise : String {
-            target_upper_cardinality = 1
-        }
+        event : String
+        raise? : String
     }
 
     Inheritance (InitialState, State){}

integration/code/my_petrinet_with_MM.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD PetriNets{
-    Class Natural {}
+    AttributeValue Natural {}
     Class Place{
         tokens : Natural
     }

integration/code/my_petrinet_with_MM_and_constraints.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD PetriNets{
-    Class Natural {
+    AttributeValue Natural {
         $
             if (bool_not(is_physical_int(self))):
                 return "Natural has no integer value"!

integration/code/petrinets.mvc

@@ -1,7 +1,7 @@
 import models/SimpleClassDiagrams as SimpleClassDiagrams
 
 SimpleClassDiagrams PetriNets{
-    Class Natural {}
+    AttributeValue Natural {}
     Class Place{
         tokens : Natural
     }

integration/code/petrinets_constraints.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD PetriNets{
-    Class Natural {
+    AttributeValue Natural {
         $
             if (bool_not(is_physical_int(self))):
                 return "Natural has no integer value"!

integration/code/pn_design.mvc

@@ -1,8 +1,8 @@
 import models/SimpleClassDiagrams as SimpleClassDiagrams
 
 SimpleClassDiagrams PetriNets_Design{
-    Class Natural {}
-    Class String {}
+    AttributeValue Natural {}
+    AttributeValue String {}
 
     Class Place {
         tokens : Natural

integration/code/pn_runtime.mvc

@@ -1,9 +1,9 @@
 import models/SimpleClassDiagrams as SimpleClassDiagrams
 
 SimpleClassDiagrams PetriNets_Runtime{
-    Class Natural {}
-    Class Boolean {}
-    Class String {}
+    AttributeValue Natural {}
+    AttributeValue Boolean {}
+    AttributeValue String {}
 
     Class Place {
         tokens : Natural

integration/code/pn_runtime_MR.mvc

@@ -1,7 +1,7 @@
 SimpleClassDiagrams PetriNets_Runtime{
-    Class Natural {}
-    Class Boolean {}
-    Class String {}
+    AttributeValue Natural {}
+    AttributeValue Boolean {}
+    AttributeValue String {}
 
     Class Place {
         tokens : Natural

integration/code/ramified_petrinets.mvc

@@ -2,21 +2,14 @@ SCD Pre_PetriNets {
     // Add AL MM
 
     Class LHS{
-        constraint : Expression {
-            target_upper_cardinality = 1
-        }
+        constraint? : Expression
         upper_cardinality = 1
         lower_cardinality = 1
     }
     Class NAC{}
     Class Pre_Element{
-        label : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
-        constraint : Expression {
-            target_upper_cardinality = 1
-        }
+        label : String
+        constraint? : Expression
     }
     Association (LHS, Pre_Element)
     Association (NAC, Pre_Element){
@@ -62,13 +55,8 @@ SCD Post_PetriNets{
     }
 
     Class Post_Element {
-        label : String {
-            target_lower_cardinality = 1
-            target_upper_cardinality = 1
-        }
-        value : Expression {
-            target_upper_cardinality = 1
-        }
+        label : String
+        value? : Expression
     }
 
     Class Post_Place{}

integration/code/several_petrinets.mvc

@@ -2,7 +2,7 @@ import models/SimpleClassDiagrams as SCD
 include "primitives.alh"
 
 SCD PetriNets{
-    Class Natural {
+    AttributeValue Natural {
         $
             if (bool_not(is_physical_int(self))):
                 return "Natural has no integer value at " + name!

integration/code/simpleclassdiagrams.mvc

@@ -1,21 +1,31 @@
 import /formalisms/SimpleClassDiagrams as SCD
 
 SCD SimpleClassDiagrams{
-    Class Any {}
-    Class Natural {}
-    Class String {}
+    AttributeValue Natural {}
+    AttributeValue String {}
+    AttributeValue Boolean {}
+
+    Class Element {}
     Class Class{
-        lower_cardinality : Natural
-        upper_cardinality : Natural
+        lower_cardinality? : Natural
+        upper_cardinality? : Natural
+    }
+
+    Association Association (Element, Element){
+        source_lower_cardinality? : Natural
+        source_upper_cardinality? : Natural
+        target_lower_cardinality? : Natural
+        target_upper_cardinality? : Natural
     }
-    Association Association (Class, Class){
+
+    Association Attribute (Element, AttributeValue) {
+        optional : Boolean
         name : String
-        source_lower_cardinality : Natural
-        source_upper_cardinality : Natural
-        target_lower_cardinality : Natural
-        target_upper_cardinality : Natural
     }
-    Association Inheritance (Class, Class){}
+
+    Class AttributeValue {}
+    Association Inheritance (Element, Element){}
     Inheritance assoc_inh_class (Association, Class) {}
-    Inheritance class_inh_any (Class, Any) {}
+    Inheritance class_inh_element (Class, Element) {}
+    Inheritance attributevalue_inh_element (AttributeValue, Element) {}
 }