AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2016-01-08 17:14:34 +03:00 • committed by Sergey Yershov
parent ae508dcad5
commit 1b73a0b236
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
search/search_quality_tests/queries.txt
View file

@ -1,3 +1,5 @@
wifi
hotel
Москва
London
кафе москва
@ -32,5 +34,6 @@ tehama 4th street
6 route des jeunes Genève
москва 4 2 останкинская
улица Константина Симонова
фрезерная 1, 2/1, стр. 1
фрезерная 1, д. 2/1, стр. 1
фрезерная 1, д. 2/1, стр. 10

36
search/search_quality_tests/search_quality_tests.cpp
View file

@ -7,6 +7,7 @@
#include "storage/country_info_getter.hpp"
#include "geometry/mercator.hpp"
#include "geometry/point2d.hpp"
#include "search/search_tests_support/test_search_engine.hpp"
@ -27,10 +28,13 @@
#include "std/cstdio.hpp"
#include "std/fstream.hpp"
#include "std/iostream.hpp"
#include "std/map.hpp"
#include "std/numeric.hpp"
#include "std/string.hpp"
#include "std/vector.hpp"
#include "defines.hpp"
#include "3party/gflags/src/gflags/gflags.h"
using namespace search::tests_support;
@ -41,14 +45,17 @@ DEFINE_string(mwm_list_path, "", "Path to a file containing the names of availab
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");
DEFINE_string(viewport, "", "Viewport to use when searching (default, moscow, london, zurich)");
map<string, m2::RectD> const kViewports = {
{"default", m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0))},
{"moscow", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(37.7, 55.7), 5000)},
{"london", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(0.0, 51.5), 5000)},
{"zurich", MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(8.5, 47.4), 5000)}};
string const kDefaultQueriesPathSuffix = "/../search/search_quality_tests/queries.txt";
string const kEmptyResult = "<empty>";
m2::RectD const kDefaultViewport(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0));
m2::RectD const kMoscowViewport =
MercatorBounds::RectByCenterXYAndSizeInMeters(m2::PointD(37.6531, 55.7516), 5000);
class SearchQueryV2Factory : public search::SearchQueryFactory
{
// search::SearchQueryFactory overrides:
@ -82,7 +89,7 @@ void PrintTopResults(string const & query, vector<search::Result> const & result
{
cout << query;
char timeBuf[100];
sprintf(timeBuf, "\t[%.3fs]", elapsedSeconds);
snprintf(timeBuf, sizeof(timeBuf), "\t[%.3fs]", elapsedSeconds);
if (n > 1)
cout << timeBuf;
for (size_t i = 0; i < n; ++i)
@ -103,7 +110,7 @@ void PrintTopResults(string const & query, vector<search::Result> const & result
uint64_t ReadVersionFromHeader(platform::LocalCountryFile const & mwm)
{
if (mwm.GetCountryName() == "World" || mwm.GetCountryName() == "WorldCoasts")
if (mwm.GetCountryName() == WORLD_FILE_NAME || mwm.GetCountryName() == WORLD_COASTS_FILE_NAME)
return mwm.GetVersion();
ModelReaderPtr reader = FilesContainerR(mwm.GetPath(MapOptions::Map)).GetReader(VERSION_FILE_TAG);
@ -159,9 +166,20 @@ int main(int argc, char * argv[])
}
cout << endl;
// auto const & viewport = kDefaultViewport;
auto const & viewport = kMoscowViewport;
cout << "Viewport used in all search invocations: " << DebugPrint(viewport) << endl << endl;
m2::RectD viewport;
{
string name = FLAGS_viewport;
auto it = kViewports.find(name);
if (it == kViewports.end())
{
name = "default";
it = kViewports.find(name);
}
CHECK(it != kViewports.end(), ());
viewport = it->second;
cout << "Viewport used in all search invocations: " << name << " " << DebugPrint(viewport)
<< "\n\n";
}
vector<string> queries;
string queriesPath = FLAGS_queries_path;