Value filtering finished

[smartthings-infrastructure.git] / IlluminanceMeasurement / IlluminanceMeasurements.groovy

diff --git a/IlluminanceMeasurement/IlluminanceMeasurements.groovy b/IlluminanceMeasurement/IlluminanceMeasurements.groovy
index 1f3e9746b0086bb3c8d14dfaf93ed99e8ca412c1..dbeae2a60b34e7d508969756311e27e3565a11ec 100644 (file)
--- a/IlluminanceMeasurement/IlluminanceMeasurements.groovy
+++ b/IlluminanceMeasurement/IlluminanceMeasurements.groovy
@@ -2,9 +2,6 @@
 package IlluminanceMeasurement
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class IlluminanceMeasurements {
        private int deviceNumbers
        private List illuminanceMeasurements
@@ -18,23 +15,28 @@ public class IlluminanceMeasurements {
        private int currentIlluminance = 50000
 
                
-       IlluminanceMeasurements(Closure sendEvent, int deviceNumbers) {
+       IlluminanceMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.illuminanceMeasurements = []
 
-               def init = Verify.getIntFromList(40000, 50000, 60000)
-               this.illuminance = init
+               if (init) {
+                       this.illuminance = 50000
+                       this.currentIlluminance = 50000
+               } else {
+                       this.illuminance = 60000
+                       this.currentIlluminance = 60000
+               }
 
                illuminanceMeasurements.add(new IlluminanceMeasurement(id, label, displayName, this.illuminance))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != illuminanceMeasurements[0].illuminance) {
+               if (eventDataMap["value"].toInteger() != illuminanceMeasurements[0].illuminance) {
+                       this.illuminance = eventDataMap["value"].toInteger()
+                       this.currentIlluminance = eventDataMap["value"].toInteger()
                        illuminanceMeasurements[0].setValue(eventDataMap["value"])
-                       this.illuminance = illuminanceMeasurements[0].illuminance
-                       this.currentIlluminance = illuminanceMeasurements[0].illuminance
                        sendEvent(eventDataMap)
                }
        }
@@ -52,6 +54,9 @@ public class IlluminanceMeasurements {
        def find(Closure Input) {
                illuminanceMeasurements.find(Input)
        }
+       def sort(Closure Input) {
+               illuminanceMeasurements.sort(Input)
+       }
        def collect(Closure Input) {
                illuminanceMeasurements.collect(Input)
        }
@@ -61,6 +66,10 @@ public class IlluminanceMeasurements {
                illuminanceMeasurements[0].currentValue(deviceFeature)//It is called if we have only one device
        }
 
+       def latestValue(String deviceFeature) {
+               illuminanceMeasurements[0].latestValue(deviceFeature)//It is called if we have only one device
+       }
+
        def getAt(int ix) {
                illuminanceMeasurements[ix]
        }