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

Optimizer: limit precondition demand to required charging duration (#33137)

Browse source
This commit is contained in:
andig 2026-08-24 13:19:39 +02:00 • committed by GitHub
parent 1416134c1d
commit 5960e9fcfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/site_optimizer.go
View file

@ -1270,6 +1270,15 @@ func applyPrecondition(lp loadpoint.API, demand []float32, minLen int) []float32
return demand return demand
} }
// limit to the required charging duration, i.e. "all" must not demand beyond the plan goal
goal, _ := lp.GetPlanGoal()
if required := lp.GetPlanRequiredDuration(goal, lp.EffectiveMaxPower()); required < precondition {
precondition = required
}
if precondition <= 0 {
return demand
}
// TODO precise slot placement // TODO precise slot placement
end := time.Until(ts) end := time.Until(ts)
start := end - precondition start := end - precondition

22
core/site_optimizer_test.go
View file

@ -72,6 +72,8 @@ func TestApplyPrecondition(t *testing.T) {
// plan in 1h, 40min precondition: slots 1 (10min) and 2, 3 (full) // plan in 1h, 40min precondition: slots 1 (10min) and 2, 3 (full)
lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1) lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1)
lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 40 * time.Minute}).Times(1) lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 40 * time.Minute}).Times(1)
lp.EXPECT().GetPlanGoal().Return(80.0, true).Times(1)
lp.EXPECT().GetPlanRequiredDuration(80.0, 8000.0).Return(2 * time.Hour).Times(1)
res := applyPrecondition(lp, nil, 8) res := applyPrecondition(lp, nil, 8)
require.Len(t, res, 8) require.Len(t, res, 8)
assert.InDeltaSlice(t, []float32{0, 2000. / 1.5, 2000, 2000, 0, 0, 0, 0}, res, 1) assert.InDeltaSlice(t, []float32{0, 2000. / 1.5, 2000, 2000, 0, 0, 0, 0}, res, 1)
@ -79,12 +81,32 @@ func TestApplyPrecondition(t *testing.T) {
// existing demand is kept where higher // existing demand is kept where higher
lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1) lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1)
lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 30 * time.Minute}).Times(1) lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 30 * time.Minute}).Times(1)
lp.EXPECT().GetPlanGoal().Return(80.0, true).Times(1)
lp.EXPECT().GetPlanRequiredDuration(80.0, 8000.0).Return(2 * time.Hour).Times(1)
res = applyPrecondition(lp, []float32{3000, 3000, 3000, 3000, 0, 0, 0, 0}, 8) res = applyPrecondition(lp, []float32{3000, 3000, 3000, 3000, 0, 0, 0, 0}, 8)
assert.InDeltaSlice(t, []float32{3000, 3000, 3000, 3000, 0, 0, 0, 0}, res, 1) assert.InDeltaSlice(t, []float32{3000, 3000, 3000, 3000, 0, 0, 0, 0}, res, 1)
// plan beyond horizon // plan beyond horizon
lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(24 * time.Hour)).Times(1) lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(24 * time.Hour)).Times(1)
lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: time.Hour}).Times(1) lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: time.Hour}).Times(1)
lp.EXPECT().GetPlanGoal().Return(80.0, true).Times(1)
lp.EXPECT().GetPlanRequiredDuration(80.0, 8000.0).Return(2 * time.Hour).Times(1)
assert.Nil(t, applyPrecondition(lp, nil, 8))
// "all" precondition is limited to the required charging duration (#33135)
lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1)
lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 7 * 24 * time.Hour}).Times(1)
lp.EXPECT().GetPlanGoal().Return(80.0, true).Times(1)
lp.EXPECT().GetPlanRequiredDuration(80.0, 8000.0).Return(40 * time.Minute).Times(1)
res = applyPrecondition(lp, nil, 8)
require.Len(t, res, 8)
assert.InDeltaSlice(t, []float32{0, 2000. / 1.5, 2000, 2000, 0, 0, 0, 0}, res, 1)
// goal already reached: no demand
lp.EXPECT().EffectivePlanTime().Return(time.Now().Add(time.Hour)).Times(1)
lp.EXPECT().EffectivePlanStrategy().Return(api.PlanStrategy{Precondition: 7 * 24 * time.Hour}).Times(1)
lp.EXPECT().GetPlanGoal().Return(80.0, true).Times(1)
lp.EXPECT().GetPlanRequiredDuration(80.0, 8000.0).Return(time.Duration(0)).Times(1)
assert.Nil(t, applyPrecondition(lp, nil, 8)) assert.Nil(t, applyPrecondition(lp, nil, 8))
} }