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

Commit 179f38cc authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Change getUnigramProbabilityOfPtNode to getProbabilityOfPtNode()" into lmp-dev

parents 76ad2597 96d47fe7

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

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int Dictionary::getProbability(const int *word, int length) const { 
    if (NOT_A_DICT_POS == pos) {

        return NOT_A_PROBABILITY;

    }

    return getDictionaryStructurePolicy()->getUnigramProbabilityOfPtNode(pos);

    return getDictionaryStructurePolicy()->getProbabilityOfPtNode(nullptr /* prevWordsInfo */, pos);

}



int Dictionary::getMaxProbabilityOfExactMatches(const int *word, int length) const {
@@ -116,8 +116,8 @@ int Dictionary::getNgramProbability(const PrevWordsInfo *const prevWordsInfo, co 
        if (bigramsIt.getBigramPos() == nextWordPos

                && bigramsIt.getProbability() != NOT_A_PROBABILITY) {

            return mDictionaryStructureWithBufferPolicy->getProbability(

                    mDictionaryStructureWithBufferPolicy->getUnigramProbabilityOfPtNode(

                            nextWordPos), bigramsIt.getProbability());

                    mDictionaryStructureWithBufferPolicy->getProbabilityOfPtNode(

                            nullptr /* prevWordsInfo */, nextWordPos), bigramsIt.getProbability());

        }

    }

    return NOT_A_PROBABILITY;

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

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ class DictionaryStructureWithBufferPolicy { 
    virtual int getProbability(const int unigramProbability,

            const int bigramProbability) const = 0;



    virtual int getUnigramProbabilityOfPtNode(const int nodePos) const = 0;

    virtual int getProbabilityOfPtNode(const PrevWordsInfo *const prevWordsInfo,

            const int nodePos) const = 0;



    virtual int getShortcutPositionOfPtNode(const int nodePos) const = 0;

native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ int Ver4PatriciaTriePolicy::getProbability(const int unigramProbability, 
    }

}



int Ver4PatriciaTriePolicy::getUnigramProbabilityOfPtNode(const int ptNodePos) const {

int Ver4PatriciaTriePolicy::getProbabilityOfPtNode(const PrevWordsInfo *const prevWordsInfo,

        const int ptNodePos) const {

    if (ptNodePos == NOT_A_DICT_POS) {

        return NOT_A_PROBABILITY;

    }

native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ class Ver4PatriciaTriePolicy : public DictionaryStructureWithBufferPolicy { 


    int getProbability(const int unigramProbability, const int bigramProbability) const;



    int getUnigramProbabilityOfPtNode(const int ptNodePos) const;

    int getProbabilityOfPtNode(const PrevWordsInfo *const prevWordsInfo,

            const int ptNodePos) const;



    int getShortcutPositionOfPtNode(const int ptNodePos) const;

native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp

+6 −1
Original line number Diff line number Diff line
@@ -295,7 +295,12 @@ int PatriciaTriePolicy::getProbability(const int unigramProbability, 
    }

}



int PatriciaTriePolicy::getUnigramProbabilityOfPtNode(const int ptNodePos) const {

int PatriciaTriePolicy::getProbabilityOfPtNode(const PrevWordsInfo *const prevWordsInfo,

        const int ptNodePos) const {

    if (prevWordsInfo) {

        // TODO: Return probability using prevWordsInfo.

        return NOT_A_PROBABILITY;

    }

    if (ptNodePos == NOT_A_DICT_POS) {

        return NOT_A_PROBABILITY;

    }