diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-03-11 02:39:49 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 02:39:49 -0700 |
| commit | a1f84c32b42b949393296c1bf90a67e27dbd7f63 (patch) | |
| tree | 5fd68d7d25a43c079f761bd8c2bfbfa1a06f045e | |
| parent | a242d7593baaffdc2f2d626e38300b22a5afc300 (diff) | |
| parent | ed72a768d69fad7744587001e0b82913e22dd714 (diff) | |
| download | latinime-a1f84c32b42b949393296c1bf90a67e27dbd7f63.tar.gz latinime-a1f84c32b42b949393296c1bf90a67e27dbd7f63.tar.xz latinime-a1f84c32b42b949393296c1bf90a67e27dbd7f63.zip | |
am ed72a768: Merge "Make getWordProperty return reconstructed bigram probability."
* commit 'ed72a768d69fad7744587001e0b82913e22dd714':
Make getWordProperty return reconstructed bigram probability.
| -rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp | 3 | ||||
| -rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp index 84a6ccf33..5b2402d65 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp @@ -354,7 +354,8 @@ const WordProperty PatriciaTriePolicy::getWordProperty(const int *const codePoin &word1Probability); std::vector<int> word1(bigramWord1CodePoints, bigramWord1CodePoints + word1CodePointCount); - bigrams.push_back(WordProperty::BigramProperty(&word1, bigramsIt.getProbability(), + const int probability = getProbability(word1Probability, bigramsIt.getProbability()); + bigrams.push_back(WordProperty::BigramProperty(&word1, probability, NOT_A_TIMESTAMP /* timestamp */, 0 /* level */, 0 /* count */)); } } diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp index 1a38a27ff..88ef7a8df 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp @@ -388,7 +388,7 @@ const WordProperty Ver4PatriciaTriePolicy::getWordProperty(const int *const code const int probability = bigramEntry.hasHistoricalInfo() ? ForgettingCurveUtils::decodeProbability( bigramEntry.getHistoricalInfo(), mHeaderPolicy) : - bigramEntry.getProbability(); + getProbability(word1Probability, bigramEntry.getProbability()); bigrams.push_back(WordProperty::BigramProperty(&word1, probability, historicalInfo->getTimeStamp(), historicalInfo->getLevel(), historicalInfo->getCount())); |