Add speedup shortcut to TaxonomyExpression for a single tax identifier

Skip the expression evaluation if only one number is given
soedinglab · Aug 4, 2022 · 8ff7279 · 8ff7279
1 parent 1d63172
commit 8ff7279
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/taxonomy/TaxonomyExpression.h b/src/taxonomy/TaxonomyExpression.h
@@ -20,6 +20,12 @@ class TaxonomyExpression {
     };
 
     TaxonomyExpression(const std::string &expression, NcbiTaxonomy &taxonomy, CommaMeaning commaMeaning = COMMA_IS_OR) {
+        tc.t = &taxonomy;
+        if (Util::isNumber(expression)) {
+            shortcutAncestor = strtoull(expression.c_str(), NULL, 10);
+            parser = NULL;
+            return;
+        }
         std::string bracketExpression;
         bool inNumber = false;
         for (size_t i = 0; i < expression.size(); i++) {
@@ -50,7 +56,6 @@ class TaxonomyExpression {
         if (inNumber == true) {
             bracketExpression.append(")");
         }
-        tc.t = &taxonomy;
         te_variable var;
         var.name = "a";
         // GCC 4.8 does not like casting functions to void*
@@ -66,13 +71,18 @@ class TaxonomyExpression {
     }
 
     ~TaxonomyExpression() {
-        delete parser;
+        if (parser != NULL) { 
+            delete parser;
+        }
     }
 
     bool isAncestor(TaxID taxId) {
-        tc.taxId = taxId;
-        const double result = parser->evaluate();
-        return (result != 0);
+        if (parser != NULL) {
+            tc.taxId = taxId;
+            const double result = parser->evaluate();
+            return (result != 0);
+        }
+        return tc.t->IsAncestor(shortcutAncestor, taxId);
     }
 
 private:
@@ -83,6 +93,7 @@ class TaxonomyExpression {
     TaxContext tc;
     ExpressionParser *parser;
     std::vector<te_variable> vars;
+    TaxID shortcutAncestor;
 
     static double acst(void *context, double a) {
         TaxContext *o = (TaxContext *) context;