From 646bea11175970a3de01ffc32e31375ce372b074 Mon Sep 17 00:00:00 2001 From: Pascal Date: Wed, 29 Jan 2020 01:19:11 -0600 Subject: [PATCH] [mod] changed behaviour name and modified config - use modifier in config - removed unused sensors --- docs/wiki/config/config_preview.yml | 8 +++----- src/main/scala/scim/components/Behaviour.scala | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/wiki/config/config_preview.yml b/docs/wiki/config/config_preview.yml index 8aa88ad..df009ae 100644 --- a/docs/wiki/config/config_preview.yml +++ b/docs/wiki/config/config_preview.yml @@ -38,10 +38,7 @@ sensors: - group: baseline cells: - - [0, 0, 1] - - [1, 1, 1] - - [2, 2, 1] - - [3, 3, 1] + - [0, 0, 0] groundtruths: - group: baseline @@ -83,12 +80,13 @@ groundtruths: behaviours: - group: temperature functions: - - name: measureTemp + - name: measureTempMod args: range: [-50.0, 150.0] resolution: 0.125 accuracy: 0.1 offset: 0.0 + modifier: {type: offset, value: 20.0, time: 10, x: 1, y: 1} timeline: - start: 0 end: 24 diff --git a/src/main/scala/scim/components/Behaviour.scala b/src/main/scala/scim/components/Behaviour.scala index d2a40f8..e770ad5 100644 --- a/src/main/scala/scim/components/Behaviour.scala +++ b/src/main/scala/scim/components/Behaviour.scala @@ -16,7 +16,7 @@ package object behaviour { "measureHumid" -> measureHumid, "noOutput" -> noOutput, "randomOutput" -> randomOutput, - "measureTempFault" -> measureTempFault, + "measureTempMod" -> measureTempMod, "fluctuate" -> fluctuate, "change" -> change, "humidFromTemp" -> humidFromTemp @@ -34,7 +34,7 @@ package object behaviour { 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) }