From f78f51ec4a906827ae8d5e148528cc9de1100153 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Sun, 2 Mar 2025 19:55:33 +0100 Subject: [PATCH 1/2] docs: clarify inline comment Signed-off-by: F.N. Claessen --- flexmeasures/api/v3_0/sensors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py index e7c91dd992..3fa1c789cc 100644 --- a/flexmeasures/api/v3_0/sensors.py +++ b/flexmeasures/api/v3_0/sensors.py @@ -710,7 +710,7 @@ def get_schedule( # noqa: C901 if sensor.get_attribute("consumption_is_positive", True): sign = -1 - # For consumption schedules, positive values denote consumption. For the db, consumption is negative + # For consumption schedules, positive values denote consumption. For the db, consumption is negative unless specified explicitly consumption_schedule = sign * simplify_index(power_values)["event_value"] if consumption_schedule.empty: return unknown_schedule( From 32f92c3a8c1f93807ec5780346158544a74ccbe0 Mon Sep 17 00:00:00 2001 From: "F.N. Claessen" Date: Sun, 2 Mar 2025 20:51:05 +0100 Subject: [PATCH 2/2] fix: the sign should be switched if consumption is positive, and the default should be False Signed-off-by: F.N. Claessen --- flexmeasures/api/v3_0/sensors.py | 2 +- flexmeasures/data/services/scheduling.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py index 3fa1c789cc..2aaa76609c 100644 --- a/flexmeasures/api/v3_0/sensors.py +++ b/flexmeasures/api/v3_0/sensors.py @@ -707,7 +707,7 @@ def get_schedule( # noqa: C901 ) sign = 1 - if sensor.get_attribute("consumption_is_positive", True): + if not sensor.get_attribute("consumption_is_positive", False): sign = -1 # For consumption schedules, positive values denote consumption. For the db, consumption is negative unless specified explicitly diff --git a/flexmeasures/data/services/scheduling.py b/flexmeasures/data/services/scheduling.py index 5dfc59d8a0..7ea3408050 100644 --- a/flexmeasures/data/services/scheduling.py +++ b/flexmeasures/data/services/scheduling.py @@ -358,8 +358,8 @@ def make_schedule( sign = 1 - if result["sensor"].measures_power and result["sensor"].get_attribute( - "consumption_is_positive", True + if result["sensor"].measures_power and not result["sensor"].get_attribute( + "consumption_is_positive", False ): sign = -1