Omnibox: Fix Scoring Bugs in URLs from History

chrome/browser/autocomplete/scored_history_match.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autocomplete/scored_history_match.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 105 matching lines @@
                 days_ago_to_recency_score[days_ago - 1]);
     }
   }
 }
 
 }  // namespace
 
 // static
 const size_t ScoredHistoryMatch::kMaxVisitsToScore = 10;
 int ScoredHistoryMatch::bookmark_value_ = 1;
+bool ScoredHistoryMatch::fix_frequency_bugs_ = false;
 bool ScoredHistoryMatch::allow_tld_matches_ = false;
 bool ScoredHistoryMatch::allow_scheme_matches_ = false;
 bool ScoredHistoryMatch::hqp_experimental_scoring_enabled_ = false;
 float ScoredHistoryMatch::topicality_threshold_ = -1;
 std::vector<ScoredHistoryMatch::ScoreMaxRelevance>*
     ScoredHistoryMatch::hqp_relevance_buckets_ = nullptr;
 
 ScoredHistoryMatch::ScoredHistoryMatch() : raw_score(0), can_inline(false) {
 }
 
@@ skipping 261 matching lines @@
   // to non-inlineable scores (scores less than 1200).  Without
   // HUP-like-scoring, these results would actually come from the HUP
   // and not be demoted, thus outscoring the demoted HQP results.
   // When the HQP provides these, we need to clamp the non-inlineable
   // results to preserve this behavior.
   if (kAlsoDoHupLikeScoring) {
     max_assigned_score_for_non_inlineable_matches =
         HistoryURLProvider::kScoreForBestInlineableResult - 1;
   }
   bookmark_value_ = OmniboxFieldTrial::HQPBookmarkValue();
+  fix_frequency_bugs_ = OmniboxFieldTrial::HQPFixFrequencyScoringBugs();
   allow_tld_matches_ = OmniboxFieldTrial::HQPAllowMatchInTLDValue();
   allow_scheme_matches_ = OmniboxFieldTrial::HQPAllowMatchInSchemeValue();
 
   InitRawTermScoreToTopicalityScoreArray();
   InitDaysAgoToRecencyScoreArray();
   InitHQPExperimentalParams();
 }
 
 float ScoredHistoryMatch::GetTopicalityScore(
     const int num_terms,
@@ skipping 159 matching lines @@
   // Compute the weighted average |value_of_transition| over the last at
   // most kMaxVisitsToScore visits, where each visit is weighted using
   // GetRecencyScore() based on how many days ago it happened.  Use
   // kMaxVisitsToScore as the denominator for the average regardless of
   // how many visits there were in order to penalize a match that has
   // fewer visits than kMaxVisitsToScore.
   float summed_visit_points = 0;
   const size_t max_visit_to_score =
       std::min(visits.size(), ScoredHistoryMatch::kMaxVisitsToScore);
   for (size_t i = 0; i < max_visit_to_score; ++i) {
-    int value_of_transition =
-        (visits[i].second == ui::PAGE_TRANSITION_TYPED) ? 20 : 1;
+    const bool typed_visit = fix_frequency_bugs_ ?
+        (visits[i].second & ui::PAGE_TRANSITION_TYPED) :
+        (visits[i].second == ui::PAGE_TRANSITION_TYPED);
+    int value_of_transition = typed_visit ? 20 : 1;
     if (bookmarked)
       value_of_transition = std::max(value_of_transition, bookmark_value_);
     const float bucket_weight =
         GetRecencyScore((now - visits[i].first).InDays());
     summed_visit_points += (value_of_transition * bucket_weight);
   }
+  if (fix_frequency_bugs_)
+    return summed_visit_points / ScoredHistoryMatch::kMaxVisitsToScore;
   return visits.size() * summed_visit_points /
-         ScoredHistoryMatch::kMaxVisitsToScore;
+      ScoredHistoryMatch::kMaxVisitsToScore;
 }
 
 // static
 float ScoredHistoryMatch::GetFinalRelevancyScore(
     float topicality_score,
     float frequency_score,
     const std::vector<ScoreMaxRelevance>& hqp_relevance_buckets) {
   DCHECK(hqp_relevance_buckets.size() > 0);
   DCHECK_EQ(hqp_relevance_buckets[0].first, 0.0);
 
@@ skipping 93 matching lines @@
           base::StringToDouble(it->first, &bucket.first);
       DCHECK(is_valid_intermediate_score);
       bool is_valid_hqp_score = base::StringToInt(it->second, &bucket.second);
       DCHECK(is_valid_hqp_score);
       hqp_buckets->push_back(bucket);
     }
     return true;
   }
   return false;
 }