am 67cc4518: Merge "Change wrongly used "lookahead" to "completion"."

* commit '67cc4518a6ad374d4afae5ba92c98a6ff0789a29':
  Change wrongly used "lookahead" to "completion".
main
Keisuke Kuroyanagi 2014-04-02 07:02:50 +00:00 committed by Android Git Automerger
commit 552d716bfd
3 changed files with 6 additions and 6 deletions

View File

@ -52,8 +52,8 @@ const float ScoringParams::SUBSTITUTION_COST = 0.3806f;
const float ScoringParams::COST_NEW_WORD = 0.0314f; const float ScoringParams::COST_NEW_WORD = 0.0314f;
const float ScoringParams::COST_SECOND_OR_LATER_WORD_FIRST_CHAR_UPPERCASE = 0.3224f; const float ScoringParams::COST_SECOND_OR_LATER_WORD_FIRST_CHAR_UPPERCASE = 0.3224f;
const float ScoringParams::DISTANCE_WEIGHT_LANGUAGE = 1.1214f; const float ScoringParams::DISTANCE_WEIGHT_LANGUAGE = 1.1214f;
const float ScoringParams::COST_FIRST_LOOKAHEAD = 0.4836f; const float ScoringParams::COST_FIRST_COMPLETION = 0.4836f;
const float ScoringParams::COST_LOOKAHEAD = 0.00624f; const float ScoringParams::COST_COMPLETION = 0.00624f;
const float ScoringParams::HAS_PROXIMITY_TERMINAL_COST = 0.0683f; const float ScoringParams::HAS_PROXIMITY_TERMINAL_COST = 0.0683f;
const float ScoringParams::HAS_EDIT_CORRECTION_TERMINAL_COST = 0.0362f; const float ScoringParams::HAS_EDIT_CORRECTION_TERMINAL_COST = 0.0362f;
const float ScoringParams::HAS_MULTI_WORD_TERMINAL_COST = 0.4182f; const float ScoringParams::HAS_MULTI_WORD_TERMINAL_COST = 0.4182f;

View File

@ -59,8 +59,8 @@ class ScoringParams {
static const float COST_NEW_WORD; static const float COST_NEW_WORD;
static const float COST_SECOND_OR_LATER_WORD_FIRST_CHAR_UPPERCASE; static const float COST_SECOND_OR_LATER_WORD_FIRST_CHAR_UPPERCASE;
static const float DISTANCE_WEIGHT_LANGUAGE; static const float DISTANCE_WEIGHT_LANGUAGE;
static const float COST_FIRST_LOOKAHEAD; static const float COST_FIRST_COMPLETION;
static const float COST_LOOKAHEAD; static const float COST_COMPLETION;
static const float HAS_PROXIMITY_TERMINAL_COST; static const float HAS_PROXIMITY_TERMINAL_COST;
static const float HAS_EDIT_CORRECTION_TERMINAL_COST; static const float HAS_EDIT_CORRECTION_TERMINAL_COST;
static const float HAS_MULTI_WORD_TERMINAL_COST; static const float HAS_MULTI_WORD_TERMINAL_COST;

View File

@ -166,8 +166,8 @@ class TypingWeighting : public Weighting {
const bool firstCompletion = dicNode->getInputIndex(0) const bool firstCompletion = dicNode->getInputIndex(0)
== traverseSession->getInputSize(); == traverseSession->getInputSize();
// TODO: Change the cost for the first completion for the gesture? // TODO: Change the cost for the first completion for the gesture?
const float cost = firstCompletion ? ScoringParams::COST_FIRST_LOOKAHEAD const float cost = firstCompletion ? ScoringParams::COST_FIRST_COMPLETION
: ScoringParams::COST_LOOKAHEAD; : ScoringParams::COST_COMPLETION;
return cost; return cost;
} }