Fixing some bugs

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

diff --git a/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy b/RelativeHumidityMeasurement/RelativeHumidityMeasurements.groovy
index 7bee67627e85557eb190e36908c7c0001747396d..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,14 +15,18 @@ 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))
        }
 
@@ -39,6 +40,10 @@ public class RelativeHumidityMeasurements {
                }
        }
 
+       def eventsSince(Date dateObj) {
+               return humidityMeasurements[0].eventsSince()
+       }
+
        //Methods for closures
        def count(Closure Input) {
                humidityMeasurements.count(Input)