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

Commit 6bfeeb86 authored by Keisuke Kuroynagi's avatar Keisuke Kuroynagi
Browse files

Support multi words input for gesture. 

Bug: 8591918

Change-Id: I344f936907a385cc6c3c8a2215a6603938483401
parent 14718ab8

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

+6 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class DicNode { 
    void initAsRootWithPreviousWord(DicNode *dicNode, const int pos, const int childrenPos,

            const int childrenCount) {

        mIsUsed = true;

        mIsCachedForNextSuggestion = false;

        mIsCachedForNextSuggestion = dicNode->mIsCachedForNextSuggestion;

        mDicNodeProperties.init(

                pos, 0, childrenPos, 0, 0, 0, childrenCount, 0, 0, false, false, true, 0, 0);

        // TODO: Move to dicNodeState?
@@ -479,6 +479,11 @@ class DicNode { 
        return mDicNodeProperties.getDepth();

    }



    // "Length" includes spaces.

    inline uint16_t getTotalLength() const {

        return getDepth() + mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength();

    }



    AK_FORCE_INLINE void dump(const char *tag) const {

#if DEBUG_DICT

        DUMP_WORD_AND_SCORE(tag);

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

+5 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n 
        // only used for typing

        return weighting->getSubstitutionCost();

    case CT_NEW_WORD_SPACE_OMITTION:

        return weighting->getNewWordCost(traverseSession, dicNode);

        return weighting->getNewWordSpatialCost(traverseSession, dicNode, inputStateG);

    case CT_MATCH:

        return weighting->getMatchedCost(traverseSession, dicNode, inputStateG);

    case CT_COMPLETION:
@@ -134,7 +134,8 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n 
    case CT_SUBSTITUTION:

        return 0.0f;

    case CT_NEW_WORD_SPACE_OMITTION:

        return weighting->getNewWordBigramCost(traverseSession, parentDicNode, multiBigramMap);

        return weighting->getNewWordBigramLanguageCost(

                traverseSession, parentDicNode, multiBigramMap);

    case CT_MATCH:

        return 0.0f;

    case CT_COMPLETION:
@@ -146,7 +147,8 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n 
        return weighting->getTerminalLanguageCost(traverseSession, dicNode, languageImprobability);

    }

    case CT_NEW_WORD_SPACE_SUBSTITUTION:

        return weighting->getNewWordBigramCost(traverseSession, parentDicNode, multiBigramMap);

        return weighting->getNewWordBigramLanguageCost(

                traverseSession, parentDicNode, multiBigramMap);

    case CT_INSERTION:

        return 0.0f;

    case CT_TRANSPOSITION:

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

+3 −3
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ class Weighting { 
            const DicTraverseSession *const traverseSession,

            const DicNode *const parentDicNode, const DicNode *const dicNode) const = 0;



    virtual float getNewWordCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode) const = 0;

    virtual float getNewWordSpatialCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode, DicNode_InputStateG *const inputStateG) const = 0;



    virtual float getNewWordBigramCost(

    virtual float getNewWordBigramLanguageCost(

            const DicTraverseSession *const traverseSession, const DicNode *const dicNode,

            MultiBigramMap *const multiBigramMap) const = 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -138,12 +138,12 @@ class TypingWeighting : public Weighting { 
        return cost + weightedDistance;

    }



    float getNewWordCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode) const {

    float getNewWordSpatialCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode, DicNode_InputStateG *inputStateG) const {

        return ScoringParams::COST_NEW_WORD * traverseSession->getMultiWordCostMultiplier();

    }



    float getNewWordBigramCost(const DicTraverseSession *const traverseSession,

    float getNewWordBigramLanguageCost(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode,

            MultiBigramMap *const multiBigramMap) const {

        return DicNodeUtils::getBigramNodeImprobability(traverseSession->getBinaryDictionaryInfo(),