aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/suggest/core/suggest.cpp
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-10-14 11:38:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-14 11:38:11 +0000
commit04cd19e9bfc3fe726cfca235958d4ed48bb904d4 (patch)
tree6c7b17e3d80d856469407bf077d08e0942337503 /native/jni/src/suggest/core/suggest.cpp
parent97b986f670bbd00c7eded2462e52a02fe70c83b6 (diff)
parent1d0989b65cb0ee93a70dc479476025038aa720f5 (diff)
downloadlatinime-04cd19e9bfc3fe726cfca235958d4ed48bb904d4.tar.gz
latinime-04cd19e9bfc3fe726cfca235958d4ed48bb904d4.tar.xz
latinime-04cd19e9bfc3fe726cfca235958d4ed48bb904d4.zip
am 1d0989b6: Merge "Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION."
* commit '1d0989b65cb0ee93a70dc479476025038aa720f5': Quit using weightChildNode for ADDITIONAL_PROXIMITY and SUBSTITUTION.
Diffstat (limited to 'native/jni/src/suggest/core/suggest.cpp')
-rw-r--r--native/jni/src/suggest/core/suggest.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp
index cf2df86a6..c71526293 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -284,7 +284,6 @@ void Suggest::processDicNodeAsAdditionalProximityChar(DicTraverseSession *traver
// not treat the node as a terminal. There is no need to pass the bigram map in these cases.
Weighting::addCostAndForwardInputIndex(WEIGHTING, CT_ADDITIONAL_PROXIMITY,
traverseSession, dicNode, childDicNode, 0 /* multiBigramMap */);
- weightChildNode(traverseSession, childDicNode);
processExpandedDicNode(traverseSession, childDicNode);
}
@@ -292,7 +291,6 @@ void Suggest::processDicNodeAsSubstitution(DicTraverseSession *traverseSession,
DicNode *dicNode, DicNode *childDicNode) const {
Weighting::addCostAndForwardInputIndex(WEIGHTING, CT_SUBSTITUTION, traverseSession,
dicNode, childDicNode, 0 /* multiBigramMap */);
- weightChildNode(traverseSession, childDicNode);
processExpandedDicNode(traverseSession, childDicNode);
}
@@ -403,7 +401,7 @@ void Suggest::weightChildNode(DicTraverseSession *traverseSession, DicNode *dicN
if (dicNode->isCompletion(inputSize)) {
Weighting::addCostAndForwardInputIndex(WEIGHTING, CT_COMPLETION, traverseSession,
0 /* parentDicNode */, dicNode, 0 /* multiBigramMap */);
- } else { // completion
+ } else {
Weighting::addCostAndForwardInputIndex(WEIGHTING, CT_MATCH, traverseSession,
0 /* parentDicNode */, dicNode, 0 /* multiBigramMap */);
}