From ee9cba47d90646862ed8aa4abcac45811612a810 Mon Sep 17 00:00:00 2001
From: rtrimana <rtrimana@uci.edu>
Date: Thu, 8 Aug 2019 00:11:18 -0700
Subject: [PATCH] A bit of cleaning up.
---
Extractor/ExtractorScript.py | 10 ----------
run.sh | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 3a87c23..c8786e6 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -737,16 +737,6 @@ def ExtractEvents(extractedEvents):
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")
diff --git a/run.sh b/run.sh
index c2ac770..fb9ba25 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
#!/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
@@ -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/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
--
2.34.1