repair inc search

DSM-fudan · Sep 7, 2022 · 62c5cfb · 62c5cfb
1 parent 70372e9
commit 62c5cfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Expr/Recall.cpp b/src/Expr/Recall.cpp
@@ -1115,7 +1115,7 @@ void Recall::doExprWithResIncFADAS(FADASNode *root, vector<vector<int>> *g, cons
     Const::logPrint( "result file is " + Const::resfn);
     int k = Const::k;
 //    int ks[]{10};
-    int node_nums[]{1,2,3,4,5, 10, 25};
+    int node_nums[]{1,2,3,4,5, 10, 25,50,100};
 //    int node_nums[]{25};
     float *query;
     float query_reordered[Const::tsLength];

diff --git a/src/SearchEngine/FADASSearcher.cpp b/src/SearchEngine/FADASSearcher.cpp
@@ -756,13 +756,13 @@ void FADASSearcher::approxIncSearchInterNode(FADASNode *root, TimeSeries *queryT
 //    }
 //    sort(candidates.begin(),  candidates.end());
 
-    vector<PqItemFadas>candidates;
+    vector<FADASNode*>candidates;
     unordered_set<FADASNode*>cands;
     for(FADASNode *node: parent->children)
         if(node != nullptr && node!=cur && cands.find(node) == cands.end()) {
             double dist = SaxUtil::LowerBound_Paa_iSax(queryTs->paa, node->sax, node->layer);
             cands.insert(node);
-            candidates.emplace_back(node , dist);
+            candidates.push_back(node);
         }
     cands.clear();
     sort(candidates.begin(), candidates.end(), comp_fadas);