Minor change in classes

[smartthings-infrastructure.git] / EnergyMeter / EnergyMeters.groovy

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index 553ed86da28e29c33fdd8479a1e1df28f3bb58d1..3722a2ba8b3e6c8cd8a8edf56d5d042712d71ba8 100644 (file)
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -1,67 +1,35 @@
 //Create a class for energy meter
 package EnergyMeter
-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 EnergyMeters {
-       private int deviceNumbers
-       private List energyMeters
-       def sendEvent
+public class EnergyMeters extends SmartThings {
+       List energyMeters = new ArrayList()
 
-       //For one device(We cannot have obj.id)-> We should have obj[0].id
-       private String id = "energyMeterID0"
-       private String label = "energyMeter0"
-       private String displayName = "energyMeter0"
-       private int energy = 50
-       private int currentEnergy = 50
+       EnergyMeters(Closure sendEvent, boolean init) {
+               // Only initialize one time since we only have one device for each capability
+               energyMeters = smartThings
 
-               
-       EnergyMeters(Closure sendEvent, int deviceNumbers) {
-               this.sendEvent = sendEvent              
-               this.deviceNumbers = deviceNumbers
-               this.energyMeters = []
+               // Initialization
+               StringBuilder id = new StringBuilder("energyID0")
+               StringBuilder label = new StringBuilder("energy")
+               StringBuilder displayName = new StringBuilder("energy0")
+               MutableInteger energy = new MutableInteger()
 
-               //def init = Verify.getIntFromList(30, 50, 70)
-               //this.energy = init
+               if (init)
+                       energy.setValue(50)
+               else
+                       energy.setValue(60)
 
-               energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
+               energyMeters.add(new EnergyMeter(sendEvent, id, label, displayName, energy))
        }
 
-       //By Model Checker
-       def setValue(LinkedHashMap eventDataMap) {
-               if (eventDataMap["value"] != energyMeters[0].energy) {
-                       energyMeters[0].setValue(eventDataMap["value"])
-                       this.energy = energyMeters[0].energy
-                       this.currentEnergy = energyMeters[0].currentEnergy              
-                       sendEvent(eventDataMap)
-               }
-       }
-
-       //Methods for closures
-       def count(Closure Input) {
-               energyMeters.count(Input)
-       }
-       def size() {
-               energyMeters.size()
-       }
-       def each(Closure Input) {
-               energyMeters.each(Input)
-       }
-       def find(Closure Input) {
-               energyMeters.find(Input)
-       }
-       def collect(Closure Input) {
-               energyMeters.collect(Input)
-       }
-
-
-       def currentValue(String deviceFeature) {
-               energyMeters[0].currentValue(deviceFeature)//It is called if we have only one device
-       }
-
-       def getAt(int ix) {
-               energyMeters[ix]
+       // Methods to return values
+       def getCurrentEnergy() {
+               List tmpValues = new ArrayList()
+               tmpValues.add(energyMeters[0].getCurrentEnergy())
+               return tmpValues
        }
 }