From 0cf922ff7b7779d4ed3cdbe016fc06bb67f2ece9 Mon Sep 17 00:00:00 2001 From: tatiana-yan Date: Thu, 16 Jul 2020 16:20:01 +0300 Subject: [PATCH] [search] Pass hotels refused by booking filter. --- search/geocoder.cpp | 7 +-- search/pre_ranker.cpp | 5 +- search/pre_ranking_info.hpp | 3 ++ search/ranker.cpp | 1 + search/ranking_info.cpp | 7 +++ search/ranking_info.hpp | 3 ++ search/result.hpp | 1 + .../processor_test.cpp | 51 +++++++++---------- search/search_tests_support/helpers.cpp | 7 +++ search/search_tests_support/helpers.hpp | 2 + 10 files changed, 56 insertions(+), 31 deletions(-) diff --git a/search/geocoder.cpp b/search/geocoder.cpp index ad4bb011c2..25ce8224e8 100644 --- a/search/geocoder.cpp +++ b/search/geocoder.cpp @@ -1661,9 +1661,6 @@ void Geocoder::EmitResult(BaseContext & ctx, MwmSet::MwmId const & mwmId, uint32 if (matchedFraction <= 0.1) return; - if (ctx.m_hotelsFilter && !ctx.m_hotelsFilter->Matches(id)) - return; - if (ctx.m_cuisineFilter && !ctx.m_cuisineFilter->Matches(id)) return; @@ -1676,6 +1673,10 @@ void Geocoder::EmitResult(BaseContext & ctx, MwmSet::MwmId const & mwmId, uint32 // distant from the pivot when there are enough results close to the // pivot. PreRankingInfo info(type, tokenRange); + + if (ctx.m_hotelsFilter && !ctx.m_hotelsFilter->Matches(id)) + info.m_refusedByFilter = true; + for (auto const & layer : ctx.m_layers) info.m_tokenRanges[layer.m_type] = layer.m_tokenRange; diff --git a/search/pre_ranker.cpp b/search/pre_ranker.cpp index 2b1e427118..a880944c5e 100644 --- a/search/pre_ranker.cpp +++ b/search/pre_ranker.cpp @@ -41,7 +41,10 @@ void SweepNearbyResults(double xEps, double yEps, set const & prevEmi uint8_t const popularity = results[i].GetInfo().m_popularity; uint8_t const prevCount = prevEmit.count(results[i].GetId()) ? 1 : 0; uint8_t const exactMatch = results[i].GetInfo().m_exactMatch ? 1 : 0; - uint8_t const priority = max({rank, prevCount, popularity, exactMatch}); + // We prefer result which passed the filter even if it has lower rank / popularity / prevCount / + // exactMatch. + uint8_t const filterPassed = results[i].GetInfo().m_refusedByFilter ? 0 : 2; + uint8_t const priority = max({rank, prevCount, popularity, exactMatch}) + filterPassed; sweeper.Add(p.x, p.y, i, priority); } diff --git a/search/pre_ranking_info.hpp b/search/pre_ranking_info.hpp index 7af979e632..068e58090b 100644 --- a/search/pre_ranking_info.hpp +++ b/search/pre_ranking_info.hpp @@ -62,6 +62,9 @@ struct PreRankingInfo // Popularity rank of the feature. uint8_t m_popularity = 0; + // We may want to show results which did not pass filter. + bool m_refusedByFilter = false; + // Confidence and UGC rating. // Confidence: 0 - no information // 1 - based on few reviews diff --git a/search/ranker.cpp b/search/ranker.cpp index 12512253ca..733fa920be 100644 --- a/search/ranker.cpp +++ b/search/ranker.cpp @@ -363,6 +363,7 @@ class RankerResultMaker info.m_exactMatch = preInfo.m_exactMatch; info.m_categorialRequest = m_params.IsCategorialRequest(); info.m_tokenRanges = preInfo.m_tokenRanges; + info.m_refusedByFilter = preInfo.m_refusedByFilter; // We do not compare result name and request for categorial requests but we prefer named // features. diff --git a/search/ranking_info.cpp b/search/ranking_info.cpp index cb8376c4d9..ec43005e92 100644 --- a/search/ranking_info.cpp +++ b/search/ranking_info.cpp @@ -28,6 +28,7 @@ double constexpr kCategoriesDistanceToPivot = -0.6874177; double constexpr kCategoriesRank = 1.0000000; double constexpr kCategoriesRating = 0.0500000; double constexpr kCategoriesFalseCats = -1.0000000; +double constexpr kCategoriesRefusedByFilter = -1.0000000; double constexpr kDistanceToPivot = -0.2123693; double constexpr kRank = 0.1065355; @@ -38,6 +39,7 @@ double constexpr kErrorsMade = -0.0391331; double constexpr kMatchedFraction = 0.1876736; double constexpr kAllTokensUsed = 0.0478513; double constexpr kExactCountryOrCapital = 0.1247733; +double constexpr kRefusedByFilter = -1.0000000; double constexpr kNameScore[NameScore::NAME_SCORE_COUNT] = { 0.0085962 /* Zero */, -0.0099698 /* Substring */, @@ -73,6 +75,8 @@ static_assert(kRank >= 0, ""); static_assert(kPopularity >= 0, ""); static_assert(kErrorsMade <= 0, ""); static_assert(kExactCountryOrCapital >= 0, ""); +static_assert(kCategoriesRefusedByFilter < 0, ""); +static_assert(kRefusedByFilter < 0, ""); double TransformDistance(double distance) { @@ -199,6 +203,7 @@ string DebugPrint(RankingInfo const & info) os << ", m_exactCountryOrCapital:" << info.m_exactCountryOrCapital; os << ", m_categorialRequest:" << info.m_categorialRequest; os << ", m_hasName:" << info.m_hasName; + os << ", m_refusedByFilter:" << info.m_refusedByFilter; os << "]"; return os.str(); } @@ -262,6 +267,7 @@ double RankingInfo::GetLinearModelRank() const auto const nameRank = kNameScore[nameScore] + kErrorsMade * GetErrorsMadePerToken() + kMatchedFraction * m_matchedFraction; result += (m_isAltOrOldName ? 0.7 : 1.0) * nameRank; + result += (m_refusedByFilter ? 1 : 0) * kRefusedByFilter; } else { @@ -271,6 +277,7 @@ double RankingInfo::GetLinearModelRank() const result += kCategoriesRating * rating; result += kCategoriesFalseCats * kFalseCats; result += m_hasName * kHasName; + result += (m_refusedByFilter ? 1 : 0) * kCategoriesRefusedByFilter; } return result; } diff --git a/search/ranking_info.hpp b/search/ranking_info.hpp index e0ff5e6622..0ff6478ebf 100644 --- a/search/ranking_info.hpp +++ b/search/ranking_info.hpp @@ -113,6 +113,9 @@ struct RankingInfo // True iff the feature has a name. bool m_hasName = false; + + // We may want to show results which did not pass filter. + bool m_refusedByFilter = false; }; ResultType GetResultType(feature::TypesHolder const & th); diff --git a/search/result.hpp b/search/result.hpp index a76979472a..844aaa64b2 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -103,6 +103,7 @@ public: return m_details.m_hotelApproximatePricing; } bool IsHotel() const { return m_details.m_isHotel; } + bool IsRefusedByFilter() const { return m_info.m_refusedByFilter; } osm::YesNoUnknown IsOpenNow() const { return m_details.m_isOpenNow; } int GetStarsCount() const { return m_details.m_stars; } diff --git a/search/search_integration_tests/processor_test.cpp b/search/search_integration_tests/processor_test.cpp index b66d7b8b3e..ace111fd60 100644 --- a/search/search_integration_tests/processor_test.cpp +++ b/search/search_integration_tests/processor_test.cpp @@ -1059,49 +1059,46 @@ UNIT_CLASS_TEST(ProcessorTest, HotelsFiltering) params.m_mode = Mode::Everywhere; params.m_suggestsEnabled = false; - { + auto const test = [&](vector const & matchedHotels) { Rules rules = {ExactMatch(id, h1), ExactMatch(id, h2), ExactMatch(id, h3), ExactMatch(id, h4)}; - TEST(ResultsMatch(params, rules), ()); - } + + auto request = MakeRequest(params); + TEST(ResultsMatch(request->Results(), rules), ()); + for (auto const & result : request->Results()) + { + FeaturesLoaderGuard loader(m_dataSource, id); + auto ft = loader.GetFeatureByIndex(result.GetFeatureID().m_index); + TEST(ft, ()); + + if (base::AnyOf(matchedHotels, [&](auto const & h) { return h.Matches(*ft); })) + TEST(!result.IsRefusedByFilter(), (result)); + else + TEST(result.IsRefusedByFilter(), (result)); + } + }; + + test({h1, h2, h3, h4}); using namespace hotels_filter; params.m_hotelsFilter = And(Gt(7.0), Le(2)); - { - Rules rules = {ExactMatch(id, h1), ExactMatch(id, h3)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h1, h3}); params.m_hotelsFilter = Or(Eq(9.0), Le(4)); - { - Rules rules = {ExactMatch(id, h1), ExactMatch(id, h3), ExactMatch(id, h4)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h1, h3, h4}); params.m_hotelsFilter = Or(And(Eq(7.0), Eq(5)), Eq(4)); - { - Rules rules = {ExactMatch(id, h2), ExactMatch(id, h4)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h2, h4}); params.m_hotelsFilter = Or(Is(TestHotel::Type::GuestHouse), Is(TestHotel::Type::Hostel)); - { - Rules rules = {ExactMatch(id, h2), ExactMatch(id, h3), ExactMatch(id, h4)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h2, h3, h4}); params.m_hotelsFilter = And(Gt(3), Is(TestHotel::Type::GuestHouse)); - { - Rules rules = {ExactMatch(id, h4)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h4}); params.m_hotelsFilter = OneOf((1U << static_cast(TestHotel::Type::Hotel)) | (1U << static_cast(TestHotel::Type::Hostel))); - { - Rules rules = {ExactMatch(id, h1), ExactMatch(id, h2)}; - TEST(ResultsMatch(params, rules), ()); - } + test({h1, h2}); } UNIT_CLASS_TEST(ProcessorTest, FuzzyMatch) diff --git a/search/search_tests_support/helpers.cpp b/search/search_tests_support/helpers.cpp index 4fcaf1f22e..bab0e86257 100644 --- a/search/search_tests_support/helpers.cpp +++ b/search/search_tests_support/helpers.cpp @@ -78,6 +78,13 @@ size_t SearchTest::GetResultsNumber(string const & query, string const & locale) return request.Results().size(); } +unique_ptr SearchTest::MakeRequest(SearchParams params) +{ + auto request = make_unique(m_engine, params); + request->Run(); + return request; +} + unique_ptr SearchTest::MakeRequest( string const & query, string const & locale /* = "en" */) { diff --git a/search/search_tests_support/helpers.hpp b/search/search_tests_support/helpers.hpp index f25e019b0f..81754f2631 100644 --- a/search/search_tests_support/helpers.hpp +++ b/search/search_tests_support/helpers.hpp @@ -47,6 +47,8 @@ public: size_t GetResultsNumber(std::string const & query, std::string const & locale); + std::unique_ptr MakeRequest(SearchParams params); + std::unique_ptr MakeRequest(std::string const & query, std::string const & locale = "en");