Changed MM and model

models/environment_PW.mvc

@@ -33,26 +33,25 @@ SimpleClassDiagrams Environment_PW{
 
     Class Port : Named, Positionable {}
     Class Boundary : Named, Positionable {}
-    Class Activity : Named, Positionable {}
+    Class Activity : Named, Positionable {
+        duration : Natural
+    }
     Class CommunicationSequence : Activity {
         actor : String
     }
-    Class TopActivity : Activity {}
-    Class Parallel : TopActivity {}
-    Class Sequence : TopActivity {}
-    Class Alternative : TopActivity {}
-    Class Event : Named {}
-    Class Input : Event {}
-    Class Output : Event {
-        duration : Natural
-    }
+    Class Parallel : Activity {}
+    Class Sequence : Activity {}
+    Class Alternative : Activity {}
+    Class Event : Activity {}
 
-    Association Has1 (Boundary, TopActivity) {}
-    Association Has2 (Boundary, Event) {}
-    Association Has3 (Boundary, Port) {}
+    Association Contains (Activity, Activity) {}
+    Association HasActivity (Boundary, Activity) {
+        target_lower_cardinality = 1
+        target_upper_cardinality = 1
+    }
+    Association HasPort (Boundary, Port) {}
     Association HasActivity (TopActivity, Activity) {}
     Association HasEventSequence (CommunicationSequence, Event) {}
-    Association NextEvent (Event, Event) {}
-    Association NextActivity (Activity, Activity) {}
+    Association Next (Activity, Activity) {}
     Association PortEvent (Port, Event) {}
 }

models/environment_model.mvc

@@ -14,42 +14,45 @@ Environment_PW environment_model_PW {
 
         Parallel {
             name = "s_"
+            duration = 0
 
-            {HasActivity} CommunicationSequence {
+            {Contains} CommunicationSequence {
                 name = "driver"
                 actor = "driver"
+                duration = 0
 
-                Output cmdUpD {
+                {Contains} Event cmdUpD {
                     name = "cmdUpD"
                     duration = 3
                 }
-                Output cmdStopD {
+                {Contains} Event cmdStopD {
                     name = "cmdStopD"
                     duration = 4
                 }
-                Output cmdDownP {
+                {Contains} Event cmdDownP {
                     name = "cmdDown"
                     duration = 3
                 }
-                Output lockOut {
+                {Contains} Event lockOut {
                     name = "lockOut"
                     duration = 1
                 }
             }
 
-            {HasActivity} CommunicationSequence {
+            {Contains} CommunicationSequence {
                 name = "passenger"
                 actor = "passenger"
+                duration = 0
 
-                Output cmdUp1 {
+                {Contains} Event cmdUp1 {
                     name = "cmdUp"
                     duration = 3
                 }
-                Output stickHead {
+                {Contains} Event stickHead {
                     name = "stickHead"
                     duration = 3
                 }
-                Output cmdUp2 {
+                {Contains} Event cmdUp2 {
                     name = "cmdUp"
                     duration = 2
                 }
@@ -57,12 +60,12 @@ Environment_PW environment_model_PW {
         }
     }
 
-    NextEvent (cmdUpD, cmdStopD) {}
-    NextEvent (cmdStopD, cmdDownP) {}
-    NextEvent (cmdDownP, lockOut) {}
+    Next (cmdUpD, cmdStopD) {}
+    Next (cmdStopD, cmdDownP) {}
+    Next (cmdDownP, lockOut) {}
 
-    NextEvent (cmdUp1, stickHead) {}
-    NextEvent (stickHead, cmdUp2) {}
+    Next (cmdUp1, stickHead) {}
+    Next (stickHead, cmdUp2) {}
 
     PortEvent (p_stickHead, stickHead) {}
     PortEvent (p_windowCommands, cmdUpD) {}

models/environment_to_EPN.alc

@@ -1,5 +1,4 @@
 // Pseudo-code
-//    assumption: Activities all have duration (e.g., 0 for parallel)
 //    TODO: add link to the ports of the boundary
 //    TODO: update MM to reflect the new changes to the structure (everything is an Activity with a Next link, and everything has a duration)