Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortatiana-yan <tatiana.kondakova@gmail.com>2021-03-11 15:11:53 +0300
committermpimenov <mpimenov@users.noreply.github.com>2021-03-11 15:15:51 +0300
commitc284e16d4a23f83cdfb7af097bf2302a0a9c4f97 (patch)
tree08f93430ca3c2727420fafa4b252efc2563c6907
parent9ab88d2befc511d38f175c64096605184dd25652 (diff)
[search_tests] Fix bad m_resultType.
-rw-r--r--search/ranking_info.cpp3
-rw-r--r--search/search_tests/ranking_tests.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp
index a2bff174b7..b08b3aaf76 100644
--- a/search/ranking_info.cpp
+++ b/search/ranking_info.cpp
@@ -258,7 +258,10 @@ double RankingInfo::GetLinearModelRank() const
result += m_falseCats * kFalseCats;
result += kType[m_type];
if (Model::IsPoi(m_type))
+ {
+ CHECK_NOT_EQUAL(m_resultType, ResultType::Count, ());
result += kResultType[base::Underlying(m_resultType)];
+ }
result += (m_allTokensUsed ? 1 : 0) * kAllTokensUsed;
result += (m_exactCountryOrCapital ? 1 : 0) * kExactCountryOrCapital;
auto const nameRank = kNameScore[nameScore] + kErrorsMade * GetErrorsMadePerToken() +
diff --git a/search/search_tests/ranking_tests.cpp b/search/search_tests/ranking_tests.cpp
index 3d39dd77a5..86a97b58d1 100644
--- a/search/search_tests/ranking_tests.cpp
+++ b/search/search_tests/ranking_tests.cpp
@@ -86,6 +86,7 @@ UNIT_TEST(PreferCountry)
cafe.m_tokenRanges[Model::TYPE_SUBPOI] = TokenRange(0, 1);
cafe.m_exactCountryOrCapital = false;
cafe.m_type = Model::TYPE_SUBPOI;
+ cafe.m_resultType = ResultType::Eat;
auto country = info;
country.m_distanceToPivot = 1e6;