Merge f2ee39e into cc40d37

FlexMeasures · May 29, 2023 · e9056ce · e9056ce
2 parents cc40d37 + f2ee39e
commit e9056ce
Show file tree

Hide file tree

Showing 5 changed files with 706 additions and 63 deletions.
diff --git a/documentation/changelog.rst b/documentation/changelog.rst
@@ -9,6 +9,7 @@ v0.14.0 | June XX, 2023
 New features
 -------------
 
+* Add multiple maxima and minima constraints into `StorageScheduler` [see `PR #680 <https://www.github.com/FlexMeasures/flexmeasures/pull/680>`_]
 * Introduction of the classes `Reporter` and `PandasReporter` [see `PR #641 <https://www.github.com/FlexMeasures/flexmeasures/pull/641>`_]
 * Add CLI command ``flexmeasures add report`` [see `PR #659 <https://www.github.com/FlexMeasures/flexmeasures/pull/659>`_]
 * Add CLI command ``flexmeasures show reporters`` [see `PR #686 <https://www.github.com/FlexMeasures/flexmeasures/pull/686>`_]

diff --git a/flexmeasures/api/v3_0/sensors.py b/flexmeasures/api/v3_0/sensors.py
@@ -269,7 +269,9 @@ def trigger_schedule(  # noqa: C901
 
         This message triggers a 24-hour schedule for a storage asset, starting at 10.00am,
         at which the state of charge (soc) is 12.1 kWh, with a target state of charge of 25 kWh at 4.00pm.
-        The minimum and maximum soc are set to 10 and 25 kWh, respectively.
+        The global minimum and maximum soc are set to 10 and 25 kWh, respectively.
+        To guarantee a minimum SOC in the period prior to 4.00pm, local minima constraints are imposed (via soc-minima)
+        at 2.00pm and 3.00pm, for 15kWh and 20kWh, respectively.
         Roundtrip efficiency for use in scheduling is set to 98%.
         Aggregate consumption (of all devices within this EMS) should be priced by sensor 9,
         and aggregate production should be priced by sensor 10,
@@ -289,6 +291,16 @@ def trigger_schedule(  # noqa: C901
                         {
                             "value": 25,
                             "datetime": "2015-06-02T16:00:00+00:00"
+                        },
+                    ],
+                    "soc-minima" : [
+                        {
+                            "value": 15,
+                            "datetime" : "2015-06-02T14:00:00+00:00"
+                        },
+                        {
+                            "value": 20,
+                            "datetime" : "2015-06-02T15:00:00+00:00"
                         }
                     ],
                     "soc-min": 10,