Updated description and environment model to the one in Joachim's thesis

models/description_model.mvc

@@ -26,8 +26,8 @@ Plant_PW plant_model_PW {
             PushPull pushpull2 {
                 name = "pushpull2"
             }
-            LockOut s_ {
-                name = "s_"
+            LockOut lockout {
+                name = "lockout"
             }
 
         }
@@ -45,6 +45,14 @@ Plant_PW plant_model_PW {
         }
     }
 
-    Controls (s_, passenger) {}
+    Controls (lockout, passenger) {}
     Controls (pushpull1, driver) {}
+    Controls (pushpull2, passenger) {}
+    Controls (rocker, passenger) {}
+
+    ConnectSwitch (driverWindowCommands, pushpull1) {}
+    ConnectSwitch (controlPassengerWindowCommands, pushpull2) {}
+    ConnectSwitch (lockCommands, lockout) {}
+    ConnectSwitch (passengerWindowCommands, rocker) {}
+    ConnectSensor (detectObject, IRSensor) {}
 }

models/environment_model.mvc

@@ -2,67 +2,72 @@ Environment_PW environment_model_PW {
     Boundary DriverBlockWindow {
         name = "DriverBlockWindow"
 
-        Port p_cmdUp {
-            name = "cmdUp"
+        Port p_lockOut {
+            name = "lockOut"
         }
-        Port p_cmdDown {
-            name = "cmdDown"
+        Port p_windowCommands {
+            name = "windowCommands"
         }
         Port p_stickHead {
             name = "stickHead"
         }
 
-        Alternative {
+        Parallel {
             name = "s_"
 
             {HasActivity} CommunicationSequence {
-                name = "Driver"
-                actor = "Driver"
+                name = "driver"
+                actor = "driver"
 
-                Output cmdUp1 {
-                    name = "cmdUp"
-                    duration = 1
+                Output cmdUpD {
+                    name = "cmdUpD"
+                    duration = 3
                 }
-                Output stickHead1 {
-                    name = "stickHead"
-                    duration = 1
+                Output cmdStopD {
+                    name = "cmdStopD"
+                    duration = 4
                 }
-                Output cmdDown1 {
+                Output cmdDownP {
                     name = "cmdDown"
+                    duration = 3
+                }
+                Output lockOut {
+                    name = "lockOut"
                     duration = 1
                 }
-
             }
 
             {HasActivity} CommunicationSequence {
-                name = "s_"
-                actor = "Driver"
+                name = "passenger"
+                actor = "passenger"
 
-                Output cmdUp2 {
+                Output cmdUp1 {
                     name = "cmdUp"
-                    duration = 1
+                    duration = 3
                 }
-                Output stickHead2 {
+                Output stickHead {
                     name = "stickHead"
-                    duration = 1
+                    duration = 3
                 }
-                Output cmdUp3 {
+                Output cmdUp2 {
                     name = "cmdUp"
-                    duration = 1
+                    duration = 2
                 }
             }
         }
     }
 
-    NextEvent (cmdUp1, stickHead1) {}
-    NextEvent (stickHead1, cmdDown1) {}
+    NextEvent (cmdUpD, cmdStopD) {}
+    NextEvent (cmdStopD, cmdDownP) {}
+    NextEvent (cmdDownP, lockOut) {}
 
-    NextEvent (cmdUp2, stickHead2) {}
-    NextEvent (stickHead2, cmdUp3) {}
+    NextEvent (cmdUp1, stickHead) {}
+    NextEvent (stickHead, cmdUp2) {}
 
-    PortEvent (p_stickHead, stickHead1) {}
-    PortEvent (p_stickHead, stickHead2) {}
-    PortEvent (p_cmdUp, cmdUp1) {}
-    PortEvent (p_cmdUp, cmdUp2) {}
-    PortEvent (p_cmdDown, cmdDown1) {}
+    PortEvent (p_stickHead, stickHead) {}
+    PortEvent (p_windowCommands, cmdUpD) {}
+    PortEvent (p_windowCommands, cmdDownD) {}
+    PortEvent (p_windowCommands, cmdUp1) {}
+    PortEvent (p_windowCommands, cmdUp2) {}
+    PortEvent (p_lockOut, lockOut) {}
 }