Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be2a172d authored by Keisuke Kuroynagi's avatar Keisuke Kuroynagi Committed by Android (Google) Code Review
Browse files

Merge "Give the best score to the most probable exact match."

parents b7a2fd16 f0dc0b1b

native/jni/src/suggest/core/suggest.cpp

+22 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ namespace latinime { 
const int Suggest::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16;

const int Suggest::MIN_CONTINUOUS_SUGGESTION_INPUT_SIZE = 2;

const float Suggest::AUTOCORRECT_CLASSIFICATION_THRESHOLD = 0.33f;

const int Suggest::FINAL_SCORE_PENALTY_FOR_NOT_BEST_EXACT_MATCHED_WORD = 1;



/**

 * Returns a set of suggestions for the given input touch points. The commitPoint argument indicates
@@ -148,6 +149,8 @@ int Suggest::outputSuggestions(DicTraverseSession *traverseSession, int *frequen 
            &doubleLetterTerminalIndex, &doubleLetterLevel);



    int maxScore = S_INT_MIN;

    int bestExactMatchedNodeTerminalIndex = -1;

    int bestExactMatchedNodeOutputWordIndex = -1;

    // Output suggestion results here

    for (int terminalIndex = 0; terminalIndex < terminalSize && outputWordIndex < MAX_RESULTS;

            ++terminalIndex) {
@@ -186,7 +189,6 @@ int Suggest::outputSuggestions(DicTraverseSession *traverseSession, int *frequen 
        const int finalScore = SCORING->calculateFinalScore(

                compoundDistance, traverseSession->getInputSize(),

                isForceCommitMultiWords || (isValidWord && SCORING->doesAutoCorrectValidWord()));



        maxScore = max(maxScore, finalScore);



        if (TRAVERSAL->allowPartialCommit()) {
@@ -200,6 +202,25 @@ int Suggest::outputSuggestions(DicTraverseSession *traverseSession, int *frequen 
        if (isValidWord) {

            outputTypes[outputWordIndex] = Dictionary::KIND_CORRECTION | outputTypeFlags;

            frequencies[outputWordIndex] = finalScore;

            if (isSafeExactMatch) {

                // Demote exact matches that are not the highest probable node among all exact

                // matches.

                const bool isBestTerminal = bestExactMatchedNodeTerminalIndex < 0

                        || terminals[bestExactMatchedNodeTerminalIndex].getProbability()

                                < terminalDicNode->getProbability();

                const int outputWordIndexToBeDemoted = isBestTerminal ?

                        bestExactMatchedNodeOutputWordIndex : outputWordIndex;

                if (outputWordIndexToBeDemoted >= 0) {

                    frequencies[outputWordIndexToBeDemoted] -=

                            FINAL_SCORE_PENALTY_FOR_NOT_BEST_EXACT_MATCHED_WORD;

                }

                if (isBestTerminal) {

                    // Updates the best exact matched node index.

                    bestExactMatchedNodeTerminalIndex = terminalIndex;

                    // Updates the best exact matched output word index.

                    bestExactMatchedNodeOutputWordIndex = outputWordIndex;

                }

            }

            // Populate the outputChars array with the suggested word.

            const int startIndex = outputWordIndex * MAX_WORD_LENGTH;

            terminalDicNode->outputResult(&outputCodePoints[startIndex]);

native/jni/src/suggest/core/suggest.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ class Suggest : public SuggestInterface { 


    // Threshold for autocorrection classifier

    static const float AUTOCORRECT_CLASSIFICATION_THRESHOLD;

    // Final score penalty to exact match words that are not the most probable exact match.

    static const int FINAL_SCORE_PENALTY_FOR_NOT_BEST_EXACT_MATCHED_WORD;



    const Traversal *const TRAVERSAL;

    const Scoring *const SCORING;

native/jni/src/suggest/policyimpl/typing/typing_weighting.h

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ class TypingWeighting : public Weighting { 


    float getTerminalLanguageCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode, const float dicNodeLanguageImprobability) const {

        // We promote exact matches here to prevent them from being pruned. The final score of

        // exact match nodes might be demoted later in Suggest::outputSuggestions if there are

        // multiple exact matches.

        const float languageImprobability = (dicNode->isExactMatch()) ?

                0.0f : dicNodeLanguageImprobability;

        return languageImprobability * ScoringParams::DISTANCE_WEIGHT_LANGUAGE;