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

Review fixes.

Browse source
This commit is contained in:
tatiana-yan 2020-04-21 10:47:05 +03:00 • committed by mpimenov
parent d779cde557
commit 232d898ed5
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
search/locality_scorer.hpp
View file

@ -37,7 +37,7 @@ public:
LocalityScorer(QueryParams const & params, m2::PointD const & pivot, Delegate & delegate);
void SetPivotForTests(m2::PointD const & pivot) { m_pivot = pivot; }
void SetPivotForTesting(m2::PointD const & pivot) { m_pivot = pivot; }
// Leaves at most |limit| elements of |localities|, ordered by their
// features.
@ -60,8 +60,10 @@ private:
friend std::string DebugPrint(ExLocality const & locality);
// Leaves at most |limit| elements of |localities|, ordered by some
// combination of ranks and number of matched tokens.
// Leaves at most |limit| elements of |localities|. Candidates are selected with
// LeaveTopByExactMatchNormAndRank. Number of candidates typically is much bigger than |limit|
// (100 vs 5). Then final localities are selected from candidates with
// LeaveTopBySimilarityAndOther.
void LeaveTopLocalities(IdfMap & idfs, size_t limit, std::vector<Locality> & localities);
// Selects at most |limitUniqueIds| best features by exact match, query norm and

6
search/search_tests/locality_scorer_test.cpp
View file

@ -48,7 +48,7 @@ public:
{
m_params.Clear();
m_scorer.SetPivotForTests(pivot);
m_scorer.SetPivotForTesting(pivot);
vector<UniString> tokens;
Delimiters delims;
@ -296,11 +296,11 @@ UNIT_CLASS_TEST(LocalityScorerTest, DistanceToPivot)
AddLocality("Aberdeen", ID_ABERDEEN_CLOSE, 10 /* rank */, m2::PointD(11.0, 11.0));
AddLocality("Aberdeen", ID_ABERDEEN_RANK1, 100 /* rank */, m2::PointD(0.0, 0.0));
AddLocality("Aberdeen", ID_ABERDEEN_RANK2, 50 /* rank */, m2::PointD(2.0, 2.0));
AddLocality("Aberdeen", ID_ABERDEEN_RANK2, 5 /* rank */, m2::PointD(4.0, 4.0));
AddLocality("Aberdeen", ID_ABERDEEN_RANK3, 5 /* rank */, m2::PointD(4.0, 4.0));
InitParams("Aberdeen", m2::PointD(10.0, 10.0) /* pivot */, false /* lastTokenIsPrefix */);
// Expected order is: the closest one (ID_ABERDEEN_CLOSE) first, than sorted by rank.
// Expected order is: the closest one (ID_ABERDEEN_CLOSE) first, then sorted by rank.
TEST_EQUAL(GetTopLocalities(1 /* limit */), Ids({ID_ABERDEEN_CLOSE}), ());
TEST_EQUAL(GetTopLocalities(2 /* limit */), Ids({ID_ABERDEEN_CLOSE, ID_ABERDEEN_RANK1}), ());
TEST_EQUAL(GetTopLocalities(3 /* limit */),