Refactoring of some code

This commit is contained in:
2022-08-23 11:07:39 +02:00
parent 62968aaa26
commit abaede48b5
4 changed files with 71 additions and 36 deletions

View File

@@ -1,11 +1,5 @@
package obitax
import (
log "github.com/sirupsen/logrus"
"git.metabarcoding.org/lecasofts/go/obitools/pkg/obiseq"
)
func (taxon *TaxNode) IsSubCladeOf(parent *TaxNode) bool {
for taxon.taxid != parent.taxid && taxon.parent != taxon.taxid {
@@ -25,18 +19,3 @@ func (taxon *TaxNode) IsBelongingSubclades(clades *TaxonSet) bool {
return ok
}
func IsSubCladeOf(taxonomy Taxonomy, taxid int) obiseq.SequencePredicate {
parent, err := taxonomy.Taxon(taxid)
if err != nil {
log.Fatalf("Cannot find taxon : %d (%v)", taxid, err)
}
f := func(sequence *obiseq.BioSequence) bool {
taxon, err := taxonomy.Taxon(sequence.Taxid())
return err == nil && taxon.IsSubCladeOf(parent)
}
return f
}