Fixes temperature and humidity formula according to affections and environmental properties

Author: etsardou

stream_simulator/controllers/env_devices/controller_humidity_sensor.py

@@ -5,7 +5,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import statistics
 import random
 
 from stream_simulator.base_classes import BasicSensor
@@ -89,14 +88,9 @@ def get_simulation_value(self):
         for a in affections:
             vs.append((1 - affections[a]['distance'] / affections[a]['range']) * \
                 affections[a]['info']['humidity'])
-        affections = statistics.mean(vs)
+        affections = max(vs)
 
-        if ambient > affections:
-            ambient += affections * 0.1
-        else:
-            ambient = affections - (affections - ambient) * 0.1
-
-        final_value = ambient
+        final_value = ambient if affections < ambient else affections
         if self.dynamic_value is None:
             self.dynamic_value = final_value
         else:

stream_simulator/controllers/env_devices/controller_temperature_sensor.py

@@ -5,7 +5,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import statistics
 import random
 from stream_simulator.base_classes import BasicSensor
 
@@ -98,17 +97,18 @@ def get_simulation_value(self):
         if affections is None:
             return amb
 
+        print(affections)
         for a in affections:
             r = (1 - affections[a]['distance'] / affections[a]['range']) * \
                 affections[a]['info']['temperature']
             temps.append(r)
 
         mms = 0
-        temps.append(amb)
+        print(temps)
         if len(temps) > 0:
-            mms = statistics.mean(temps)
+            mms = max(temps)
 
-        final_value = mms
+        final_value = mms if mms > amb else amb
         if self.dynamic_value is None:
             self.dynamic_value = final_value
         else:

stream_simulator/controllers/sensors/controller_env.py

@@ -9,7 +9,6 @@
 import logging
 import threading
 import random
-import statistics
 
 from stream_simulator.base_classes import BaseThing
 
@@ -176,10 +175,10 @@ def sensor_read(self):
                     r = (1 - tem_aff[a]['distance'] / tem_aff[a]['range']) * \
                         tem_aff[a]['info']['temperature']
                     temps.append(r)
-                temps.append(amb)
-                final_temp = amb
+
                 if len(temps) != 0:
-                    final_temp = statistics.mean(temps)
+                    final_temp = max(temps)
+                final_temp = amb if amb > final_temp else final_temp
                 if self.dynamic_value['temperature'] is None:
                     self.dynamic_value['temperature'] = final_temp
                 else:
@@ -192,17 +191,14 @@ def sensor_read(self):
                 if len(hum_aff) == 0:
                     val["humidity"] = ambient + random.uniform(-0.5, 0.5)
                 vs = []
+                affections = 0
                 for a in hum_aff:
                     vs.append((1 - hum_aff[a]['distance'] / hum_aff[a]['range']) * \
                         hum_aff[a]['info']['humidity'])
                 if len(vs) > 0:
-                    affections = statistics.mean(vs)
-                    if ambient > affections:
-                        ambient += affections * 0.1
-                    else:
-                        ambient = affections - (affections - ambient) * 0.1
+                    affections = max(vs)
 
-                final_hum = ambient
+                final_hum = ambient if ambient > affections else affections
                 if self.dynamic_value['humidity'] is None:
                     self.dynamic_value['humidity'] = final_hum
                 else: