nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 595b9ea5: am 478605ba: am 448e7322: Follow up change for I5f166a738f6e84a1b807be

Browse source 
* commit '595b9ea54a21988ae4209779ac2dae9898aa43e2':
  Follow up change for  I5f166a738f6e84a1b807be
This commit is contained in:
Satoshi Kataoka 2012-10-05 06:06:49 -07:00 committed by Android Git Automerger
commit b3ef79b6cc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
native/jni/src/correction.cpp
View file

@ -799,9 +799,9 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex
const float x = static_cast<float>(squaredDistance) const float x = static_cast<float>(squaredDistance)
/ ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR; / ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR;
const float factor = max((x < R1) const float factor = max((x < R1)
? (A * (R1 - x) + B * x) / R1 ? (A * (R1 - x) + B * x) / R1
: (B * (R2 - x) + C * (x - R1)) / (R2 - R1), MIN); : (B * (R2 - x) + C * (x - R1)) / (R2 - R1), MIN);
// factor is piecewise linear function like: // factor is a piecewise linear function like:
// A -_ . // A -_ .
// ^-_ . // ^-_ .
// B \ . // B \ .
@ -809,7 +809,7 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex
// C ------------. // C ------------.
// . // .
// 0 R1 R2 . // 0 R1 R2 .
multiplyRate((int)(factor * 100), &finalFreq); multiplyRate((int)(factor * 100.0f), &finalFreq);
} else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) { } else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq); multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
} }