Fix battery degradation calc when battery is already scaled#3949
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes battery-size/degradation calculations when battery_scaling is already applied (e.g., depth-of-discharge limits), ensuring find_battery_size() estimates usable capacity rather than accidentally returning nominal capacity. It also adds regression tests around scaling behavior and failure paths.
Changes:
- Correct
Inverterinitialization sonominal_capacityremains unscaled whilesoc_maxreflects scaled (usable) capacity. - Fix
find_battery_size()to stop applyingbattery_scalingto SoC percentage history inputs. - Add/extend unit tests to cover scaling and “find_battery_size failed” behavior.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| apps/predbat/inverter.py | Fix nominal vs usable capacity handling; adjust find_battery_size SoC% scaling; add a new dashboard attribute/log detail. |
| apps/predbat/tests/test_find_battery_size.py | Add regression test for battery_scaling < 1.0 and assert soc_max doesn’t change on failed sizing when auto-scaling is off. |
Comments suppressed due to low confidence (1)
apps/predbat/tests/test_find_battery_size.py:1103
- This blank line contains whitespace only. Please remove the spaces to avoid trailing-whitespace lint failures and keep diffs clean.
failed |= test_battery_size_tracking_none_stored_on_failure(my_predbat)
if failed:
return failed
| found_size_str = "{:.2f} kWh".format(found_size) if found_size is not None else "None" | ||
| degradation = (self.nominal_capacity - trimmed_mean) / self.nominal_capacity if self.nominal_capacity > 0 else 0 | ||
| self.log("Inverter {} battery size tracking: found_size {}, history {}, trimmed_mean {:.2f} kWh, degradation {:.2%}".format(self.id, found_size_str, history, trimmed_mean, degradation)) | ||
| self.log("Inverter {} battery size tracking: found_size {}, history {}, trimmed_mean {:.2f} kWh, degradation {:.2%} configured degradation {:.2f}".format(self.id, found_size_str, history, trimmed_mean, degradation, self.battery_scaling)) |
|
@copilot resolve the merge conflicts in this pull request |
…test_find_battery_size_soc_kw_unavailable
Merge conflicts resolved. The conflict was in |
No description provided.