Minor change in classes

[smartthings-infrastructure.git] / RelativeHumidityMeasurement / RelativeHumidityMeasurement.groovy

diff --git a/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy b/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
index 47da3b5972653b99d9c66859718469b213edd2de..8d7c4e06028571d75ba28150718f1c485e076595 100644 (file)
--- a/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
+++ b/RelativeHumidityMeasurement/RelativeHumidityMeasurement.groovy
@@ -1,52 +1,38 @@
 //Create a class for relative humidity measurement
 package RelativeHumidityMeasurement
-import Timer.SimulatedTimer
+import SmartThing.SmartThing
 
-public class RelativeHumidityMeasurement {
-       private String id
-       private String label
-       private String displayName
-       private int humidity
-       private int currentHumidity
+//Importing mutable integer class
+import MutableInteger.MutableInteger
 
-       RelativeHumidityMeasurement(String id, String label, String displayName, int humidity) {
+public class RelativeHumidityMeasurement extends SmartThing {
+       // id, label, and display name of the device
+       StringBuilder id = new StringBuilder()
+       StringBuilder label = new StringBuilder()
+       StringBuilder displayName = new StringBuilder()
+       // Features with numberical values
+       MutableInteger currentHumidity = new MutableInteger()
+       // Maps from features to values
+       HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
+
+       RelativeHumidityMeasurement(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentHumidity) {
+               deviceIntValuesMap = deviceIntValueSmartThing
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
+
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.humidity = humidity
-       }
-
-       def eventsSince() {
-               def evtHumidity = [[name: "humidity", value: this.humidity.toString(), deviceId: "humidityMeasurementID0", descriptionText: "",
-                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']]
-               def init = Verify.getInt(0,1)
-               def evtToSend = []
-               if (init == 0) {//return empty set
-                       return evtToSend
-               } else if (init == 1) {//send one open event
-                       evtHumidity.each{
-                               evtToSend.add(it)
-                       }
-                       return evtToSend
-               }
-       }
-
-       //By Model Checker
-       def setValue(String value) {
-               println("the humidity is changed to $value!")
-               this.humidity = value.toInteger()
-               this.currentHumidity = value.toInteger()
-       }
+               this.currentHumidity = currentHumidity
 
-       def currentValue(String deviceFeature) {
-               if (deviceFeature == "humidity") {
-                       return humidity
-               }
+               deviceIntValuesMap.put("humidity", currentHumidity)
        }
 
-       def latestValue(String deviceFeature) {
-               if (deviceFeature == "humidity") {
-                       return humidity
-               }
+       // Methods to return values
+       def getCurrentHumidity() {
+               return currentHumidity.getValue()
        }
 }