Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / DoorControl / DoorControls.groovy

diff --git a/DoorControl/DoorControls.groovy b/DoorControl/DoorControls.groovy
index 25818009adfd0ba480940322ed19e9fc60713c61..5327be01e731bec554808bb79b3ab406318940fb 100644 (file)
--- a/DoorControl/DoorControls.groovy
+++ b/DoorControl/DoorControls.groovy
@@ -2,9 +2,6 @@
 package DoorControl
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class DoorControls {
        int deviceNumbers       
        List doorControls
@@ -18,13 +15,12 @@ public class DoorControls {
        private String doorState = "closed"
        private String doorLatestValue = "closed"
 
-       DoorControls(Closure sendEvent, int deviceNumbers) {
+       DoorControls(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent
                this.timers = new SimulatedTimer()
                this.deviceNumbers = deviceNumbers
                this.doorControls = []
                
-               def init = Verify.getBoolean()
                if (init) {
                        this.doorState = "closed"
                        this.doorLatestValue = "closed"
@@ -48,6 +44,9 @@ public class DoorControls {
        def find(Closure Input) {
                doorControls.find(Input)
        }
+       def sort(Closure Input) {
+               doorControls.sort(Input)
+       }
        def collect(Closure Input) {
                doorControls.collect(Input)
        }
@@ -82,8 +81,9 @@ public class DoorControls {
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != doorControls[0].doorState) {
+                       this.doorState = eventDataMap["value"]
+                       this.doorLatestValue = eventDataMap["value"]
                        doorControls[0].setValue(eventDataMap["value"])
-                       this.doorState = doorControls[0].doorState
                        sendEvent(eventDataMap)
                }
        }