From 62c5cfb0c300e2fda8ab24084dbdd17724173cf5 Mon Sep 17 00:00:00 2001
From: caucher <644513759@qq.com>
Date: Wed, 7 Sep 2022 10:20:37 +0800
Subject: [PATCH] repair inc search

---
 src/Expr/Recall.cpp                | 2 +-
 src/SearchEngine/FADASSearcher.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Expr/Recall.cpp b/src/Expr/Recall.cpp
index 6968ed6..8d42f0f 100644
--- 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
index ed8f8d6..5c69067 100644
--- 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);