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

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

Use word id to get shortcut iterator. 

Bug: 14425059
Change-Id: I1b35a139bd29f70b328cbc82648783b99f633d72
parent 847a026c

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class DictionaryStructureWithBufferPolicy { 
    virtual void iterateNgramEntries(const int *const prevWordIds,

            NgramListener *const listener) const = 0;



    virtual BinaryDictionaryShortcutIterator getShortcutIterator(const int ptNodePos) const = 0;

    virtual BinaryDictionaryShortcutIterator getShortcutIterator(const int wordId) const = 0;



    virtual const DictionaryHeaderStructurePolicy *getHeaderStructurePolicy() const = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16; 
    if (!terminalDicNode->hasMultipleWords()) {

        BinaryDictionaryShortcutIterator shortcutIt =

                traverseSession->getDictionaryStructurePolicy()->getShortcutIterator(

                        terminalDicNode->getPtNodePos());

                        terminalDicNode->getWordId());

        const bool sameAsTyped = scoringPolicy->sameAsTyped(traverseSession, terminalDicNode);

        outputShortcuts(&shortcutIt, finalScore, sameAsTyped, outSuggestionResults);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ void Ver4PatriciaTriePolicy::iterateNgramEntries(const int *const prevWordIds, 
}



BinaryDictionaryShortcutIterator Ver4PatriciaTriePolicy::getShortcutIterator(

        const int ptNodePos) const {

    const int shortcutPos = getShortcutPositionOfPtNode(ptNodePos);

        const int wordId) const {

    const int shortcutPos = getShortcutPositionOfPtNode(getTerminalPtNodePosFromWordId(wordId));

    return BinaryDictionaryShortcutIterator(&mShortcutPolicy, shortcutPos);

}

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

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


    void iterateNgramEntries(const int *const prevWordIds, NgramListener *const listener) const;



    BinaryDictionaryShortcutIterator getShortcutIterator(const int ptNodePos) const;

    BinaryDictionaryShortcutIterator getShortcutIterator(const int wordId) const;



    const DictionaryHeaderStructurePolicy *getHeaderStructurePolicy() const {

        return mHeaderPolicy;

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

+2 −2
Original line number Diff line number Diff line
@@ -342,8 +342,8 @@ void PatriciaTriePolicy::iterateNgramEntries(const int *const prevWordIds, 
}



BinaryDictionaryShortcutIterator PatriciaTriePolicy::getShortcutIterator(

        const int ptNodePos) const {

    const int shortcutPos = getShortcutPositionOfPtNode(ptNodePos);

        const int wordId) const {

    const int shortcutPos = getShortcutPositionOfPtNode(getTerminalPtNodePosFromWordId(wordId));

    return BinaryDictionaryShortcutIterator(&mShortcutListPolicy, shortcutPos);

}