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

Commit b67d5e91 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Rename parameters for future change"

parents ac7eea86 0584f02e

native/src/unigram_dictionary.cpp

+16 −6
Original line number Diff line number Diff line
@@ -897,9 +897,9 @@ bool UnigramDictionary::getSplitTwoWordsSuggestion(const int inputLength, 
    return true;

}



inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth,

        const int maxDepth, const bool traverseAllNodes, int matchWeight, int inputIndex,

        const int diffs, const int skipPos, const int excessivePos, const int transposedPos,

inline bool UnigramDictionary::processCurrentNode(const int initialPos, const int initialDepth,

        const int maxDepth, const bool initialTraverseAllNodes, int matchWeight, int inputIndex,

        const int initialDiffs, const int skipPos, const int excessivePos, const int transposedPos,

        int *nextLetters, const int nextLettersSize, int *newCount, int *newChildPosition,

        bool *newTraverseAllNodes, int *newMatchRate, int *newInputIndex, int *newDiffs,

        int *nextSiblingPosition, int *nextOutputIndex) {
@@ -916,6 +916,11 @@ inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth 
    int freq;

    bool isSameAsUserTypedLength = false;



    const int pos = initialPos;

    const int depth = initialDepth;

    const int traverseAllNodes = initialTraverseAllNodes;

    const int diffs = initialDiffs;



    const uint8_t flags = 0; // No flags for now



    if (excessivePos == depth && inputIndex < mInputLength - 1) ++inputIndex;
@@ -1028,9 +1033,9 @@ bool UnigramDictionary::getSplitTwoWordsSuggestion(const int inputLength, 
    return true;

}



inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth,

        const int maxDepth, const bool traverseAllNodes, int matchWeight, int inputIndex,

        const int diffs, const int skipPos, const int excessivePos, const int transposedPos,

inline bool UnigramDictionary::processCurrentNode(const int initialPos, const int initialDepth,

        const int maxDepth, const bool initialTraverseAllNodes, int matchWeight, int inputIndex,

        const int initialDiffs, const int skipPos, const int excessivePos, const int transposedPos,

        int *nextLetters, const int nextLettersSize, int *newCount, int *newChildPosition,

        bool *newTraverseAllNodes, int *newMatchRate, int *newInputIndex, int *newDiffs,

        int *nextSiblingPosition, int *newOutputIndex) {
@@ -1047,6 +1052,11 @@ inline bool UnigramDictionary::processCurrentNode(const int pos, const int depth 
    int freq;

    bool isSameAsUserTypedLength = false;



    int pos = initialPos;

    int depth = initialDepth;

    int traverseAllNodes = initialTraverseAllNodes;

    int diffs = initialDiffs;



    const uint8_t flags = 0; // No flags for now



    if (excessivePos == depth && inputIndex < mInputLength - 1) ++inputIndex;

native/src/unigram_dictionary.h

+6 −6
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ private: 
    ProximityType getMatchedProximityId(const int *currentChars, const unsigned short c,

            const int skipPos, const int excessivePos, const int transposedPos);

    // Process a node by considering proximity, missing and excessive character

    bool processCurrentNode(const int pos, const int depth,

            const int maxDepth, const bool traverseAllNodes, const int snr, int inputIndex,

            const int diffs, const int skipPos, const int excessivePos, const int transposedPos,

            int *nextLetters, const int nextLettersSize, int *newCount, int *newChildPosition,

            bool *newTraverseAllNodes, int *newSnr, int*newInputIndex, int *newDiffs,

            int *nextSiblingPosition, int *nextOutputIndex);

    bool processCurrentNode(const int initialPos, const int initialDepth,

            const int maxDepth, const bool initialTraverseAllNodes, const int snr, int inputIndex,

            const int initialDiffs, const int skipPos, const int excessivePos,

            const int transposedPos, int *nextLetters, const int nextLettersSize, int *newCount,

            int *newChildPosition, bool *newTraverseAllNodes, int *newSnr, int*newInputIndex,

            int *newDiffs, int *nextSiblingPosition, int *nextOutputIndex);

    bool existsAdjacentProximityChars(const int inputIndex, const int inputLength) const;

    inline const int* getInputCharsAt(const int index) const {

        return mInputCodes + (index * MAX_PROXIMITY_CHARS);