projects
/
smartthings-infrastructure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7c0d007
)
A bit of cleaning up.
author
rtrimana
<rtrimana@uci.edu>
Thu, 8 Aug 2019 07:11:18 +0000
(
00:11
-0700)
committer
rtrimana
<rtrimana@uci.edu>
Thu, 8 Aug 2019 07:11:18 +0000
(
00:11
-0700)
Extractor/ExtractorScript.py
patch
|
blob
|
history
run.sh
patch
|
blob
|
history
diff --git
a/Extractor/ExtractorScript.py
b/Extractor/ExtractorScript.py
index 3a87c2389d32699e6d6eba606e052981bf8211bd..c8786e671728918703cb790dcf09e1c9aa5ed155 100644
(file)
--- a/
Extractor/ExtractorScript.py
+++ b/
Extractor/ExtractorScript.py
@@
-737,16
+737,6
@@
def ExtractEvents(extractedEvents):
for line in event:
extractedEvents.write(line)
event.close()
for line in event:
extractedEvents.write(line)
event.close()
- elif eventList[i] == "acceleration.active":
- event = open("eventSimulator/accelerationDefaultActiveEvent.groovy", "r")
- for line in event:
- extractedEvents.write(line)
- event.close()
- elif eventList[i] == "acceleration.inactive":
- event = open("eventSimulator/accelerationDefaultInactiveEvent.groovy", "r")
- for line in event:
- extractedEvents.write(line)
- event.close()
elif eventList[i] == "sleeping":
#Write two events subsequently
event = open("eventSimulator/sleepSleepingEvent.groovy", "r")
elif eventList[i] == "sleeping":
#Write two events subsequently
event = open("eventSimulator/sleepSleepingEvent.groovy", "r")
diff --git
a/run.sh
b/run.sh
index c2ac770c57c67371fc44e803423279b0b192d91d..fb9ba250500b81909c02a76172810347d18377e3 100755
(executable)
--- a/
run.sh
+++ b/
run.sh
@@
-1,7
+1,7
@@
#!/bin/bash
# Device conflict
#!/bin/bash
# Device conflict
-python ModelCheck.py ../jpf-core/ ../logs/valves/ ../smartapps/ appLists/device-interaction/valvesAppList appLists/device-interaction/valvesAppList2
+
#
python ModelCheck.py ../jpf-core/ ../logs/valves/ ../smartapps/ appLists/device-interaction/valvesAppList appLists/device-interaction/valvesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/acfanheaterSwitches/ ../smartapps/ appLists/device-interaction/acfanheaterSwitchesAppList appLists/device-interaction/acfanheaterSwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/cameraSwitches/ ../smartapps/ appLists/device-interaction/cameraSwitchesAppList appLists/device-interaction/cameraSwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/ventfanSwitches/ ../smartapps/ appLists/device-interaction/ventfanSwitchesAppList appLists/device-interaction/ventfanSwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/acfanheaterSwitches/ ../smartapps/ appLists/device-interaction/acfanheaterSwitchesAppList appLists/device-interaction/acfanheaterSwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/cameraSwitches/ ../smartapps/ appLists/device-interaction/cameraSwitchesAppList appLists/device-interaction/cameraSwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/ventfanSwitches/ ../smartapps/ appLists/device-interaction/ventfanSwitchesAppList appLists/device-interaction/ventfanSwitchesAppList2
@@
-12,7
+12,7
@@
python ModelCheck.py ../jpf-core/ ../logs/valves/ ../smartapps/ appLists/device-
#python ModelCheck.py ../jpf-core/ ../logs/alarms/ ../smartapps/ appLists/device-interaction/alarmsAppList appLists/device-interaction/alarmsAppList2
#python ModelCheck.py ../jpf-core/ ../logs/locks/ ../smartapps/ appLists/device-interaction/locksAppList appLists/device-interaction/locksAppList2
#python ModelCheck.py ../jpf-core/ ../logs/musicPlayers/ ../smartapps/ appLists/device-interaction/musicPlayersAppList
#python ModelCheck.py ../jpf-core/ ../logs/alarms/ ../smartapps/ appLists/device-interaction/alarmsAppList appLists/device-interaction/alarmsAppList2
#python ModelCheck.py ../jpf-core/ ../logs/locks/ ../smartapps/ appLists/device-interaction/locksAppList appLists/device-interaction/locksAppList2
#python ModelCheck.py ../jpf-core/ ../logs/musicPlayers/ ../smartapps/ appLists/device-interaction/musicPlayersAppList
-#python ModelCheck.py ../jpf-core/ ../logs/relaySwitch/ ../smartapps/ appLists/device-interaction/relaySwitchesAppList
+python ModelCheck.py ../jpf-core/ ../logs/relaySwitches/ ../smartapps/ appLists/device-interaction/relaySwitchesAppList appLists/device-interaction/relaySwitchesAppList2
#python ModelCheck.py ../jpf-core/ ../logs/cameras/ ../smartapps/ appLists/device-interaction/camerasAppList
# Physical conflict
#python ModelCheck.py ../jpf-core/ ../logs/cameras/ ../smartapps/ appLists/device-interaction/camerasAppList
# Physical conflict