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

Commit a0ea92f7 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Remove mPartiallyCommited. 

Bug: 13333066

Change-Id: I4e3aa31aa501866c23cc4b86093b866306161bfd
parent 452cd2f6

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

+3 −8
Original line number Diff line number Diff line
@@ -52,14 +52,9 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16; 
    // Force autocorrection for obvious long multi-word suggestions when the top suggestion is

    // a long multiple words suggestion.

    // TODO: Implement a smarter auto-commit method for handling multi-word suggestions.

    // traverseSession->isPartiallyCommited() always returns false because we never auto partial

    // commit for now.

    const bool forceCommitMultiWords = (terminalSize > 0) ?

            scoringPolicy->autoCorrectsToMultiWordSuggestionIfTop()

                    && (traverseSession->isPartiallyCommited()

                            || (traverseSession->getInputSize()

                                    >= MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT

                                            && terminals[0].hasMultipleWords())) : false;

    const bool forceCommitMultiWords = scoringPolicy->autoCorrectsToMultiWordSuggestionIfTop()

            && (traverseSession->getInputSize() >= MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT

                    && terminals[0].hasMultipleWords());

    // TODO: have partial commit work even with multiple pointers.

    const bool outputSecondWordFirstLetterInputIndex =

            traverseSession->isOnlyOnePointerUsed(0 /* pointerId */);

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

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ void DicTraverseSession::resetCache(const int thresholdForNextActiveDicNodes, co 
    mDicNodesCache.reset(thresholdForNextActiveDicNodes /* nextActiveSize */,

            maxWords /* terminalSize */);

    mMultiBigramMap.clear();

    mPartiallyCommited = false;

}



void DicTraverseSession::initializeProximityInfoStates(const int *const inputCodePoints,

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

+1 −4
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class DicTraverseSession { 
    AK_FORCE_INLINE DicTraverseSession(JNIEnv *env, jstring localeStr, bool usesLargeCache)

            : mPrevWordPtNodePos(NOT_A_DICT_POS), mProximityInfo(nullptr),

              mDictionary(nullptr), mSuggestOptions(nullptr), mDicNodesCache(usesLargeCache),

              mMultiBigramMap(), mInputSize(0), mPartiallyCommited(false), mMaxPointerCount(1),

              mMultiBigramMap(), mInputSize(0), mMaxPointerCount(1),

              mMultiWordCostMultiplier(1.0f) {

        // NOTE: mProximityInfoStates is an array of instances.

        // No need to initialize it explicitly here.
@@ -95,8 +95,6 @@ class DicTraverseSession { 
        return &mProximityInfoStates[id];

    }

    int getInputSize() const { return mInputSize; }

    void setPartiallyCommited() { mPartiallyCommited = true; }

    bool isPartiallyCommited() const { return mPartiallyCommited; }



    bool isOnlyOnePointerUsed(int *pointerId) const {

        // Not in the dictionary word
@@ -188,7 +186,6 @@ class DicTraverseSession { 
    ProximityInfoState mProximityInfoStates[MAX_POINTER_COUNT_G];



    int mInputSize;

    bool mPartiallyCommited;

    int mMaxPointerCount;



    /////////////////////////////////