Fixing some bugs

[smartthings-infrastructure.git] / RelativeHumidityMeasurement / RelativeHumidityMeasurements.groovy

diff --git a/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy b/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
index 8b6bc4bfa76e58dfdf8b0d6241becaf55225d278..4859ae0a192c54afaacd95cdd9b58af3ecabae54 100644 (file)
--- a/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
+++ b/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
@@ -2,9 +2,6 @@
 package RelativeHumidityMeasurement
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class RelativeHumidityMeasurements {
        private int deviceNumbers
        private List humidityMeasurements
@@ -18,27 +15,35 @@ public class RelativeHumidityMeasurements {
        private int currentHumidity = 50
 
                
-       RelativeHumidityMeasurements(Closure sendEvent, int deviceNumbers) {
+       RelativeHumidityMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.humidityMeasurements = []
 
-               def init = Verify.getIntFromList(30, 50, 70)
-               this.humidity = init
-
+               if (init) {
+                       this.humidity = 50
+                       this.currentHumidity = 50
+               } else {
+                       this.humidity = 60
+                       this.currentHumidity = 60
+               }
                humidityMeasurements.add(new RelativeHumidityMeasurement(id, label, displayName, this.humidity))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != humidityMeasurements[0].humidity) {
-                       humidityMeasurements[0].setValue(eventDataMap["value"])
-                       this.humidity = humidityMeasurements[0].humidity
-                       this.currentHumidity = humidityMeasurements[0].currentHumidity          
+               if (eventDataMap["value"].toInteger() != humidityMeasurements[0].humidity) {
+                       this.humidity = eventDataMap["value"].toInteger()
+                       this.currentHumidity = eventDataMap["value"].toInteger()
+                       humidityMeasurements[0].setValue(eventDataMap["value"]) 
                        sendEvent(eventDataMap)
                }
        }
 
+       def eventsSince(Date dateObj) {
+               return humidityMeasurements[0].eventsSince()
+       }
+
        //Methods for closures
        def count(Closure Input) {
                humidityMeasurements.count(Input)
@@ -52,6 +57,9 @@ public class RelativeHumidityMeasurements {
        def find(Closure Input) {
                humidityMeasurements.find(Input)
        }
+       def sort(Closure Input) {
+               humidityMeasurements.sort(Input)
+       }
        def collect(Closure Input) {
                humidityMeasurements.collect(Input)
        }
@@ -61,6 +69,10 @@ public class RelativeHumidityMeasurements {
                humidityMeasurements[0].currentValue(deviceFeature)//It is called if we have only one device
        }
 
+       def latestValue(String deviceFeature) {
+               humidityMeasurements[0].latestValue(deviceFeature)//It is called if we have only one device
+       }
+
        def getAt(int ix) {
                humidityMeasurements[ix]
        }