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

Calc plugin: add min/max (#24652)

Browse source
This commit is contained in:
guido4096 2025-10-23 07:47:35 +02:00 • committed by GitHub
parent 78cac568d2
commit 6bf9f9932f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

52
plugin/calc.go
View file

@ -10,8 +10,8 @@ import (
)
type calcPlugin struct {
add, mul, div []func() (float64, error)
abs, sign func() (float64, error)
add, mul, div, min, max []func() (float64, error)
abs, sign func() (float64, error)
}
func init() {
@ -24,6 +24,8 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Plugi
Add []Config
Mul []Config
Div []Config
Min []Config
Max []Config
Abs *Config
Sign *Config
}
@ -32,7 +34,7 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Plugi
return nil, err
}
cnt := min(len(cc.Add), 1) + min(len(cc.Mul), 1) + min(len(cc.Div), 1)
cnt := min(len(cc.Add), 1) + min(len(cc.Mul), 1) + min(len(cc.Div), 1) + min(len(cc.Min), 1) + min(len(cc.Max), 1)
if cc.Abs != nil {
cnt++
}
@ -40,7 +42,7 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Plugi
cnt++
}
if cnt != 1 {
return nil, errors.New("can only have either add, mul, div, abs or sign")
return nil, errors.New("can only have either add, mul, div, min, max, abs or sign")
}
o := new(calcPlugin)
@ -69,6 +71,22 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Plugi
o.div = append(o.div, f)
}
for idx, cc := range cc.Min {
f, err := cc.FloatGetter(ctx)
if err != nil {
return nil, fmt.Errorf("min[%d]: %w", idx, err)
}
o.min = append(o.min, f)
}
for idx, cc := range cc.Max {
f, err := cc.FloatGetter(ctx)
if err != nil {
return nil, fmt.Errorf("max[%d]: %w", idx, err)
}
o.max = append(o.max, f)
}
var err error
o.abs, err = cc.Abs.FloatGetter(ctx)
@ -150,6 +168,32 @@ func (o *calcPlugin) floatGetter() (float64, error) {
}
}
case len(o.min) > 0:
for idx, p := range o.min {
v, err := p()
if err != nil {
return 0, fmt.Errorf("min[%d]: %w", idx, err)
}
if idx == 0 {
res = v
} else {
res = math.Min(res, v)
}
}
case len(o.max) > 0:
for idx, p := range o.max {
v, err := p()
if err != nil {
return 0, fmt.Errorf("max[%d]: %w", idx, err)
}
if idx == 0 {
res = v
} else {
res = math.Max(res, v)
}
}
case o.abs != nil:
v, err := o.abs()
if err != nil {