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

Calc: add abs (#17530)

Browse source
This commit is contained in:
andig 2024-12-02 05:21:46 +01:00 • committed by GitHub
parent c39990c49a
commit bd59d9647c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

38
provider/calc.go
View file

@ -4,13 +4,14 @@ import (
"context"
"errors"
"fmt"
"math"
"github.com/evcc-io/evcc/util"
)
type calcProvider struct {
add, mul, div []func() (float64, error)
sign func() (float64, error)
abs, sign func() (float64, error)
}
func init() {
@ -23,6 +24,7 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Provi
Add []Config
Mul []Config
Div []Config
Abs *Config
Sign *Config
}
@ -30,13 +32,18 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Provi
return nil, err
}
o := &calcProvider{}
if i := min(len(cc.Add), 1) + min(len(cc.Mul), 1) + min(len(cc.Div), 1); i > 1 ||
(len(cc.Add) > 0 && cc.Sign != nil) ||
(len(cc.Mul) > 0 && cc.Sign != nil) ||
(len(cc.Div) > 0 && cc.Sign != nil) {
return nil, errors.New("can only have either add, mul, div or sign")
cnt := min(len(cc.Add), 1) + min(len(cc.Mul), 1) + min(len(cc.Div), 1)
if cc.Abs != nil {
cnt++
}
if cc.Sign != nil {
cnt++
}
if cnt != 1 {
return nil, errors.New("can only have either add, mul, div, abs or sign")
}
o := &calcProvider{}
for idx, cc := range cc.Add {
f, err := NewFloatGetterFromConfig(ctx, cc)
@ -62,6 +69,14 @@ func NewCalcFromConfig(ctx context.Context, other map[string]interface{}) (Provi
o.div = append(o.div, f)
}
if cc.Abs != nil {
f, err := NewFloatGetterFromConfig(ctx, *cc.Abs)
if err != nil {
return nil, fmt.Errorf("abs: %w", err)
}
o.abs = f
}
if cc.Sign != nil {
f, err := NewFloatGetterFromConfig(ctx, *cc.Sign)
if err != nil {
@ -139,12 +154,19 @@ func (o *calcProvider) floatGetter() (float64, error) {
}
}
case o.abs != nil:
v, err := o.abs()
if err != nil {
return 0, fmt.Errorf("abs: %w", err)
}
res = math.Abs(v)
default:
v, err := o.sign()
if err != nil {
return 0, fmt.Errorf("sign: %w", err)
}
res = map[bool]float64{false: -1, true: 1}[v >= 0]
res = math.Copysign(1, v)
}
return res, nil