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

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

Merge "Fix: "saomething" -> "something"."

parents 9d313c6c cb4a7c1d

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

+4 −4
Original line number Diff line number Diff line
@@ -328,12 +328,12 @@ class DicNode { 
        return mDicNodeState.mDicNodeStatePrevWord.getPrevWordCount() > 0;

    }



    float getProximityCorrectionCount() const {

        return static_cast<float>(mDicNodeState.mDicNodeStateScoring.getProximityCorrectionCount());

    int getProximityCorrectionCount() const {

        return mDicNodeState.mDicNodeStateScoring.getProximityCorrectionCount();

    }



    float getEditCorrectionCount() const {

        return static_cast<float>(mDicNodeState.mDicNodeStateScoring.getEditCorrectionCount());

    int getEditCorrectionCount() const {

        return mDicNodeState.mDicNodeStateScoring.getEditCorrectionCount();

    }



    // Used to prune nodes

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

+11 −9
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ const float ScoringParams::MAX_SPATIAL_DISTANCE = 1.0f; 
const int ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY = 40;

const int ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY_FOR_CAPPED = 120;

const float ScoringParams::AUTOCORRECT_OUTPUT_THRESHOLD = 1.0f;

const int ScoringParams::MAX_CACHE_DIC_NODE_SIZE = 125;

// TODO: Unlimit max cache dic node size

const int ScoringParams::MAX_CACHE_DIC_NODE_SIZE = 170;

const int ScoringParams::THRESHOLD_SHORT_WORD_LENGTH = 4;



const float ScoringParams::DISTANCE_WEIGHT_LENGTH = 0.132f;

const float ScoringParams::PROXIMITY_COST = 0.086f;

const float ScoringParams::FIRST_PROXIMITY_COST = 0.104f;

const float ScoringParams::PROXIMITY_COST = 0.095f;

const float ScoringParams::FIRST_CHAR_PROXIMITY_COST = 0.102f;

const float ScoringParams::FIRST_PROXIMITY_COST = 0.019f;

const float ScoringParams::OMISSION_COST = 0.458f;

const float ScoringParams::OMISSION_COST_SAME_CHAR = 0.491f;

const float ScoringParams::OMISSION_COST_FIRST_CHAR = 0.582f;
@@ -35,19 +37,19 @@ const float ScoringParams::INSERTION_COST = 0.730f; 
const float ScoringParams::INSERTION_COST_SAME_CHAR = 0.586f;

const float ScoringParams::INSERTION_COST_PROXIMITY_CHAR = 0.70f;

const float ScoringParams::INSERTION_COST_FIRST_CHAR = 0.623f;

const float ScoringParams::TRANSPOSITION_COST = 0.516f;

const float ScoringParams::TRANSPOSITION_COST = 0.526f;

const float ScoringParams::SPACE_SUBSTITUTION_COST = 0.319f;

const float ScoringParams::ADDITIONAL_PROXIMITY_COST = 0.380f;

const float ScoringParams::SUBSTITUTION_COST = 0.403f;

const float ScoringParams::SUBSTITUTION_COST = 0.383f;

const float ScoringParams::COST_NEW_WORD = 0.042f;

const float ScoringParams::COST_SECOND_OR_LATER_WORD_FIRST_CHAR_UPPERCASE = 0.25f;

const float ScoringParams::DISTANCE_WEIGHT_LANGUAGE = 1.123f;

const float ScoringParams::COST_FIRST_LOOKAHEAD = 0.545f;

const float ScoringParams::COST_LOOKAHEAD = 0.073f;

const float ScoringParams::HAS_PROXIMITY_TERMINAL_COST = 0.105f;

const float ScoringParams::HAS_EDIT_CORRECTION_TERMINAL_COST = 0.038f;

const float ScoringParams::HAS_MULTI_WORD_TERMINAL_COST = 0.444f;

const float ScoringParams::HAS_PROXIMITY_TERMINAL_COST = 0.093f;

const float ScoringParams::HAS_EDIT_CORRECTION_TERMINAL_COST = 0.041f;

const float ScoringParams::HAS_MULTI_WORD_TERMINAL_COST = 0.447f;

const float ScoringParams::TYPING_BASE_OUTPUT_SCORE = 1.0f;

const float ScoringParams::TYPING_MAX_OUTPUT_SCORE_PER_INPUT = 0.1f;

const float ScoringParams::NORMALIZED_SPATIAL_DISTANCE_THRESHOLD_FOR_EDIT = 0.06f;

const float ScoringParams::NORMALIZED_SPATIAL_DISTANCE_THRESHOLD_FOR_EDIT = 0.045f;

} // namespace latinime

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ class ScoringParams { 
    // TODO: explore optimization of gesture parameters.

    static const float DISTANCE_WEIGHT_LENGTH;

    static const float PROXIMITY_COST;

    static const float FIRST_CHAR_PROXIMITY_COST;

    static const float FIRST_PROXIMITY_COST;

    static const float OMISSION_COST;

    static const float OMISSION_COST_SAME_CHAR;

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

+4 −1
Original line number Diff line number Diff line
@@ -81,8 +81,11 @@ class TypingWeighting : public Weighting { 


        const bool isFirstChar = pointIndex == 0;

        const bool isProximity = isProximityDicNode(traverseSession, dicNode);

        float cost = isProximity ? (isFirstChar ? ScoringParams::FIRST_PROXIMITY_COST

        float cost = isProximity ? (isFirstChar ? ScoringParams::FIRST_CHAR_PROXIMITY_COST

                : ScoringParams::PROXIMITY_COST) : 0.0f;

        if (isProximity && dicNode->getProximityCorrectionCount() == 0) {

            cost += ScoringParams::FIRST_PROXIMITY_COST;

        }

        if (dicNode->getNodeCodePointCount() == 2) {

            // At the second character of the current word, we check if the first char is uppercase

            // and the word is a second or later word of a multiple word suggestion. We demote it