Feature/gsye 891 by hannesdiedrich · Pull Request #1919 · gridsingularity/gsy-e

hannesdiedrich · 2026-05-13T12:43:15Z

Reason for the proposed changes

Please describe what we want to achieve and why.

Proposed changes

INTEGRATION_TESTS_BRANCH=master
GSY_FRAMEWORK_BRANCH=master
SCM_ENGINE_BRANCH=master

…nimiseHeatpumpSwitchStrategy to be open for inheritance by the SorTES child

… for Pylint

hannesdiedrich · 2026-05-13T12:51:08Z

+    CAPACITY_KWH = 25
+    COP_HEAT_SOURCE = 1
+    COP_CONDENSER = 1
+    COP_EVAPORATOR = 1  # to be updated


We need to ask for this again

Indeed this needs to be clarified

codecov · 2026-05-13T13:02:58Z

Codecov Report

❌ Patch coverage is 92.37288% with 27 lines in your changes missing coverage. Please review.
✅ Project coverage is 71.69%. Comparing base (9111fd3) to head (991d9d9).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1919      +/-   ##
==========================================
+ Coverage   71.12%   71.69%   +0.57%     
==========================================
  Files         149      150       +1     
  Lines       14309    14644     +335     
  Branches     1892     1908      +16     
==========================================
+ Hits        10177    10499     +322     
- Misses       3593     3601       +8     
- Partials      539      544       +5

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

spyrostz · 2026-05-18T07:32:13Z

+            self._average_trade_rate.get_value(time_slot)
+            < GlobalConfig.market_maker_rate[time_slot]


As we discussed also privately, this can be optimized to look at the future values, similar to this (pseydocode):

Suggested change

self._average_trade_rate.get_value(time_slot)

< GlobalConfig.market_maker_rate[time_slot]

all(self._average_trade_rate.get_value(t) < GlobalConfig.market_maker_rate[t] for t in [

time_slot.add(interval * i)

for i in range(0, time_horizon_mins / slot_length_mins)

if time_slot.add(interval * i) <= interval + time_horizon_mins

])

…BEFORE_SWITCH_ALLOWED rule

…energy_affordable

…xport files

… COP

… the sortes HP

spyrostz · 2026-05-26T18:29:44Z

+            "COP",
+            "heat demand [kJ]",
+            "SOC",
+            "total_charged_energy_kWh",


No need for now since we do not have KPIs for this, but it would make sense to also separate the electricity consumption (traded energy) in 2 components: the electricity consumption of the condenser / evaporator, and the consumption required to produce the heat. Nothing to do of course, just for the sake of the argument.

Good idea. Let me even do it now, because I foresee that we have to investigate the results a bit more (already saw some unusual numbers in the KELVIN results).

Done e940291

spyrostz · 2026-05-26T18:34:47Z

+                self._get_tank_soc(time_slot) >= self.MAX_SOC_TOLERANCE
+                and self._current_state == HeatPumpChargingState.CHARGE


Ok, now I see in detail what you meant in our discussion. Essentially if the SOC has overshoot to a value greater than the MAX_SOC_TOLERANCE, and the state changed to DISCHARGE for some reason, then the state would not switch to MAINTAIN_SOC. For SorTES where we do not care about interrupting the charging / discharging state I think this is ok, however for FractLES I think that the former implementation is valid. The storage should not switch to MAINTAIN_SOC in this case, it should just discharge, unless I misunderstood something.

I spend some time to remember why I added these changes here. Unfortunately, I am not sure, but I think we saw a case, when the status was changed to DISCHARGE before, but the SOC was still higher than the MAX value. This lead this section to change the status again to MAINTAIN_SOC and the storage was never discharged.
How about I move this implementation to SorTesTankMinimiseSwitchStrategy and leave the original implementation here for the fractLES?

Did that here 5e53114

spyrostz · 2026-05-26T18:53:14Z

+        self._update_soc(time_slot, -discharge_energy_kWh)
+        self._state.update_total_charged_energy_kWh(-discharge_energy_kWh)
+
+    def _update_soc(self, time_slot: DateTime, heat_energy_kWh: float):


Nit, but if the heat_energy_kWh can be negative, please leave a comment to indicate so. Thanks!

spyrostz

Some comments, LGTM already

…onality in the MinimizeSwitchStrategies

…arger than 0

spyrostz

LGTM

hannesdiedrich added 5 commits May 13, 2026 08:55

GSYE-891: Fix some small things in the heat pump classes and adapt Mi…

a7c3229

…nimiseHeatpumpSwitchStrategy to be open for inheritance by the SorTES child

GSYE-891: Add first version of SorTES tank heat pump

ca1f6f0

GSYE-891: Fix some issues in the SorTesTankEnergyParameters and adapt…

7dabf55

… for Pylint

GSYE-891: Add unit tests from AI

c58b317

GSYE-891: Slight changes to the unit tests

0d73c49

hannesdiedrich requested a review from spyrostz May 13, 2026 12:43

hannesdiedrich commented May 13, 2026

View reviewed changes

Comment thread src/gsy_e/models/strategy/heatpump_with_sortes_tank.py

hannesdiedrich commented May 13, 2026

View reviewed changes

spyrostz reviewed May 18, 2026

View reviewed changes

hannesdiedrich added 8 commits May 18, 2026 13:30

GSYE-891: Fix corner case heat-demand < energy-extracted from sortes

7790033

GSYE-891: Remove HeatPumpChargingState.MAINTAIN_SOC from the MINUTES_…

864b29c

…BEFORE_SWITCH_ALLOWED rule

GSYE-891: Add time horizont for SorTesTankMinimiseSwitchStrategy._is_…

7a02b20

…energy_affordable

GSYE-891: Exchange comparison with MMR to preferred bying rate

b0f89ef

Rename column in Sortes export file in order to align with Fractles e…

de7d499

…xport files

GSYE-891: Fix bug in energy assertions ans also correct the condenser…

095993a

… COP

GSYE-891: Adapt corner case logging in _calc_energy_to_buy_minimum in…

0f2b27a

… the sortes HP

GSYE-891: Add serializor for sortes heat pump

720eacf

spyrostz reviewed May 26, 2026

View reviewed changes

spyrostz previously approved these changes May 26, 2026

View reviewed changes

GSYE-891: Add _handle_state_at_soc_limits in order to seperate functi…

5e53114

…onality in the MinimizeSwitchStrategies

hannesdiedrich dismissed spyrostz’s stale review via 5e53114 May 27, 2026 08:39

hannesdiedrich added 2 commits May 27, 2026 13:42

GSYE-891: Improve export CSV files for Sortes HP

e940291

GSYE-891: Only log corner case when energy_to_be_bought_for_heat is l…

efe2125

…arger than 0

spyrostz previously approved these changes May 29, 2026

View reviewed changes

GSYE-891: Change COp value for dry cooler

991d9d9

hannesdiedrich dismissed spyrostz’s stale review via 991d9d9 May 29, 2026 13:30

hannesdiedrich merged commit ab358e7 into master May 29, 2026
5 checks passed

hannesdiedrich deleted the feature/GSYE-891 branch May 29, 2026 13:55

		self._average_trade_rate.get_value(time_slot)
		< GlobalConfig.market_maker_rate[time_slot]

-            self._average_trade_rate.get_value(time_slot)
-            < GlobalConfig.market_maker_rate[time_slot]
+            all(self._average_trade_rate.get_value(t) < GlobalConfig.market_maker_rate[t] for t in [
+                time_slot.add(interval * i)
+                for i in range(0, time_horizon_mins / slot_length_mins)
+                if time_slot.add(interval * i) <= interval + time_horizon_mins
+            ])

		self._get_tank_soc(time_slot) >= self.MAX_SOC_TOLERANCE
		and self._current_state == HeatPumpChargingState.CHARGE

Uh oh!

Conversation

hannesdiedrich commented May 13, 2026

Reason for the proposed changes

Proposed changes

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

spyrostz left a comment

Choose a reason for hiding this comment

Uh oh!

spyrostz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov Bot commented May 13, 2026 •

edited

Loading