obitools/obitools4
2
0
Fork 0
mirror of https://github.com/metabarcoding/obitools4.git synced 2025-06-29 16:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

add functionalities to the expression

Browse Source 
predicate evaluations
This commit is contained in:
Eric Coissac
2022-09-28 16:13:20 +02:00
parent fe5d8e3340
commit d0f63fda56
2 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/obiseq/predicate.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"regexp"
"git.metabarcoding.org/lecasofts/go/obitools/pkg/goutils"
log "github.com/sirupsen/logrus"
"github.com/PaesslerAG/gval"
@ -20,7 +21,11 @@ func (predicate1 SequencePredicate) And(predicate2 SequencePredicate) SequencePr
return predicate1
default:
return func(sequence *BioSequence) bool {
return predicate1(sequence) && predicate2(sequence)
if !predicate1(sequence) {
return false
}
return predicate2(sequence)
}
}
}
@ -33,7 +38,10 @@ func (predicate1 SequencePredicate) Or(predicate2 SequencePredicate) SequencePre
return predicate1
default:
return func(sequence *BioSequence) bool {
return predicate1(sequence) || predicate2(sequence)
if predicate1(sequence) {
return true
}
return predicate2(sequence)
}
}
}
@ -195,8 +203,17 @@ func IsIdIn(ids ...string) SequencePredicate {
func ExpressionPredicat(expression string) SequencePredicate {
exp, err := gval.Full().NewEvaluable(expression)
lang := gval.NewLanguage(
gval.Full(),
gval.Function("len", func(args ...interface{}) (interface{}, error) {
length := goutils.Length(args[0])
return (float64)(length), nil
}),
gval.Function("ismap", func(args ...interface{}) (interface{}, error) {
ismap := goutils.IsAMap(args[0])
return ismap, nil
}))
exp, err := lang.NewEvaluable(expression)
if err != nil {
log.Fatalf("Error in the expression : %s", expression)
}
@ -204,10 +221,10 @@ func ExpressionPredicat(expression string) SequencePredicate {
f := func(sequence *BioSequence) bool {
value, err := exp.EvalBool(context.Background(),
map[string]interface{}{
"annot": sequence.Annotations(),
"count": sequence.Count(),
"length": sequence.Length(),
"sequence": sequence,
"annot": sequence.Annotations(),
"count": sequence.Count(),
"seqlength": sequence.Length(),
"sequence": sequence,
},
)