Adding switchLevelChangeEvent to python script!

[smartthings-infrastructure.git] / AccelerationSensor / AccelerationSensors.groovy

diff --git a/AccelerationSensor/AccelerationSensors.groovy b/AccelerationSensor/AccelerationSensors.groovy
index db90c564479fd7d837faeb91818dfd4822582c45..7cfe1d08094f25c1fbcbb25186df96ce349ca1ab 100644 (file)
--- a/AccelerationSensor/AccelerationSensors.groovy
+++ b/AccelerationSensor/AccelerationSensors.groovy
@@ -2,9 +2,6 @@
 package AccelerationSensor
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class AccelerationSensors {
        private int deviceNumbers
        private List accelerationSensors
@@ -17,35 +14,44 @@ public class AccelerationSensors {
        private String acceleration = "inactive"
        private String currentAcceleration = "inactive"
        private String accelerationLatestValue = "inactive"
+       
 
                
-       AccelerationSensors(Closure sendEvent, int deviceNumbers) {
+       AccelerationSensors(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.accelerationSensors = []
 
-               /*def init = Verify.getBoolean()
                if (init) {
                        this.acceleration = "inactive"
                        this.accelerationLatestValue = "inactive"
                } else {
                        this.acceleration = "active"
                        this.accelerationLatestValue = "active"
-               }*/
+               }
                accelerationSensors.add(new AccelerationSensor(id, label, displayName, this.acceleration, this.accelerationLatestValue))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
                if (eventDataMap["value"] != accelerationSensors[0].acceleration) {
+                       this.accelerationLatestValue = eventDataMap["value"]
+                       this.acceleration = eventDataMap["value"]
+                       this.currentAcceleration = eventDataMap["value"]
                        accelerationSensors[0].setValue(eventDataMap["value"])
-                       this.accelerationLatestValue = accelerationSensors[0].accelerationLatestValue
-                       this.acceleration = accelerationSensors[0].acceleration
-                       this.currentAcceleration = accelerationSensors[0].acceleration
                        sendEvent(eventDataMap)
                }
        }
 
+       //methods
+       def eventsSince(Date dateObj) {
+               return accelerationSensors[0].eventsSince()
+       }
+               
+       def statesSince(String info, Date dateObj) {
+               return accelerationSensors[0].statesSince()
+       }
+
        //Methods for closures
        def count(Closure Input) {
                accelerationSensors.count(Input)
@@ -56,6 +62,9 @@ public class AccelerationSensors {
        def each(Closure Input) {
                accelerationSensors.each(Input)
        }
+       def sort(Closure Input) {
+               accelerationSensors.each(Input)
+       }
        def find(Closure Input) {
                accelerationSensors.find(Input)
        }
@@ -72,10 +81,6 @@ public class AccelerationSensors {
                accelerationSensors[0].latestValue(deviceFeature)//It is called if we have only one device
        }
 
-       def statesSince(String info, Date dateObj) {
-               return accelerationSensors[0].statesSince(info, dateObj)
-       }
-
        def getAt(int ix) {
                accelerationSensors[ix]
        }