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

Commit 57574b98 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Remove doesAutoCorrectValidWord()." into lmp-dev

parents d624091a 5b69472d

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ class Scoring { 
            DicNode *const terminals, const int size) const = 0;

    virtual float getDoubleLetterDemotionDistanceCost(

            const DicNode *const terminalDicNode) const = 0;

    virtual bool doesAutoCorrectValidWord() const = 0;

    virtual bool autoCorrectsToMultiWordSuggestionIfTop() const = 0;

    virtual bool sameAsTyped(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode) const = 0;

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

+2 −8
Original line number Diff line number Diff line
@@ -117,8 +117,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16; 
    const int finalScore = scoringPolicy->calculateFinalScore(

            compoundDistance, traverseSession->getInputSize(),

            terminalDicNode->getContainedErrorTypes(),

            (forceCommitMultiWords && terminalDicNode->hasMultipleWords())

                     || (isValidWord && scoringPolicy->doesAutoCorrectValidWord()),

            (forceCommitMultiWords && terminalDicNode->hasMultipleWords()),

            boostExactMatches);



    // Don't output invalid or blocked offensive words. However, we still need to submit their
@@ -145,12 +144,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16; 
                traverseSession->getDictionaryStructurePolicy()

                        ->getShortcutPositionOfPtNode(terminalDicNode->getPtNodePos()));

        const bool sameAsTyped = scoringPolicy->sameAsTyped(traverseSession, terminalDicNode);

        const int shortcutBaseScore = scoringPolicy->doesAutoCorrectValidWord() ?

                 scoringPolicy->calculateFinalScore(compoundDistance,

                         traverseSession->getInputSize(),

                         terminalDicNode->getContainedErrorTypes(),

                         true /* forceCommit */, boostExactMatches) : finalScore;

        outputShortcuts(&shortcutIt, shortcutBaseScore, sameAsTyped, outSuggestionResults);

        outputShortcuts(&shortcutIt, finalScore, sameAsTyped, outSuggestionResults);

    }

}

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

+0 −4
Original line number Diff line number Diff line
@@ -69,10 +69,6 @@ class TypingScoring : public Scoring { 
        return 0.0f;

    }



    AK_FORCE_INLINE bool doesAutoCorrectValidWord() const {

        return false;

    }



    AK_FORCE_INLINE bool autoCorrectsToMultiWordSuggestionIfTop() const {

        return true;

    }