Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimizer: decouple from solar forecast (#26584)

Browse source
This commit is contained in:
andig 2026-01-10 11:27:33 +01:00 • committed by GitHub
parent b1ccc55bb4
commit e410661405
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/site_optimizer.go
View file

@ -86,11 +86,17 @@ func (site *Site) optimizerUpdate(battery []measurement) error {
return nil
}
solar := currentRates(site.GetTariff(api.TariffUsageSolar))
solarTariff := site.GetTariff(api.TariffUsageSolar)
solar := currentRates(solarTariff)
grid := currentRates(site.GetTariff(api.TariffUsageGrid))
feedIn := currentRates(site.GetTariff(api.TariffUsageFeedIn))
minLen := lo.Min([]int{len(grid), len(feedIn), len(solar)})
minLen := lo.Min([]int{len(grid), len(feedIn)})
if solarTariff != nil {
// allow empty solar forecast
minLen = min(minLen, len(solar))
}
if minLen < 8 {
return fmt.Errorf("not enough slots for optimization: %d (grid=%d, feedIn=%d, solar=%d)", minLen, len(grid), len(feedIn), len(solar))
}
@ -110,9 +116,15 @@ func (site *Site) optimizerUpdate(battery []measurement) error {
return err
}
solarEnergy, err := solarRatesToEnergy(solar)
if err != nil {
return err
// allow empty solar forecast
ft := lo.RepeatBy(minLen, func(i int) float32 { return float32(0) })
if solarTariff != nil {
solarEnergy, err := solarRatesToEnergy(solar)
if err != nil {
return err
}
ft = prorate(scaleAndPrune(solarEnergy, 1, minLen), firstSlotDuration)
}
req := evopt.OptimizationInput{
@ -125,7 +137,7 @@ func (site *Site) optimizerUpdate(battery []measurement) error {
TimeSeries: evopt.TimeSeries{
Dt: dt,
Gt: prorate(gt, firstSlotDuration),
Ft: prorate(scaleAndPrune(solarEnergy, 1, minLen), firstSlotDuration),
Ft: ft,
PN: scaleAndPrune(grid, 1e3, minLen),
PE: scaleAndPrune(feedIn, 1e3, minLen),
},