commit 090c3819d7d4481ebb16a220225e2106f2f1b2a2
author Keisuke Kuroyanagi <ksk@google.com> Thu Oct 23 19:26:01 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Thu Oct 23 19:26:01 2014 +0900
tree 134971c728c7bc7870f4bca04df8daaadcef62fe
parent ade5ad1dae715081e0131e9ebd266e1e36409f1d

Fix: Personalized dicts suggest invalid words with v403.

Bug: 14425059
Change-Id: I45ae00069dd3b7c461dd9a1f3558b96af0a1c975

native/jni/src/suggest/core/dicnode/dic_node_utils.cpp

diff --git a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
index 7d2898b..ea43892 100644
--- a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
+++ b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp
@@ -74,8 +74,9 @@
     }
     const WordAttributes wordAttributes = dictionaryStructurePolicy->getWordAttributesInContext(
             dicNode->getPrevWordIds(), dicNode->getWordId(), multiBigramMap);
-    if (dicNode->hasMultipleWords()
-            && (wordAttributes.isBlacklisted() || wordAttributes.isNotAWord())) {
+    if (wordAttributes.getProbability() == NOT_A_PROBABILITY
+            || (dicNode->hasMultipleWords()
+                    && (wordAttributes.isBlacklisted() || wordAttributes.isNotAWord()))) {
         return static_cast<float>(MAX_VALUE_FOR_WEIGHTING);
     }
     // TODO: This equation to calculate the improbability looks unreasonable.  Investigate this.