Commit dfdb0938 authored by 1Hyena's avatar 1Hyena

Autotuned_index now prints all info into logger instead of couting it.

parent 5042ab1f
...@@ -99,18 +99,22 @@ public: ...@@ -99,18 +99,22 @@ public:
*/ */
virtual void buildIndex() virtual void buildIndex()
{ {
std::ostringstream stream;
bestParams_ = estimateBuildParams(); bestParams_ = estimateBuildParams();
print_params(bestParams_, stream);
Logger::info("----------------------------------------------------\n"); Logger::info("----------------------------------------------------\n");
Logger::info("Autotuned parameters:\n"); Logger::info("Autotuned parameters:\n");
print_params(bestParams_); Logger::info("%s", stream.str().c_str());
Logger::info("----------------------------------------------------\n"); Logger::info("----------------------------------------------------\n");
bestIndex_ = create_index_by_type(dataset_, bestParams_, distance_); bestIndex_ = create_index_by_type(dataset_, bestParams_, distance_);
bestIndex_->buildIndex(); bestIndex_->buildIndex();
speedup_ = estimateSearchParams(bestSearchParams_); speedup_ = estimateSearchParams(bestSearchParams_);
stream.str(std::string());
print_params(bestSearchParams_, stream);
Logger::info("----------------------------------------------------\n"); Logger::info("----------------------------------------------------\n");
Logger::info("Search parameters:\n"); Logger::info("Search parameters:\n");
print_params(bestSearchParams_); Logger::info("%s", stream.str().c_str());
Logger::info("----------------------------------------------------\n"); Logger::info("----------------------------------------------------\n");
} }
......
...@@ -79,17 +79,15 @@ T get_param(const IndexParams& params, std::string name) ...@@ -79,17 +79,15 @@ T get_param(const IndexParams& params, std::string name)
} }
} }
inline void print_params(const IndexParams& params) inline void print_params(const IndexParams& params, std::ostringstream& stream)
{ {
IndexParams::const_iterator it; IndexParams::const_iterator it;
for(it=params.begin(); it!=params.end(); ++it) { for(it=params.begin(); it!=params.end(); ++it) {
std::cout << it->first << " : " << it->second << std::endl; stream << it->first << " : " << it->second << std::endl;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment