X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=EnergyMeter%2FEnergyMeters.groovy;fp=EnergyMeter%2FEnergyMeters.groovy;h=85544953c2c05aa20996d6e0aee4bf89fef1ec48;hp=59670840b327d7dfd8d8a9f8e993d3d6abbe64e5;hb=d00fd74ad7e497d6849c284c6ba69db2d3ec8e65;hpb=e378d6a65b25030f8914dc97f04b81ddff351d9c

diff --git a/EnergyMeter/EnergyMeters.groovy b/EnergyMeter/EnergyMeters.groovy
index 5967084..8554495 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,16 +15,24 @@ public class EnergyMeters {
 	private String label = "energyMeter0"
 	private String displayName = "energyMeter0"
 	private int energy = 50
+	private int currentEnergy = 50
 
 		
 	EnergyMeters(Closure sendEvent, int deviceNumbers) {
 		this.sendEvent = sendEvent		
 		this.deviceNumbers = deviceNumbers
 		this.energyMeters = []
+<<<<<<< HEAD
+
+		def init = Verify.getIntFromList(30, 50, 70)
+		this.energy = init
+
+=======
 		
 		def init = Verify.getIntFromList(30, 50, 70)
 		this.energy = init
 		
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
 		energyMeters.add(new EnergyMeter(id, label, displayName, this.energy))
 	}
 
@@ -30,6 +41,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)
 		}
 	}