Launch HQP & HUP score changes.

components/omnibox/browser/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 "components/omnibox/browser/scored_history_match.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 94 matching lines @@
 
 // static
 const size_t ScoredHistoryMatch::kMaxVisitsToScore = 10;
 bool ScoredHistoryMatch::also_do_hup_like_scoring_ = false;
 int ScoredHistoryMatch::bookmark_value_ = 1;
 bool ScoredHistoryMatch::fix_frequency_bugs_ = false;
 bool ScoredHistoryMatch::allow_tld_matches_ = false;
 bool ScoredHistoryMatch::allow_scheme_matches_ = false;
 size_t ScoredHistoryMatch::num_title_words_to_allow_ = 10u;
 bool ScoredHistoryMatch::hqp_experimental_scoring_enabled_ = false;
-float ScoredHistoryMatch::topicality_threshold_ = -1;
+float ScoredHistoryMatch::topicality_threshold_ = 0.8f;
+// Default HQP relevance buckets. See GetFinalRelevancyScore()
+// for more details on these numbers.
+char ScoredHistoryMatch::hqp_relevance_buckets_str_[] =
+    "0.0:400,1.5:600,5.0:900,10.5:1203,15.0:1300,20.0:1399";
 std::vector<ScoredHistoryMatch::ScoreMaxRelevance>*
     ScoredHistoryMatch::hqp_relevance_buckets_ = nullptr;
 
 ScoredHistoryMatch::ScoredHistoryMatch()
     : ScoredHistoryMatch(history::URLRow(),
                          VisitInfoVector(),
                          std::string(),
                          base::string16(),
                          String16Vector(),
                          WordStarts(),
@@ skipping 407 matching lines @@
       return 0;
     topicality_score += raw_term_score_to_topicality_score[std::min(
         term_score, kMaxRawTermScore - 1)];
   }
   // TODO(mpearson): If there are multiple terms, consider taking the
   // geometric mean of per-term scores rather than the arithmetic mean.
 
   const float final_topicality_score = topicality_score / num_terms;
 
   // Demote the URL if the topicality score is less than threshold.
-  if (hqp_experimental_scoring_enabled_ &&
-      (final_topicality_score < topicality_threshold_)) {
+  if (final_topicality_score < topicality_threshold_) {
     return 0.0;
   }
 
   return final_topicality_score;
 }
 
 float ScoredHistoryMatch::GetRecencyScore(int last_visit_days_ago) const {
   // Lookup the score in days_ago_to_recency_score, treating
   // everything older than what we've precomputed as the oldest thing
   // we've precomputed.  The std::max is to protect against corruption
@@ skipping 83 matching lines @@
   }
   // It will reach this stage when the score is > highest bucket score.
   // Return the highest bucket score.
   return hqp_relevance_buckets[i - 1].second;
 }
 
 // static
 void ScoredHistoryMatch::InitHQPExperimentalParams() {
   // These are default HQP relevance scoring buckets.
   // See GetFinalRelevancyScore() for details.
-  std::string hqp_relevance_buckets_str = "0.0:400,1.5:600,12.0:1300,20.0:1399";
+  std::string hqp_relevance_buckets_str = std::string(
+      hqp_relevance_buckets_str_);
 
   // Fetch the experiment params if they are any.
   hqp_experimental_scoring_enabled_ =
       OmniboxFieldTrial::HQPExperimentalScoringEnabled();
 
   if (hqp_experimental_scoring_enabled_) {
     // Add the topicality threshold from experiment params.
     float hqp_experimental_topicality_threhold =
         OmniboxFieldTrial::HQPExperimentalTopicalityThreshold();
     topicality_threshold_ = hqp_experimental_topicality_threhold;
@@ skipping 31 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;
 }