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

am d70b8ff2: Fix: BoS bigram from user history dictionary is too strong. 

* commit 'd70b8ff2917c027268e9bc1178b4e035164a5ca8':
  Fix: BoS bigram from user history dictionary is too strong.
main
Keisuke Kuroyanagi 2014-10-13 09:16:20 +00:00 committed by Android Git Automerger
parent c11c9d262d d70b8ff291
commit 0a0dcafa53
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,9 @@ int Ver4PatriciaTriePolicy::getProbabilityOfWord(const WordIdArrayView prevWordI
if (bigramsIt.getBigramPos() == ptNodePos if (bigramsIt.getBigramPos() == ptNodePos
&& bigramsIt.getProbability() != NOT_A_PROBABILITY) { && bigramsIt.getProbability() != NOT_A_PROBABILITY) {
const int bigramConditionalProbability = getBigramConditionalProbability( const int bigramConditionalProbability = getBigramConditionalProbability(
prevWordPtNodeParams.getProbability(), bigramsIt.getProbability()); prevWordPtNodeParams.getProbability(),
prevWordPtNodeParams.representsBeginningOfSentence(),
bigramsIt.getProbability());
return getProbability(ptNodeParams.getProbability(), bigramConditionalProbability); return getProbability(ptNodeParams.getProbability(), bigramConditionalProbability);
} }
} }
@ -209,15 +211,19 @@ void Ver4PatriciaTriePolicy::iterateNgramEntries(const WordIdArrayView prevWordI
while (bigramsIt.hasNext()) { while (bigramsIt.hasNext()) {
bigramsIt.next(); bigramsIt.next();
const int bigramConditionalProbability = getBigramConditionalProbability( const int bigramConditionalProbability = getBigramConditionalProbability(
prevWordPtNodeParams.getProbability(), bigramsIt.getProbability()); prevWordPtNodeParams.getProbability(),
prevWordPtNodeParams.representsBeginningOfSentence(), bigramsIt.getProbability());
listener->onVisitEntry(bigramConditionalProbability, listener->onVisitEntry(bigramConditionalProbability,
getWordIdFromTerminalPtNodePos(bigramsIt.getBigramPos())); getWordIdFromTerminalPtNodePos(bigramsIt.getBigramPos()));
} }
} }
int Ver4PatriciaTriePolicy::getBigramConditionalProbability(const int prevWordUnigramProbability, int Ver4PatriciaTriePolicy::getBigramConditionalProbability(const int prevWordUnigramProbability,
const int bigramProbability) const { const bool isInBeginningOfSentenceContext, const int bigramProbability) const {
if (mHeaderPolicy->hasHistoricalInfoOfWords()) { if (mHeaderPolicy->hasHistoricalInfoOfWords()) {
if (isInBeginningOfSentenceContext) {
return bigramProbability;
}
// Calculate conditional probability. // Calculate conditional probability.
return std::min(MAX_PROBABILITY - prevWordUnigramProbability + bigramProbability, return std::min(MAX_PROBABILITY - prevWordUnigramProbability + bigramProbability,
MAX_PROBABILITY); MAX_PROBABILITY);

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

@ -175,7 +175,7 @@ class Ver4PatriciaTriePolicy : public DictionaryStructureWithBufferPolicy {
const WordAttributes getWordAttributes(const int probability, const WordAttributes getWordAttributes(const int probability,
const PtNodeParams &ptNodeParams) const; const PtNodeParams &ptNodeParams) const;
int getBigramConditionalProbability(const int prevWordUnigramProbability, int getBigramConditionalProbability(const int prevWordUnigramProbability,
const int bigramProbability) const; const bool isInBeginningOfSentenceContext, const int bigramProbability) const;
}; };
} // namespace v402 } // namespace v402
} // namespace backward } // namespace backward