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

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

Merge "Support removing n-gram entry in structure policy."

parents 7e9869a2 5520e84e

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -232,11 +232,9 @@ bool Ver4PatriciaTrieNodeWriter::addNgramEntry(const WordIdArrayView prevWordIds 


bool Ver4PatriciaTrieNodeWriter::removeNgramEntry(const WordIdArrayView prevWordIds,

        const int wordId) {

    // TODO: Support n-gram.

    LanguageModelDictContent *const languageModelDictContent =

            mBuffers->getMutableLanguageModelDictContent();

    return languageModelDictContent->removeNgramProbabilityEntry(prevWordIds.limit(1 /* maxSize */),

            wordId);

    return languageModelDictContent->removeNgramProbabilityEntry(prevWordIds, wordId);

}



// TODO: Remove when we stop supporting v402 format.

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp

+1 −9
Original line number Diff line number Diff line
@@ -375,15 +375,7 @@ bool Ver4PatriciaTriePolicy::removeNgramEntry(const PrevWordsInfo *const prevWor 
    if (wordId == NOT_A_WORD_ID) {

        return false;

    }

    std::array<int, MAX_PREV_WORD_COUNT_FOR_N_GRAM> prevWordsPtNodePos;

    for (size_t i = 0; i < prevWordsPtNodePos.size(); ++i) {

        prevWordsPtNodePos[i] = mBuffers->getTerminalPositionLookupTable()

                ->getTerminalPtNodePosition(prevWordIds[i]);

    }

    const int wordPtNodePos = mBuffers->getTerminalPositionLookupTable()

            ->getTerminalPtNodePosition(wordId);

    if (mUpdatingHelper.removeNgramEntry(WordIdArrayView::fromArray(prevWordsPtNodePos),

            wordPtNodePos)) {

    if (mNodeWriter.removeNgramEntry(prevWordIds, wordId)) {

        mBigramCount--;

        return true;

    } else {