[mod] changed behaviour name and modified config

- use modifier in config
 - removed unused sensors
This commit is contained in:
2020-01-29 01:19:11 -06:00
parent 75988aa521
commit 646bea1117
2 changed files with 5 additions and 7 deletions

View File

@@ -38,10 +38,7 @@ sensors:
- group: baseline - group: baseline
cells: cells:
- [0, 0, 1] - [0, 0, 0]
- [1, 1, 1]
- [2, 2, 1]
- [3, 3, 1]
groundtruths: groundtruths:
- group: baseline - group: baseline
@@ -83,12 +80,13 @@ groundtruths:
behaviours: behaviours:
- group: temperature - group: temperature
functions: functions:
- name: measureTemp - name: measureTempMod
args: args:
range: [-50.0, 150.0] range: [-50.0, 150.0]
resolution: 0.125 resolution: 0.125
accuracy: 0.1 accuracy: 0.1
offset: 0.0 offset: 0.0
modifier: {type: offset, value: 20.0, time: 10, x: 1, y: 1}
timeline: timeline:
- start: 0 - start: 0
end: 24 end: 24

View File

@@ -16,7 +16,7 @@ package object behaviour {
"measureHumid" -> measureHumid, "measureHumid" -> measureHumid,
"noOutput" -> noOutput, "noOutput" -> noOutput,
"randomOutput" -> randomOutput, "randomOutput" -> randomOutput,
"measureTempFault" -> measureTempFault, "measureTempMod" -> measureTempMod,
"fluctuate" -> fluctuate, "fluctuate" -> fluctuate,
"change" -> change, "change" -> change,
"humidFromTemp" -> humidFromTemp "humidFromTemp" -> humidFromTemp
@@ -34,7 +34,7 @@ package object behaviour {
sensorFactory(Vector(5, 100), 1.0, 2.0, 0.0) sensorFactory(Vector(5, 100), 1.0, 2.0, 0.0)
} }
def measureTempFault: SimulationBehaviour = { def measureTempMod: SimulationBehaviour = {
sensorModifierFactory("accuracy", Vector(-10, 10), 5, 15.0, 20.0, measureTemp) sensorModifierFactory("accuracy", Vector(-10, 10), 5, 15.0, 20.0, measureTemp)
} }