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

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

Merge "Remove entry from language model dict content."

parents 1ccb9e5e d3097c67

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp

+5 −2
Original line number Diff line number Diff line
@@ -45,12 +45,15 @@ ProbabilityEntry LanguageModelDictContent::getNgramProbabilityEntry( 
}



bool LanguageModelDictContent::setNgramProbabilityEntry(const WordIdArrayView prevWordIds,

        const int terminalId, const ProbabilityEntry *const probabilityEntry) {

        const int wordId, const ProbabilityEntry *const probabilityEntry) {

    if (wordId == Ver4DictConstants::NOT_A_TERMINAL_ID) {

        return false;

    }

    const int bitmapEntryIndex = createAndGetBitmapEntryIndex(prevWordIds);

    if (bitmapEntryIndex == TrieMap::INVALID_INDEX) {

        return false;

    }

    return mTrieMap.put(terminalId, probabilityEntry->encode(mHasHistoricalInfo), bitmapEntryIndex);

    return mTrieMap.put(wordId, probabilityEntry->encode(mHasHistoricalInfo), bitmapEntryIndex);

}



bool LanguageModelDictContent::removeNgramProbabilityEntry(const WordIdArrayView prevWordIds,

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

+8 −0
Original line number Diff line number Diff line
@@ -255,6 +255,14 @@ bool Ver4PatriciaTrieNodeWriter::addNgramEntry(const WordIdArrayView prevWordIds 


bool Ver4PatriciaTrieNodeWriter::removeNgramEntry(const WordIdArrayView prevWordIds,

        const int wordId) {

    // TODO: Support n-gram.

    LanguageModelDictContent *const languageModelDictContent =

            mBuffers->getMutableLanguageModelDictContent();

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

            wordId)) {

        // TODO: Uncomment.

        // return false;

    }

    // TODO: Remove.

    return mBigramPolicy->removeEntry(prevWordIds[0], wordId);

}

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

+5 −0
Original line number Diff line number Diff line
@@ -263,6 +263,11 @@ bool Ver4PatriciaTriePolicy::removeUnigramEntry(const int *const word, const int 
        AKLOGE("Cannot remove unigram. ptNodePos: %d", ptNodePos);

        return false;

    }

    if (!mBuffers->getMutableLanguageModelDictContent()->removeProbabilityEntry(

            ptNodeParams.getTerminalId())) {

        // TODO: Uncomment.

        // return false;

    }

    if (!ptNodeParams.representsNonWordInfo()) {

        mUnigramCount--;

    }