Minor change in classes

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

diff --git a/TemperatureMeasurement/TemperatureMeasurement.groovy b/TemperatureMeasurement/TemperatureMeasurement.groovy
index afcb768b9882ca7f4728396348f2ed19ee22c93c..99afe6a3b117c3e5c616c48a7c97c0c70b0034ba 100644 (file)
--- a/TemperatureMeasurement/TemperatureMeasurement.groovy
+++ b/TemperatureMeasurement/TemperatureMeasurement.groovy
@@ -1,27 +1,39 @@
 //Create a class for temperature measurement
 package TemperatureMeasurement
-import Timer.SimulatedTimer
+import SmartThing.SmartThing
 
-public class TemperatureMeasurement {
-       private String id
-       private String label
-       private String displayName
-       private int temperature
-       private int currentTemperature
+//Importing mutable integer class
+import MutableInteger.MutableInteger
 
-       TemperatureMeasurement(String id, String label, String displayName, int temperature) {
+public class TemperatureMeasurement 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 currentTemperature = new MutableInteger()
+       // Maps from features to values
+       HashMap<String, MutableInteger> deviceIntValuesMap = new HashMap<String, MutableInteger>()
+
+       TemperatureMeasurement(Closure sendEvent, StringBuilder id, StringBuilder label, StringBuilder displayName, MutableInteger currentTemperature) {
+               deviceIntValuesMap = deviceIntValueSmartThing
+               idSmartThing = id
+               labelSmartThing = label
+               displayNameSmartThing = displayName
+               sendEventSmartThings = sendEvent
+
+               // Initialization
                this.id = id
                this.label = label
                this.displayName = displayName
-               this.temperature = temperature
-               this.currentTemperature = temperature
+               this.currentTemperature = currentTemperature
+
+               deviceIntValuesMap.put("temperature", currentTemperature)
        }
 
-       //By Model Checker
-       def setValue(String value) {
-               println("the temperature is changed to $value!")
-               this.temperature = value.toInteger()
-               this.currentTemperature = value.toInteger()
+       // Methods to return values
+       def getCurrentTemperature() {
+               return currentTemperature.getValue()
        }
 
 }