projects
/
smartthings-infrastructure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
550f306
)
Flag to diversify modes; better combinations of step and goal values.
author
rtrimana
<rtrimana@uci.edu>
Fri, 9 Aug 2019 00:43:33 +0000
(17:43 -0700)
committer
rtrimana
<rtrimana@uci.edu>
Fri, 9 Aug 2019 00:43:33 +0000
(17:43 -0700)
Extractor/Extractor.groovy
patch
|
blob
|
history
eventSimulator/stepGoalHighEvent.groovy
patch
|
blob
|
history
eventSimulator/stepGoalLowEvent.groovy
patch
|
blob
|
history
eventSimulator/stepStepsHighEvent.groovy
patch
|
blob
|
history
eventSimulator/stepStepsLowEvent.groovy
patch
|
blob
|
history
diff --git
a/Extractor/Extractor.groovy
b/Extractor/Extractor.groovy
index b5f3194425f6d6bf906b13a061898a77807d6e86..58721250259feda3219a7bb5d20cea79868c0193 100644
(file)
--- a/
Extractor/Extractor.groovy
+++ b/
Extractor/Extractor.groovy
@@
-101,17
+101,21
@@
import Timer.SimulatedTimer
@Field File extractedObjectsConstructorApp1 = new File("Extractor/App1/extractedObjectsConstructorApp1.groovy")
@Field File extractedObjectsConstructorApp2 = new File("Extractor/App2/extractedObjectsConstructorApp2.groovy")
@Field File extractedObjectsConstructorApp1 = new File("Extractor/App1/extractedObjectsConstructorApp1.groovy")
@Field File extractedObjectsConstructorApp2 = new File("Extractor/App2/extractedObjectsConstructorApp2.groovy")
+//Set this to true for global-state variable conflict
+@Field assignDifferentModes = false
@Field chooseMode = 0
//Empty the files
if (App == "App1") {
globalObjects.write("")
extractedObjectsApp1.write("")
extractedObjectsConstructorApp1.write("")
@Field chooseMode = 0
//Empty the files
if (App == "App1") {
globalObjects.write("")
extractedObjectsApp1.write("")
extractedObjectsConstructorApp1.write("")
- chooseMode = 0
+ if (assignDifferentModes)
+ chooseMode = 0
} else if (App == "App2") {
extractedObjectsApp2.write("")
extractedObjectsConstructorApp2.write("")
} else if (App == "App2") {
extractedObjectsApp2.write("")
extractedObjectsConstructorApp2.write("")
- chooseMode = 1
+ if (assignDifferentModes)
+ chooseMode = 1
}
}
@@
-1642,12
+1646,16
@@
def input(LinkedHashMap metaData) {
//def randomVariable = Math.abs(new Random().nextInt() % 3)
def modes = ["away", "home", "night"]
// Always assign a different mode to each app
//def randomVariable = Math.abs(new Random().nextInt() % 3)
def modes = ["away", "home", "night"]
// Always assign a different mode to each app
- //def userInput = modes[1]
- def userInput = modes[chooseMode]
- if (chooseMode < 3)
- chooseMode++;
- else
- chooseMode = chooseMode%3
+ def userInput
+ if (assignDifferentModes) {
+ userInput = modes[chooseMode]
+ if (chooseMode < 3)
+ chooseMode++;
+ else
+ chooseMode = chooseMode%3
+ } else {
+ userInput = modes[1]
+ }
if (modeVariables == 0) {
mode0 = metaData['name']
if (modeVariables == 0) {
mode0 = metaData['name']
diff --git
a/eventSimulator/stepGoalHighEvent.groovy
b/eventSimulator/stepGoalHighEvent.groovy
index de1ee8498a4042fe10f78456518786d130bfb9c3..190b5d57b9d4d4a04bffad5e3b1e8ea69792b08c 100644
(file)
--- a/
eventSimulator/stepGoalHighEvent.groovy
+++ b/
eventSimulator/stepGoalHighEvent.groovy
@@
-1,2
+1,2
@@
- stepSensorObject.setValue([name: "goal", value: "
10
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
+ stepSensorObject.setValue([name: "goal", value: "
7
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
diff --git
a/eventSimulator/stepGoalLowEvent.groovy
b/eventSimulator/stepGoalLowEvent.groovy
index 6443e667e4efe9ed4d9838db29805bc1b089712d..cbec67f9583f2c65f628add059931832690b7f8b 100644
(file)
--- a/
eventSimulator/stepGoalLowEvent.groovy
+++ b/
eventSimulator/stepGoalLowEvent.groovy
@@
-1,2
+1,2
@@
- stepSensorObject.setValue([name: "goal", value: "
2
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
+ stepSensorObject.setValue([name: "goal", value: "
4
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
diff --git
a/eventSimulator/stepStepsHighEvent.groovy
b/eventSimulator/stepStepsHighEvent.groovy
index 4113fe44baf0d30043db5285b606cfa5865ea5ee..151b5c0595b43d0dc8b2e0f5a3846d7253fd90e4 100644
(file)
--- a/
eventSimulator/stepStepsHighEvent.groovy
+++ b/
eventSimulator/stepStepsHighEvent.groovy
@@
-1,2
+1,2
@@
- stepSensorObject.setValue([name: "steps", value: "
7
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
+ stepSensorObject.setValue([name: "steps", value: "
10
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
diff --git
a/eventSimulator/stepStepsLowEvent.groovy
b/eventSimulator/stepStepsLowEvent.groovy
index 3dc916f07499b64cb7b0caf745a5321e15e241ba..60da0e0d7cccdc5e3e53b1c6cc6c7cdd3b7adbf2 100644
(file)
--- a/
eventSimulator/stepStepsLowEvent.groovy
+++ b/
eventSimulator/stepStepsLowEvent.groovy
@@
-1,2
+1,2
@@
- stepSensorObject.setValue([name: "steps", value: "
3
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
+ stepSensorObject.setValue([name: "steps", value: "
5
0"/*A number*/, deviceId: "stepSensorID0", descriptionText: "",
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])