X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=TemperatureMeasurement%2FTemperatureMeasurements.groovy;h=608d18b1dc88df40cdd5690b6d8771eb1324a509;hb=8bb63273cb49791bd77cabe4e6c9bcc0947cdabd;hp=1f6d932e2ddb569c97d26b3d9ffe569482d58641;hpb=ef89c03ba3f5c7b61f30c8948a9170c36c91647f;p=smartthings-infrastructure.git diff --git a/TemperatureMeasurement/TemperatureMeasurements.groovy b/TemperatureMeasurement/TemperatureMeasurements.groovy index 1f6d932..608d18b 100644 --- a/TemperatureMeasurement/TemperatureMeasurements.groovy +++ b/TemperatureMeasurement/TemperatureMeasurements.groovy @@ -2,6 +2,9 @@ package TemperatureMeasurement import Timer.SimulatedTimer +//JPF's Verify API +import gov.nasa.jpf.vm.Verify + public class TemperatureMeasurements { private int deviceNumbers private List temperatureMeasurements @@ -11,8 +14,8 @@ public class TemperatureMeasurements { private String id = "temperatureMeasurementID0" private String label = "temperatureMeasurement0" private String displayName = "temperatureMeasurement0" - private int temperature = 50 - private int currentTemperature = 50 + private int temperature = 40 + private int currentTemperature = 40 TemperatureMeasurements(Closure sendEvent, int deviceNumbers, boolean init) { this.sendEvent = sendEvent @@ -20,8 +23,8 @@ public class TemperatureMeasurements { this.temperatureMeasurements = [] if (init) { - this.temperature = 50 - this.currentTemperature = 50 + this.temperature = 40 + this.currentTemperature = 40 } else { this.temperature = 60 this.currentTemperature = 60 @@ -39,6 +42,10 @@ public class TemperatureMeasurements { } } + def eventsSince(Date dateObj) { + return temperatureMeasurements[0].eventsSince() + } + //Methods for closures def count(Closure Input) { temperatureMeasurements.count(Input)