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

Commit 372ca14d authored by Adrian Velicu's avatar Adrian Velicu Committed by Android (Google) Code Review
Browse files

Merge "Further fixes to treat 0-frequency words"

parents 652b655e 009e02ce

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

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ const ErrorTypeUtils::ErrorType ErrorTypeUtils::NEW_WORD = 0x100; 


const ErrorTypeUtils::ErrorType ErrorTypeUtils::ERRORS_TREATED_AS_AN_EXACT_MATCH =

        NOT_AN_ERROR | MATCH_WITH_WRONG_CASE | MATCH_WITH_MISSING_ACCENT | MATCH_WITH_DIGRAPH;

const ErrorTypeUtils::ErrorType ErrorTypeUtils::ERRORS_TREATED_AS_A_PERFECT_MATCH = NOT_AN_ERROR;



const ErrorTypeUtils::ErrorType

        ErrorTypeUtils::ERRORS_TREATED_AS_AN_EXACT_MATCH_WITH_INTENTIONAL_OMISSION =

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

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ class ErrorTypeUtils { 
        return (containedErrorTypes & ~ERRORS_TREATED_AS_AN_EXACT_MATCH) == 0;

    }



    static bool isPerfectMatch(const ErrorType containedErrorTypes) {

        return (containedErrorTypes & ~ERRORS_TREATED_AS_A_PERFECT_MATCH) == 0;

    }



    static bool isExactMatchWithIntentionalOmission(const ErrorType containedErrorTypes) {

        return (containedErrorTypes

                & ~ERRORS_TREATED_AS_AN_EXACT_MATCH_WITH_INTENTIONAL_OMISSION) == 0;
@@ -73,6 +77,7 @@ class ErrorTypeUtils { 
    DISALLOW_IMPLICIT_CONSTRUCTORS(ErrorTypeUtils);



    static const ErrorType ERRORS_TREATED_AS_AN_EXACT_MATCH;

    static const ErrorType ERRORS_TREATED_AS_A_PERFECT_MATCH;

    static const ErrorType ERRORS_TREATED_AS_AN_EXACT_MATCH_WITH_INTENTIONAL_OMISSION;

};

} // namespace latinime

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class Scoring { 
 public:

    virtual int calculateFinalScore(const float compoundDistance, const int inputSize,

            const ErrorTypeUtils::ErrorType containedErrorTypes, const bool forceCommit,

            const bool boostExactMatches) const = 0;

            const bool boostExactMatches, const bool hasProbabilityZero) const = 0;

    virtual void getMostProbableString(const DicTraverseSession *const traverseSession,

            const float weightOfLangModelVsSpatialModel,

            SuggestionResults *const outSuggestionResults) const = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16; 
            compoundDistance, traverseSession->getInputSize(),

            terminalDicNode->getContainedErrorTypes(),

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

            boostExactMatches);

            boostExactMatches, wordAttributes.getProbability() == 0);



    // Don't output invalid or blocked offensive words. However, we still need to submit their

    // shortcuts if any.

native/jni/src/suggest/policyimpl/typing/scoring_params.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ const int ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY_FOR_CAPPED = 120; 
const float ScoringParams::AUTOCORRECT_OUTPUT_THRESHOLD = 1.0f;



const float ScoringParams::EXACT_MATCH_PROMOTION = 1.1f;

const float ScoringParams::PERFECT_MATCH_PROMOTION = 1.1f;

const float ScoringParams::CASE_ERROR_PENALTY_FOR_EXACT_MATCH = 0.01f;

const float ScoringParams::ACCENT_ERROR_PENALTY_FOR_EXACT_MATCH = 0.02f;

const float ScoringParams::DIGRAPH_PENALTY_FOR_EXACT_MATCH = 0.03f;