diff options
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/src/correction.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp index 49e3e3c8c..524abe9a1 100644 --- a/native/jni/src/correction.cpp +++ b/native/jni/src/correction.cpp @@ -764,13 +764,23 @@ int Correction::RankingAlgorithm::calculateFinalProbability(const int inputIndex } } + int additionalProximityCount = 0; + // Demote additional proximity characters + for (int i = 0; i < outputLength; ++i) { + const int squaredDistance = correction->mDistances[i]; + if (squaredDistance == ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO) { + ++additionalProximityCount; + } + } + const bool performTouchPositionCorrection = CALIBRATE_SCORE_BY_TOUCH_COORDINATES && proximityInfoState->touchPositionCorrectionEnabled() - && skippedCount == 0 && excessiveCount == 0 && transposedCount == 0; + && skippedCount == 0 && excessiveCount == 0 && transposedCount == 0 + && additionalProximityCount == 0; + // Score calibration by touch coordinates is being done only for pure-fat finger typing error // cases. - int additionalProximityCount = 0; // TODO: Remove this constraint. if (performTouchPositionCorrection) { for (int i = 0; i < outputLength; ++i) { @@ -789,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 \ . @@ -799,22 +809,12 @@ 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); - } else if (squaredDistance == ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO) { - ++additionalProximityCount; - multiplyRate(WORDS_WITH_ADDITIONAL_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq); } } } else { - // Demote additional proximity characters - for (int i = 0; i < outputLength; ++i) { - const int squaredDistance = correction->mDistances[i]; - if (squaredDistance == ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO) { - ++additionalProximityCount; - } - } // Promotion for a word with proximity characters for (int i = 0; i < adjustedProximityMatchedCount; ++i) { // A word with proximity corrections |