home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-07 14:45:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6784

Browse Source
This commit is contained in:
Michael Wyraz
2017-03-25 22:44:09 +01:00
parent aa609d8843
commit 3a924295ff
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
homeassistant/components/sensor/min_max.py
View File

@@ -34,8 +34,6 @@ ATTR_TO_PROPERTY = [
CONF_ENTITY_IDS = 'entity_ids' CONF_ENTITY_IDS = 'entity_ids'
CONF_ROUND_DIGITS = 'round_digits' CONF_ROUND_DIGITS = 'round_digits'
DEFAULT_NAME = 'Min/Max/Avg Sensor'
ICON = 'mdi:calculator' ICON = 'mdi:calculator'
SENSOR_TYPES = { SENSOR_TYPES = {
@@ -47,7 +45,7 @@ SENSOR_TYPES = {
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_TYPE, default=SENSOR_TYPES[ATTR_MAX_VALUE]): vol.Optional(CONF_TYPE, default=SENSOR_TYPES[ATTR_MAX_VALUE]):
vol.All(cv.string, vol.In(SENSOR_TYPES.values())), vol.All(cv.string, vol.In(SENSOR_TYPES.values())),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
vol.Required(CONF_ENTITY_IDS): cv.entity_ids, vol.Required(CONF_ENTITY_IDS): cv.entity_ids,
vol.Optional(CONF_ROUND_DIGITS, default=2): vol.Coerce(int), vol.Optional(CONF_ROUND_DIGITS, default=2): vol.Coerce(int),
}) })
@@ -76,9 +74,13 @@ class MinMaxSensor(Entity):
self._entity_ids = entity_ids self._entity_ids = entity_ids
self._sensor_type = sensor_type self._sensor_type = sensor_type
self._round_digits = round_digits self._round_digits = round_digits
self._name = '{} {}'.format(
name, next(v for k, v in SENSOR_TYPES.items() if name:
if self._sensor_type == v)) self._name = name
else:
self._name = '{} sensor'.format(
next(v for k, v in SENSOR_TYPES.items()
if self._sensor_type == v)).capitalize()
self._unit_of_measurement = None self._unit_of_measurement = None
self.min_value = self.max_value = self.mean = STATE_UNKNOWN self.min_value = self.max_value = self.mean = STATE_UNKNOWN
self.count_sensors = len(self._entity_ids) self.count_sensors = len(self._entity_ids)
@@ -154,31 +156,33 @@ class MinMaxSensor(Entity):
self.max_value = self.calc_max(sensor_values) self.max_value = self.calc_max(sensor_values)
self.mean = self.calc_mean(sensor_values) self.mean = self.calc_mean(sensor_values)
# pylint: disable=R0201
def calc_min(self, sensor_values): def calc_min(self, sensor_values):
"""Calculate min value, honoring unkown states.""" """Calculate min value, honoring unkown states."""
val = STATE_UNKNOWN val = STATE_UNKNOWN
for v in sensor_values: for sval in sensor_values:
if v != STATE_UNKNOWN: if sval != STATE_UNKNOWN:
if val == STATE_UNKNOWN or val > v: if val == STATE_UNKNOWN or val > sval:
val = v val = sval
return val return val
# pylint: disable=R0201
def calc_max(self, sensor_values): def calc_max(self, sensor_values):
"""Calculate max value, honoring unkown states.""" """Calculate max value, honoring unkown states."""
val = STATE_UNKNOWN val = STATE_UNKNOWN
for v in sensor_values: for sval in sensor_values:
if v != STATE_UNKNOWN: if sval != STATE_UNKNOWN:
if val == STATE_UNKNOWN or val < v: if val == STATE_UNKNOWN or val < sval:
val = v val = sval
return val return val
def calc_mean(self, sensor_values): def calc_mean(self, sensor_values):
"""Calculate mean value, honoring unkown states.""" """Calculate mean value, honoring unkown states."""
val = 0 val = 0
count = 0 count = 0
for v in sensor_values: for sval in sensor_values:
if v != STATE_UNKNOWN: if sval != STATE_UNKNOWN:
val += v val += sval
count += 1 count += 1
if count == 0: if count == 0:
return STATE_UNKNOWN return STATE_UNKNOWN

12
tests/components/sensor/test_min_max.py
View File

@@ -29,7 +29,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_min',
'type': 'min', 'type': 'min',
'entity_ids': [ 'entity_ids': [
'sensor.test_1', 'sensor.test_1',
@@ -58,7 +58,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_max',
'type': 'max', 'type': 'max',
'entity_ids': [ 'entity_ids': [
'sensor.test_1', 'sensor.test_1',
@@ -87,7 +87,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_mean',
'type': 'mean', 'type': 'mean',
'entity_ids': [ 'entity_ids': [
'sensor.test_1', 'sensor.test_1',
@@ -116,7 +116,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_mean',
'type': 'mean', 'type': 'mean',
'round_digits': 1, 'round_digits': 1,
'entity_ids': [ 'entity_ids': [
@@ -146,7 +146,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_mean',
'type': 'mean', 'type': 'mean',
'round_digits': 4, 'round_digits': 4,
'entity_ids': [ 'entity_ids': [
@@ -176,7 +176,7 @@ class TestMinMaxSensor(unittest.TestCase):
config = { config = {
'sensor': { 'sensor': {
'platform': 'min_max', 'platform': 'min_max',
'name': 'test', 'name': 'test_max',
'type': 'max', 'type': 'max',
'entity_ids': [ 'entity_ids': [
'sensor.test_1', 'sensor.test_1',