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

Commit 94e4cd25 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Use word id to get code ponits of the word. 

Bug: 14425059
Change-Id: I81accffcdf5abe447c33ffc3a8e8315f9a4cde7f
parent ac983b13

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

+4 −4
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ Dictionary::NgramListenerForPrediction::NgramListenerForPrediction( 
      mDictStructurePolicy(dictStructurePolicy) {}



void Dictionary::NgramListenerForPrediction::onVisitEntry(const int ngramProbability,

        const int targetPtNodePos) {

    if (targetPtNodePos == NOT_A_DICT_POS) {

        const int targetWordId) {

    if (targetWordId == NOT_A_WORD_ID) {

        return;

    }

    if (mPrevWordsInfo->isNthPrevWordBeginningOfSentence(1 /* n */)
@@ -78,8 +78,8 @@ void Dictionary::NgramListenerForPrediction::onVisitEntry(const int ngramProbabi 
    int targetWordCodePoints[MAX_WORD_LENGTH];

    int unigramProbability = 0;

    const int codePointCount = mDictStructurePolicy->

            getCodePointsAndProbabilityAndReturnCodePointCount(targetPtNodePos,

                    MAX_WORD_LENGTH, targetWordCodePoints, &unigramProbability);

            getCodePointsAndProbabilityAndReturnCodePointCount(targetWordId, MAX_WORD_LENGTH,

                    targetWordCodePoints, &unigramProbability);

    if (codePointCount <= 0) {

        return;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ class Dictionary { 
        NgramListenerForPrediction(const PrevWordsInfo *const prevWordsInfo,

                SuggestionResults *const suggestionResults,

                const DictionaryStructureWithBufferPolicy *const dictStructurePolicy);

        virtual void onVisitEntry(const int ngramProbability, const int targetPtNodePos);

        virtual void onVisitEntry(const int ngramProbability, const int targetWordId);



     private:

        DISALLOW_IMPLICIT_CONSTRUCTORS(NgramListenerForPrediction);

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class DictionaryStructureWithBufferPolicy { 
            DicNodeVector *const childDicNodes) const = 0;



    virtual int getCodePointsAndProbabilityAndReturnCodePointCount(

            const int ptNodePos, const int maxCodePointCount, int *const outCodePoints,

            const int wordId, const int maxCodePointCount, int *const outCodePoints,

            int *const outUnigramProbability) const = 0;



    virtual int getWordId(const CodePointArrayView wordCodePoints,

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

+6 −4
Original line number Diff line number Diff line
@@ -91,9 +91,10 @@ void Ver4PatriciaTriePolicy::createAndGetAllChildDicNodes(const DicNode *const d 
}



int Ver4PatriciaTriePolicy::getCodePointsAndProbabilityAndReturnCodePointCount(

        const int ptNodePos, const int maxCodePointCount, int *const outCodePoints,

        const int wordId, const int maxCodePointCount, int *const outCodePoints,

        int *const outUnigramProbability) const {

    DynamicPtReadingHelper readingHelper(&mNodeReader, &mPtNodeArrayReader);

    const int ptNodePos = getTerminalPtNodePosFromWordId(wordId);

    readingHelper.initWithPtNodePos(ptNodePos);

    const int codePointCount =  readingHelper.getCodePointsAndProbabilityAndReturnCodePointCount(

            maxCodePointCount, outCodePoints, outUnigramProbability);
@@ -492,8 +493,8 @@ const WordProperty Ver4PatriciaTriePolicy::getWordProperty( 
            // Word (unigram) probability

            int word1Probability = NOT_A_PROBABILITY;

            const int codePointCount = getCodePointsAndProbabilityAndReturnCodePointCount(

                    word1TerminalPtNodePos, MAX_WORD_LENGTH, bigramWord1CodePoints,

                    &word1Probability);

                    getWordIdFromTerminalPtNodePos(word1TerminalPtNodePos), MAX_WORD_LENGTH,

                    bigramWord1CodePoints, &word1Probability);

            const std::vector<int> word1(bigramWord1CodePoints,

                    bigramWord1CodePoints + codePointCount);

            const HistoricalInfo *const historicalInfo = bigramEntry.getHistoricalInfo();
@@ -550,7 +551,8 @@ int Ver4PatriciaTriePolicy::getNextWordAndNextToken(const int token, int *const 
    const int terminalPtNodePos = mTerminalPtNodePositionsForIteratingWords[token];

    int unigramProbability = NOT_A_PROBABILITY;

    *outCodePointCount = getCodePointsAndProbabilityAndReturnCodePointCount(

            terminalPtNodePos, MAX_WORD_LENGTH, outCodePoints, &unigramProbability);

            getWordIdFromTerminalPtNodePos(terminalPtNodePos), MAX_WORD_LENGTH, outCodePoints,

            &unigramProbability);

    const int nextToken = token + 1;

    if (nextToken >= terminalPtNodePositionsVectorSize) {

        // All words have been iterated.

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

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ class Ver4PatriciaTriePolicy : public DictionaryStructureWithBufferPolicy { 
            DicNodeVector *const childDicNodes) const;



    int getCodePointsAndProbabilityAndReturnCodePointCount(

            const int terminalPtNodePos, const int maxCodePointCount, int *const outCodePoints,

            const int wordId, const int maxCodePointCount, int *const outCodePoints,

            int *const outUnigramProbability) const;



    int getWordId(const CodePointArrayView wordCodePoints, const bool forceLowerCaseSearch) const;