nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 2f34f0d1: Merge "Remove entry from language model dict content." 

* commit '2f34f0d1a8fea3517fa5656f88593885fa51d362':
  Remove entry from language model dict content.
main
Keisuke Kuroyanagi 2014-08-18 06:04:30 +00:00 committed by Android Git Automerger
parent e862c154c6 2f34f0d1a8
commit 01e9fb5d9d
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,12 +45,15 @@ ProbabilityEntry LanguageModelDictContent::getNgramProbabilityEntry(
} }
bool LanguageModelDictContent::setNgramProbabilityEntry(const WordIdArrayView prevWordIds, 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); const int bitmapEntryIndex = createAndGetBitmapEntryIndex(prevWordIds);
if (bitmapEntryIndex == TrieMap::INVALID_INDEX) { if (bitmapEntryIndex == TrieMap::INVALID_INDEX) {
return false; return false;
} }
return mTrieMap.put(terminalId, probabilityEntry->encode(mHasHistoricalInfo), bitmapEntryIndex); return mTrieMap.put(wordId, probabilityEntry->encode(mHasHistoricalInfo), bitmapEntryIndex);
} }
bool LanguageModelDictContent::removeNgramProbabilityEntry(const WordIdArrayView prevWordIds, bool LanguageModelDictContent::removeNgramProbabilityEntry(const WordIdArrayView prevWordIds,

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

@ -255,6 +255,14 @@ bool Ver4PatriciaTrieNodeWriter::addNgramEntry(const WordIdArrayView prevWordIds
bool Ver4PatriciaTrieNodeWriter::removeNgramEntry(const WordIdArrayView prevWordIds, bool Ver4PatriciaTrieNodeWriter::removeNgramEntry(const WordIdArrayView prevWordIds,
const int wordId) { 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. // TODO: Remove.
return mBigramPolicy->removeEntry(prevWordIds[0], wordId); return mBigramPolicy->removeEntry(prevWordIds[0], wordId);
} }

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

@ -263,6 +263,11 @@ bool Ver4PatriciaTriePolicy::removeUnigramEntry(const int *const word, const int
AKLOGE("Cannot remove unigram. ptNodePos: %d", ptNodePos); AKLOGE("Cannot remove unigram. ptNodePos: %d", ptNodePos);
return false; return false;
} }
if (!mBuffers->getMutableLanguageModelDictContent()->removeProbabilityEntry(
ptNodeParams.getTerminalId())) {
// TODO: Uncomment.
// return false;
}
if (!ptNodeParams.representsNonWordInfo()) { if (!ptNodeParams.representsNonWordInfo()) {
mUnigramCount--; mUnigramCount--;
} }