projects
/
smartthings-infrastructure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
[smartthings-infrastructure.git]
/
DoorControl
/
DoorControls.groovy
diff --git
a/DoorControl/DoorControls.groovy
b/DoorControl/DoorControls.groovy
index 19cc18b8af5a13d6d7684b6bffea224f8384408f..e8e067a5e7966060e586e2b6a65f07374fc2f72b 100644
(file)
--- a/
DoorControl/DoorControls.groovy
+++ b/
DoorControl/DoorControls.groovy
@@
-2,6
+2,9
@@
package DoorControl
import Timer.SimulatedTimer
package DoorControl
import Timer.SimulatedTimer
+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify
+
public class DoorControls {
int deviceNumbers
List doorControls
public class DoorControls {
int deviceNumbers
List doorControls
@@
-20,7
+23,19
@@
public class DoorControls {
this.timers = new SimulatedTimer()
this.deviceNumbers = deviceNumbers
this.doorControls = []
this.timers = new SimulatedTimer()
this.deviceNumbers = deviceNumbers
this.doorControls = []
+<<<<<<< HEAD
+=======
+
+>>>>>>> e378d6a65b25030f8914dc97f04b81ddff351d9c
+ def init = Verify.getBoolean()
+ if (init) {
+ this.doorState = "closed"
+ this.doorLatestValue = "closed"
+ } else {
+ this.doorState = "open"
+ this.doorLatestValue = "open"
+ }
doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
}
doorControls.add(new DoorControl(sendEvent, id, label, displayName, this.doorState, this.doorLatestValue))
}
@@
-43,30
+58,38
@@
public class DoorControls {
//By Apps
def open() {
//By Apps
def open() {
- doorControls[0].on()
+ if (doorState != "open")
+ doorControls[0].open()
}
def open(LinkedHashMap metaData) {
}
def open(LinkedHashMap metaData) {
- def task = timers.runAfter(metaData["delay"]) {
- doorControls[0].on()
+ if (doorState != "open") {
+ def task = timers.runAfter(metaData["delay"]) {
+ doorControls[0].open()
+ }
}
}
def close() {
}
}
def close() {
- doorControls[0].off()
+ if (doorState != "closed")
+ doorControls[0].close()
}
def close(LinkedHashMap metaData) {
}
def close(LinkedHashMap metaData) {
- def task = timers.runAfter(metaData["delay"]) {
- doorControls[0].off()
+ if (doorState != "closed") {
+ def task = timers.runAfter(metaData["delay"]) {
+ doorControls[0].close()
+ }
}
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
}
}
//By Model Checker
def setValue(LinkedHashMap eventDataMap) {
- doorControls[0].setValue(eventDataMap["value"])
- this.doorState = doorControls[0].doorState
- sendEvent(eventDataMap)
+ if (eventDataMap["value"] != doorControls[0].doorState) {
+ doorControls[0].setValue(eventDataMap["value"])
+ this.doorState = doorControls[0].doorState
+ sendEvent(eventDataMap)
+ }
}
}