Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

[smartthings-infrastructure.git] / PowerMeter / PowerMeters.groovy

diff --git a/PowerMeter/PowerMeters.groovy b/PowerMeter/PowerMeters.groovy
index 4b4f1937a233243b71fe653e4142cc6102363151..836218299f018ae5026547b9e1f34629535c838f 100644 (file)
--- a/PowerMeter/PowerMeters.groovy
+++ b/PowerMeter/PowerMeters.groovy
@@ -31,10 +31,10 @@ public class PowerMeters {
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != powerMeters[0].power) {
+               if (eventDataMap["value"].toInteger() != powerMeters[0].power) {
+                       this.power = eventDataMap["value"].toInteger()
+                       this.currentPower = eventDataMap["value"].toInteger()
                        powerMeters[0].setValue(eventDataMap["value"])
-                       this.power = powerMeters[0].power
-                       this.currentPower = powerMeters[0].currentPower
                        sendEvent(eventDataMap)
                }
        }
@@ -52,6 +52,9 @@ public class PowerMeters {
        def find(Closure Input) {
                powerMeters.find(Input)
        }
+       def sort(Closure Input) {
+               powerMeters.sort(Input)
+       }
        def collect(Closure Input) {
                powerMeters.collect(Input)
        }
@@ -61,6 +64,10 @@ public class PowerMeters {
                powerMeters[0].currentValue(deviceFeature)//It is called if we have only one device
        }
 
+       def latestValue(String deviceFeature) {
+               powerMeters[0].latestValue(deviceFeature)//It is called if we have only one device
+       }
+
        def getAt(int ix) {
                powerMeters[ix]
        }