Some minor changes!

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

diff --git a/PowerMeter/PowerMeters.groovy b/PowerMeter/PowerMeters.groovy
index cf610900283de8442923c8493909feecaffe409c..727da7dc69c1510f287289f0ccb77c2dda61e46c 100644 (file)
--- a/PowerMeter/PowerMeters.groovy
+++ b/PowerMeter/PowerMeters.groovy
@@ -2,9 +2,6 @@
 package PowerMeter
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class PowerMeters {
        private int deviceNumbers
        private List powerMeters
@@ -18,23 +15,27 @@ public class PowerMeters {
        private int currentPower = 50
 
                
-       PowerMeters(Closure sendEvent, int deviceNumbers) {
+       PowerMeters(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent              
                this.deviceNumbers = deviceNumbers
                this.powerMeters = []
 
-               def init = Verify.getIntFromList(30, 50, 70)
-               this.power = init
-
+               if (init) {
+                       this.power = 50
+                       this.currentPower = 50
+               } else {
+                       this.power = 60
+                       this.currentPower = 60
+               }
                powerMeters.add(new PowerMeter(id, label, displayName, this.power))
        }
 
        //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 +53,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 +65,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]
        }