From 2b7cf56841a2475d6e8e838fbab1a933a336f619 Mon Sep 17 00:00:00 2001 From: ChunjiangZhu Date: Wed, 30 Oct 2019 16:49:32 -0400 Subject: [PATCH] remove log --- similarity_search/src/method/hnsw.cc | 4 +++- similarity_search/src/method/small_world_rand.cc | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc index f00920c..f87b0cd 100644 --- a/similarity_search/src/method/hnsw.cc +++ b/similarity_search/src/method/hnsw.cc @@ -68,6 +68,8 @@ #define FIELD_MAX_M0 "MAX_M0" #define CURR_LEVEL "CURR_LEVEL" +#define MAXIMUM_K 1000 + namespace similarity { // This is the counter to keep the size of neighborhood information (for one node) @@ -1349,7 +1351,7 @@ namespace similarity { } } - SortArrBI sortedArr(max(ef_, 1000)); // max(ef_, query->GetK()) + SortArrBI sortedArr(max(ef_, MAXIMUM_K)); // max(ef_, query->GetK()) sortedArr.push_unsorted_grow(curdist, curNode); int_fast32_t currElem = 0; diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc index aa1953e..1016881 100644 --- a/similarity_search/src/method/small_world_rand.cc +++ b/similarity_search/src/method/small_world_rand.cc @@ -41,6 +41,8 @@ #define MERGE_BUFFER_ALGO_SWITCH_THRESHOLD 100 #define MAX_ID_TO_SIZE_RATIO 1.5 +#define MAXIMUM_K 1000 + namespace similarity { using namespace std; @@ -601,8 +603,8 @@ void SmallWorldRand::addCriticalSection(MSWNode *newElement){ template void SmallWorldRand::Search(RangeQuery* query, IdType) const { // throw runtime_error("Range search is not supported!"); - if (searchAlgoType_ == kV1Merge) {std::cerr << "call SearchV1Merge" << endl; SearchV1Merge(query);} - else {std::cerr << "call SearchOld" << endl; SearchOld(query);} + if (searchAlgoType_ == kV1Merge) SearchV1Merge(query); + else SearchOld(query); } template @@ -741,7 +743,7 @@ void SmallWorldRand::SearchV1Merge(RangeQuery* query) const { MSWNode* currNode = pEntryPoint_; CHECK_MSG(currNode != nullptr, "Bug: there is not entry point set!") - SortArrBI sortedArr(efSearch_); // max(efSearch_, query->GetK()) + SortArrBI sortedArr(max(efSearch_, MAXIMUM_K)); // max(efSearch_, query->GetK()) const Object* currObj = currNode->getData(); dist_t d = query->DistanceObjLeft(currObj);