diff --git a/search/search_quality_tests/queries.txt b/search/search_quality_tests/queries.txt index 68aeea4f11..1ac204f889 100644 --- a/search/search_quality_tests/queries.txt +++ b/search/search_quality_tests/queries.txt @@ -28,3 +28,5 @@ tehama 4th street чехова улица завод чехов улица лермонтова чехов улица чехова +депутатский +6 route des jeunes Genève diff --git a/search/search_quality_tests/search_quality_tests.cpp b/search/search_quality_tests/search_quality_tests.cpp index 979532bc67..44397c56ae 100644 --- a/search/search_quality_tests/search_quality_tests.cpp +++ b/search/search_quality_tests/search_quality_tests.cpp @@ -16,10 +16,13 @@ #include "platform/local_country_file_utils.hpp" #include "platform/platform.hpp" +#include "coding/file_name_utils.hpp" + #include "base/logging.hpp" #include "base/scope_guard.hpp" -#include "std/cstdio.hpp" +#include "std/fstream.hpp" +#include "std/iostream.hpp" #include "std/numeric.hpp" #include "std/string.hpp" #include "std/vector.hpp" @@ -28,7 +31,6 @@ using namespace search::tests_support; -#pragma mark Define options DEFINE_string(data_path, "", "Path to data directory (resources dir)"); DEFINE_string(locale, "en", "Locale of all the search queries"); DEFINE_string(mwm_list_path, "", "Path to a file containing the names of available mwms, one per line"); @@ -36,8 +38,8 @@ DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)"); DEFINE_string(queries_path, "", "Path to the file with queries"); DEFINE_int32(top, 1, "Number of top results to show for every query"); -size_t const kNumTopResults = 5; string const kDefaultQueriesPathSuffix = "/../search/search_quality_tests/queries.txt"; +string const kEmptyResult = ""; class SearchQueryV2Factory : public search::SearchQueryFactory { @@ -50,52 +52,43 @@ class SearchQueryV2Factory : public search::SearchQueryFactory } }; -unique_ptr CreateCountryInfoGetter() -{ - Platform & platform = GetPlatform(); - return make_unique(platform.GetReader(PACKED_POLYGONS_FILE), - platform.GetReader(COUNTRIES_FILE)); -} - void ReadStringsFromFile(string const & path, vector & result) { - FILE * f = fopen(path.data(), "r"); - CHECK(f != nullptr, ("Error when reading strings from", path, ":", string(strerror(errno)))); - MY_SCOPE_GUARD(cleanup, [&] - { - fclose(f); - }); + ifstream stream(path.c_str()); + CHECK(stream.is_open(), ("Can't open", path)); - int const kBufSize = 1 << 20; - char buf[kBufSize]; - while (fgets(buf, sizeof(buf), f)) + string s; + while (getline(stream, s)) { - string s(buf); strings::Trim(s); if (!s.empty()) - result.push_back(s); + result.emplace_back(s); } } +// If n == 1, prints the query and the top result separated by a tab. +// Otherwise, prints the query on a separate line +// and then prints n top results on n lines starting with tabs. void PrintTopResults(string const & query, vector const & results, size_t n) { - printf("%s", query.data()); - for (size_t i = 0; i < n; i++) + cout << query; + for (size_t i = 0; i < n; ++i) { if (n > 1) - printf("\n"); - printf("\t"); + cout << endl; + cout << "\t"; if (i < results.size()) // todo(@m) Print more information: coordinates, viewport, etc. - printf("%s", results[i].GetString()); + cout << results[i].GetString(); else - printf(""); + cout << kEmptyResult; } - printf("\n"); + cout << endl; } int main(int argc, char * argv[]) { + ios_base::sync_with_stdio(false); Platform & platform = GetPlatform(); google::SetUsageMessage("Search quality tests."); @@ -111,9 +104,8 @@ int main(int argc, char * argv[]) LOG(LINFO, ("resources dir =", platform.ResourcesDir())); classificator::Load(); - auto infoGetter = CreateCountryInfoGetter(); - TestSearchEngine engine(FLAGS_locale, move(infoGetter), make_unique()); + TestSearchEngine engine(FLAGS_locale, make_unique()); vector mwms; if (!FLAGS_mwm_list_path.empty()) @@ -139,7 +131,7 @@ int main(int argc, char * argv[]) vector queries; string queriesPath = FLAGS_queries_path; if (queriesPath.empty()) - queriesPath = platform.WritableDir() + kDefaultQueriesPathSuffix; + queriesPath = my::JoinFoldersToPath(platform.WritableDir(), kDefaultQueriesPathSuffix); ReadStringsFromFile(queriesPath, queries); for (string const & query : queries) diff --git a/search/search_tests_support/test_search_engine.cpp b/search/search_tests_support/test_search_engine.cpp index 1987d71072..1a2fb7d964 100644 --- a/search/search_tests_support/test_search_engine.cpp +++ b/search/search_tests_support/test_search_engine.cpp @@ -60,7 +60,7 @@ TestSearchEngine::TestSearchEngine(string const & locale) } TestSearchEngine::TestSearchEngine(string const & locale, - unique_ptr && infoGetter) + unique_ptr infoGetter) : m_platform(GetPlatform()) , m_infoGetter(move(infoGetter)) , m_engine(*this, m_platform.GetReader(SEARCH_CATEGORIES_FILE_NAME), *m_infoGetter, locale, @@ -69,8 +69,8 @@ TestSearchEngine::TestSearchEngine(string const & locale, } TestSearchEngine::TestSearchEngine(string const & locale, - unique_ptr && infoGetter, - unique_ptr<::search::SearchQueryFactory> && factory) + unique_ptr infoGetter, + unique_ptr<::search::SearchQueryFactory> factory) : m_platform(GetPlatform()) , m_infoGetter(move(infoGetter)) , m_engine(*this, m_platform.GetReader(SEARCH_CATEGORIES_FILE_NAME), *m_infoGetter, locale, @@ -78,6 +78,16 @@ TestSearchEngine::TestSearchEngine(string const & locale, { } +TestSearchEngine::TestSearchEngine(string const & locale, + unique_ptr<::search::SearchQueryFactory> factory) + : m_platform(GetPlatform()) + , m_infoGetter(new storage::CountryInfoReader(m_platform.GetReader(PACKED_POLYGONS_FILE), + m_platform.GetReader(COUNTRIES_FILE))) + , m_engine(*this, m_platform.GetReader(SEARCH_CATEGORIES_FILE_NAME), *m_infoGetter, locale, + move(factory)) +{ +} + TestSearchEngine::~TestSearchEngine() {} weak_ptr<::search::QueryHandle> TestSearchEngine::Search(::search::SearchParams const & params, diff --git a/search/search_tests_support/test_search_engine.hpp b/search/search_tests_support/test_search_engine.hpp index c349e98742..5c2aad7179 100644 --- a/search/search_tests_support/test_search_engine.hpp +++ b/search/search_tests_support/test_search_engine.hpp @@ -26,9 +26,11 @@ class TestSearchEngine : public Index { public: TestSearchEngine(string const & locale); - TestSearchEngine(string const & locale, unique_ptr && infoGetter); - TestSearchEngine(string const & locale, unique_ptr && infoGetter, - unique_ptr && factory); + TestSearchEngine(string const & locale, unique_ptr infoGetter); + TestSearchEngine(string const & locale, unique_ptr infoGetter, + unique_ptr factory); + TestSearchEngine(string const & locale, unique_ptr<::search::SearchQueryFactory> factory); + ~TestSearchEngine(); weak_ptr Search(search::SearchParams const & params, diff --git a/std/iostream.hpp b/std/iostream.hpp index 106683c45d..d9b6d0db8d 100644 --- a/std/iostream.hpp +++ b/std/iostream.hpp @@ -14,6 +14,8 @@ using std::cerr; using std::istream; using std::ostream; +using std::ios_base; + #ifndef OMIM_OS_ANDROID using std::wcin; using std::wcout;