Fixing conflicting files.

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

diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy
index 15119cc38c6bd9e4484c5f4a23eb3cc8f46298d2..31ba842155c964f2da0b8140c6ffe03863ba9924 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurements.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurements.groovy
@@ -15,7 +15,8 @@ public class TemperatureMeasurements {
        private String label = "temperatureMeasurement0"
        private String displayName = "temperatureMeasurement0"
        private int temperature = 50
-       
+       private int currentTemperature = 50
+
        TemperatureMeasurements(Closure sendEvent, int deviceNumbers) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
@@ -29,9 +30,10 @@ public class TemperatureMeasurements {
 
        //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)
                }
        }
@@ -49,6 +51,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)
        }