diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-10-05 06:04:26 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-10-05 06:04:26 -0700 |
| commit | 595b9ea54a21988ae4209779ac2dae9898aa43e2 (patch) | |
| tree | 2b2ac303f43960e4b0aa2e2c82aaa9cd4854bbb2 /native/jni/src/correction.cpp | |
| parent | 49a90081ebaef2e34ea4bb10588b9b0a6e09062c (diff) | |
| parent | 478605baa460d2d595c7ed0da2790b147727d284 (diff) | |
| download | latinime-595b9ea54a21988ae4209779ac2dae9898aa43e2.tar.gz latinime-595b9ea54a21988ae4209779ac2dae9898aa43e2.tar.xz latinime-595b9ea54a21988ae4209779ac2dae9898aa43e2.zip | |
am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807be
* commit '478605baa460d2d595c7ed0da2790b147727d284':
Follow up change for I5f166a738f6e84a1b807be
Diffstat (limited to 'native/jni/src/correction.cpp')
| -rw-r--r-- | native/jni/src/correction.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp index 26d8ed715..524abe9a1 100644 --- a/native/jni/src/correction.cpp +++ b/native/jni/src/correction.cpp @@ -799,9 +799,9 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex const float x = static_cast<float>(squaredDistance) / ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR; const float factor = max((x < R1) - ? (A * (R1 - x) + B * x) / R1 - : (B * (R2 - x) + C * (x - R1)) / (R2 - R1), MIN); - // factor is piecewise linear function like: + ? (A * (R1 - x) + B * x) / R1 + : (B * (R2 - x) + C * (x - R1)) / (R2 - R1), MIN); + // factor is a piecewise linear function like: // A -_ . // ^-_ . // B \ . @@ -809,7 +809,7 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex // C ------------. // . // 0 R1 R2 . - multiplyRate((int)(factor * 100), &finalFreq); + multiplyRate((int)(factor * 100.0f), &finalFreq); } else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) { multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq); } |