diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index c2ef408..102059c 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -8,7 +8,7 @@ import ( // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "3424d30" +var _Commit = "6cb7a5a" var _Version = "Release 4.4.0" // Version returns the version of the obitools package. diff --git a/pkg/obitools/obirefidx/obirefidx.go b/pkg/obitools/obirefidx/obirefidx.go index cc7cf6d..1e4dd74 100644 --- a/pkg/obitools/obirefidx/obirefidx.go +++ b/pkg/obitools/obirefidx/obirefidx.go @@ -56,8 +56,6 @@ func IndexSequence(seqidx int, refs[pseq.Taxon(i).Node] = &temp } - // log.Infof("%s length of path: %d", sequence.Id(), len(refs)) - n := taxa.Len() lcaCache := make(map[*obitax.TaxNode]*obitax.TaxNode, n) @@ -89,10 +87,10 @@ func IndexSequence(seqidx int, var matrix []uint64 // obilog.Warnf("%s : %s", sequence.Id(), pseq.String()) + for idx_path := 1; idx_path < path_len; idx_path++ { mini := -1 seqidcs := refs[pseq.Taxon(idx_path).Node] - ns := len(*seqidcs) if ns > 0 { @@ -167,7 +165,6 @@ func IndexSequence(seqidx int, obitag_index := make(map[int]string, pseq.Len()) - // obilog.Warnf("(%s,%s): %v", sequence.Id(), pseq.Taxon(0).String(), closest) for i, d := range closest { if i < (len(closest)-1) && d < closest[i+1] { current_taxon := pseq.Taxon(i) @@ -175,6 +172,10 @@ func IndexSequence(seqidx int, } } + if len(obitag_index) == 0 { + obitag_index[0] = pseq.Taxon(pseq.Len() - 1).String() + } + /* log.Println(sequence.Id(), tseq.Taxid(), tseq.ScientificName(), tseq.Rank(), obitag_index) log.Println(sequence.Id(), tseq.Taxid(), tseq.ScientificName(), tseq.Rank(), nseq) diff --git a/pkg/obitools/obitag/obitag.go b/pkg/obitools/obitag/obitag.go index 884960f..c6be284 100644 --- a/pkg/obitools/obitag/obitag.go +++ b/pkg/obitools/obitag/obitag.go @@ -213,6 +213,10 @@ func Identify(sequence *obiseq.BioSequence, taxon = match_taxon } + if taxon.IsRoot() { + break + } + } log.Debugln(sequence.Id(), "Best matches:", len(bests), "New index:", newidx)