A minor change in classes

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

diff --git a/PowerMeter/PowerMeters.groovy b/PowerMeter/PowerMeters.groovy
index cf610900283de8442923c8493909feecaffe409c..330a4e3af6dd2053bb54e96fc80ef6cd4e92b4d5 100644 (file)
--- a/PowerMeter/PowerMeters.groovy
+++ b/PowerMeter/PowerMeters.groovy
@@ -1,67 +1,35 @@
 //Create a class for power meter
 package PowerMeter
-import Timer.SimulatedTimer
+import SmartThing.SmartThings
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
+//Importing mutable integer class
+import MutableInteger.MutableInteger
 
-public class PowerMeters {
-       private int deviceNumbers
-       private List powerMeters
-       def sendEvent
+public class PowerMeters extends SmartThings {
+       List powerMeters = new ArrayList()
 
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "powerMeterID0"
-       private String label = "powerMeter0"
-       private String displayName = "powerMeter0"
-       private int power = 50
-       private int currentPower = 50
+       PowerMeters(Closure sendEvent, boolean init) {
+               // Only initialize one time since we only have one device for each capability
+               powerMeters = smartThings
 
-               
-       PowerMeters(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.powerMeters = []
+               // Initialization
+               StringBuilder id = new StringBuilder("powerMeterID0")
+               StringBuilder label = new StringBuilder("powerMeter")
+               StringBuilder displayName = new StringBuilder("powerMeter0")
+               MutableInteger power = new MutableInteger()
 
-               def init = Verify.getIntFromList(30, 50, 70)
-               this.power = init
+               if (init)
+                       power.setValue(50)
+               else
+                       power.setValue(60)
 
-               powerMeters.add(new PowerMeter(id, label, displayName, this.power))
+               powerMeters.add(new PowerMeter(sendEvent, id, label, displayName, power))
        }
 
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != powerMeters[0].power) {
-                       powerMeters[0].setValue(eventDataMap["value"])
-                       this.power = powerMeters[0].power
-                       this.currentPower = powerMeters[0].currentPower
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               powerMeters.count(Input)
-       }
-       def size() {
-               powerMeters.size()
-       }
-       def each(Closure Input) {
-               powerMeters.each(Input)
-       }
-       def find(Closure Input) {
-               powerMeters.find(Input)
-       }
-       def collect(Closure Input) {
-               powerMeters.collect(Input)
-       }
-
-
-       def currentValue(String deviceFeature) {
-               powerMeters[0].currentValue(deviceFeature)//It is called if we have only one device
-       }
-
-       def getAt(int ix) {
-               powerMeters[ix]
+       // Methods to return values
+       def getCurrentPower() {
+               List tmpValues = new ArrayList()
+               tmpValues.add(powerMeters[0].getCurrentPower())
+               return tmpValues
        }
 }