Infrastructure compatible with 2 types of switches.(Normal switches and otherVsGeneri...

[smartthings-infrastructure.git] / TemperatureMeasurement / TemperatureMeasurements.groovy

diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 15119cc38c6bd9e4484c5f4a23eb3cc8f46298d2..215894f89d5cc922e6ae45ef121344207570db00 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurements.groovy
@@ -15,27 +15,37 @@ public class TemperatureMeasurements {
        private String label = "temperatureMeasurement0"
        private String displayName = "temperatureMeasurement0"
        private int temperature = 50
-       
-       TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
+       private int currentTemperature = 50
+
+       TemperatureMeasurements(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.temperatureMeasurements = []
 
-               //def initTemp = Verify.getIntFromList(30, 50, 70)
-               //this.temperature = initTemp
-       
+               if (init) {
+                       this.temperature = 50
+                       this.currentTemperature = 50
+               } else {
+                       this.temperature = 60
+                       this.currentTemperature = 60
+               }       
                temperatureMeasurements.add(new TemperatureMeasurement(id, label, displayName, this.temperature))
        }
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != temperatureMeasurements[0].temperature) {
+               if (eventDataMap["value"].toInteger() != temperatureMeasurements[0].temperature) {
+                       this.temperature = eventDataMap["value"].toInteger()
+                       this.currentTemperature = eventDataMap["value"].toInteger()
                        temperatureMeasurements[0].setValue(eventDataMap["value"])
-                       this.temperature = temperatureMeasurements[0].temperature
                        sendEvent(eventDataMap)
                }
        }
 
+       def eventsSince(Date dateObj) {
+               return temperatureMeasurements[0].eventsSince()
+       }
+
        //Methods for closures
        def count(Closure Input) {
                temperatureMeasurements.count(Input)
@@ -49,6 +59,9 @@ public class TemperatureMeasurements {
        def find(Closure Input) {
                temperatureMeasurements.find(Input)
        }
+       def sort(Closure Input) {
+               temperatureMeasurements.sort(Input)
+       }
        def collect(Closure Input) {
                temperatureMeasurements.collect(Input)
        }