Fixing bugs in classes

diff --git a/ContactSensor/ContactSensor.groovy b/ContactSensor/ContactSensor.groovy
index 141faf2b7ef3ec33f3af12f7dc1de4c13a04b31a..413b58ce1f29214abf4608e1b65f7565466ec36c 100644 (file)
--- a/ContactSensor/ContactSensor.groovy
+++ b/ContactSensor/ContactSensor.groovy
@@ -29,19 +29,8 @@ public class ContactSensor {
                this.contactState = value
                this.currentContact = value
                this.latestValue = value
                this.contactState = value
                this.currentContact = value
                this.latestValue = value

-               //this.events.add(eventDataMap)
-               //this.timeOfEvents.add(System.currentTimeMillis())

        }
 
        }
 

-       /*def eventsSince(Date dateObj) {
-               def List happenedEvents = []
-               def sinceThen = dateObj.time
-               for (int i = 0;i < timeOfEvents.size();i++) {
-                       if (timeOfEvents[i]>=sinceThen)
-                               happenedEvents.add(events[i])
-               }
-               return happenedEvents
-       }*/

        
        def on() {
                println("the contact sensor with id:$id is armed!")
        
        def on() {
                println("the contact sensor with id:$id is armed!")

diff --git a/ContactSensor/ContactSensors.groovy b/ContactSensor/ContactSensors.groovy
index c691853aad4c3ea157ff65cc8b90ac4ff290f3f0..74508a8aba0915799114b190407e3961f5c91d6b 100644 (file)
--- a/ContactSensor/ContactSensors.groovy
+++ b/ContactSensor/ContactSensors.groovy
@@ -25,23 +25,6 @@ public class ContactSensors {
                this.deviceNumbers = deviceNumbers
                this.contacts = []
 
                this.deviceNumbers = deviceNumbers
                this.contacts = []
 

-               /*def initSensor = Verify.getBoolean()
-               if (initSensor) {
-                       this.contactState = "closed"
-                       this.currentContact = "closed"
-                       this.latestValue = "closed"
-               } else {
-                       this.contactState = "open"
-                       this.currentContact = "open"
-                       this.latestValue = "open"
-               }
-
-               def initAlarm = Verify.getBoolean()
-               if (initAlarm) {
-                       this.alarmState = "armed"
-               } else {
-                       this.alarmState = "not armed"
-               }*/

                contacts.add(new ContactSensor(id, label, displayName, this.contactState, this.currentContact, this.alarmState, this.latestValue))
        }
 
                contacts.add(new ContactSensor(id, label, displayName, this.contactState, this.currentContact, this.alarmState, this.latestValue))
        }
 

diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy
index ff83a50e86a0c8c51b96499b252f2aa7b4c9943b..8782365c322147d3d01655b98b77c51419f8e860 100644 (file)
--- a/SwitchLevel/SwitchLevel.groovy
+++ b/SwitchLevel/SwitchLevel.groovy
@@ -96,9 +96,16 @@ public class SwitchLevel {
        }
 
        //By Model Checker
        }
 
        //By Model Checker

-       def setValue(String value) {
-               println("the switch with id:$id is setted to level $value!")
-               this.level = value.toInteger()
-               this.rate = value.toInteger()
+       def setValue(String value, String name) {
+               if (name == "switch") {
+                       println("the switch with id:$id is $value!")
+                       this.switchLatestValue = value
+                       this.switchState = value
+                       this.currentSwitch = value
+               } else if (name == "level") {
+                       println("the switch with id:$id is setted to level $value!")
+                       this.level = value.toInteger()
+                       this.rate = value.toInteger()
+               }

        }
 }
        }
 }

diff --git a/SwitchLevel/SwitchLevels.groovy b/SwitchLevel/SwitchLevels.groovy
index 591611a6e8394be165e964960d50e86805dfd3ac..490e52dc66338184f01c8fef8b3a53a3098d3641 100644 (file)
--- a/SwitchLevel/SwitchLevels.groovy
+++ b/SwitchLevel/SwitchLevels.groovy
@@ -105,11 +105,21 @@ public class SwitchLevels {
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {
 
        //By Model Checker
        def setValue(LinkedHashMap eventDataMap) {

-               if (eventDataMap["value"].toInteger() != switchLevels[0].level) {
-                       this.level = eventDataMap["value"].toInteger()
-                       this.rate = eventDataMap["value"].toInteger()
-                       switchLevels[0].setValue(eventDataMap["value"])
-                       sendEvent(eventDataMap)
+               if (eventDataMap["name"] == "switch") {
+                       if (eventDataMap["value"] != switchLevels[0].switchState) {
+                               this.switchState = eventDataMap["value"]
+                               this.switchLatestValue = eventDataMap["value"]
+                               this.currentSwitch = eventDataMap["value"]
+                               switchLevels[0].setValue(eventDataMap["value"], "switch")
+                               sendEvent(eventDataMap)
+                       }
+               } else if (eventDataMap["name"] == "level") {
+                       if (eventDataMap["value"].toInteger() != switchLevels[0].level) {
+                               this.level = eventDataMap["value"].toInteger()
+                               this.rate = eventDataMap["value"].toInteger()
+                               switchLevels[0].setValue(eventDataMap["value"], "level")
+                               sendEvent(eventDataMap)
+                       }

                }
        }
 
                }
        }
 

diff --git a/Thermostat/Thermostats.groovy b/Thermostat/Thermostats.groovy
index 73a2148c0b9477282bc8c82b7bd743024b441173..b2abdcbe2ed6366f039f961675aa246a3b42f5e9 100644 (file)
--- a/Thermostat/Thermostats.groovy
+++ b/Thermostat/Thermostats.groovy
@@ -228,7 +228,7 @@ public class Thermostats{
                        this.currentHeatingSetpoint = heatingSetpoint
                        this.heatingSetpoint = heatingSetpoint
                        this.latestCoolingSetPoint = coolingSetpoint
                        this.currentHeatingSetpoint = heatingSetpoint
                        this.heatingSetpoint = heatingSetpoint
                        this.latestCoolingSetPoint = coolingSetpoint

-                       this.latestHeatingSetpoint = heatingSetpoint
+                       this.latestHeatingSetPoint = heatingSetpoint

                        thermostats[0].setHold(info1, coolingSetpoint, heatingSetpoint, info2, info3)
                }
        }
                        thermostats[0].setHold(info1, coolingSetpoint, heatingSetpoint, info2, info3)
                }
        }


@@ -244,7 +244,7 @@ public class Thermostats{
                        }
                } else if (eventDataMap["name"] == "heatingSetpoint") {
                        if (eventDataMap["value"].toInteger() != thermostats[0].heatingSetpoint) {
                        }
                } else if (eventDataMap["name"] == "heatingSetpoint") {
                        if (eventDataMap["value"].toInteger() != thermostats[0].heatingSetpoint) {

-                               this.latestHeatingSetpoint = eventDataMap["value"].toInteger()
+                               this.latestHeatingSetPoint = eventDataMap["value"].toInteger()

                                this.heatingSetpoint = eventDataMap["value"].toInteger()
                                thermostats[0].setValue(eventDataMap["value"], "heatingSetpoint")
                                sendEvent(eventDataMap)
                                this.heatingSetpoint = eventDataMap["value"].toInteger()
                                thermostats[0].setValue(eventDataMap["value"], "heatingSetpoint")
                                sendEvent(eventDataMap)


@@ -258,7 +258,7 @@ public class Thermostats{
                        }
                } else if (eventDataMap["name"] == "thermostatSetpoint") {
                        if (eventDataMap["value"].toInteger() != thermostats[0].thermostatSetpoint) {
                        }
                } else if (eventDataMap["name"] == "thermostatSetpoint") {
                        if (eventDataMap["value"].toInteger() != thermostats[0].thermostatSetpoint) {

-                               this.latestThermostatSetpoint = eventDataMap["value"].toInteger()
+                               this.latestThermostatSetPoint = eventDataMap["value"].toInteger()

                                this.thermostatSetpoint = eventDataMap["value"].toInteger()
                                thermostats[0].setValue(eventDataMap["value"], "thermostatSetpoint")
                                sendEvent(eventDataMap)
                                this.thermostatSetpoint = eventDataMap["value"].toInteger()
                                thermostats[0].setValue(eventDataMap["value"], "thermostatSetpoint")
                                sendEvent(eventDataMap)