X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=EnergyMeter%2FEnergyMeters.groovy;h=a3f2b8dff1409b68958ad937d738dc69e3099585;hp=caec87591a4e041efd6f47cd1aa5f6bfdf155157;hb=86c861ff59c870277d034de77d6cef2a4c6f5aa4;hpb=7bc2c68bdfb07a54d6e8399e7514d715c78a2398

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index caec875..a3f2b8d 100644
--- a/EnergyMeter/EnergyMeters.groovy
+++ b/EnergyMeter/EnergyMeters.groovy
@@ -2,6 +2,9 @@
 package EnergyMeter
 import Timer.SimulatedTimer
 
+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify
+
 public class EnergyMeters {
 	private int deviceNumbers
 	private List energyMeters
@@ -12,6 +15,7 @@ public class EnergyMeters {
 	private String label = "energyMeter0"
 	private String displayName = "energyMeter0"
 	private int energy = 50
+	private int currentEnergy = 50
 
 		
 	EnergyMeters(Closure sendEvent, int deviceNumbers) {
@@ -19,6 +23,9 @@ public class EnergyMeters {
 		this.deviceNumbers = deviceNumbers
 		this.energyMeters = []
 
+		def init = Verify.getIntFromList(30, 50, 70)
+		this.energy = init
+
 		energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
 	}
 
@@ -27,6 +34,7 @@ public class EnergyMeters {
 		if (eventDataMap["value"] != energyMeters[0].energy) {
 			energyMeters[0].setValue(eventDataMap["value"])
 			this.energy = energyMeters[0].energy
+			this.currentEnergy = energyMeters[0].currentEnergy		
 			sendEvent(eventDataMap)
 		}
 	}