From b43ea5c3359259b042a6f58883c61a82acf34e82 Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Mon, 10 Mar 2014 18:36:14 +0900 Subject: [PATCH] Use isFirstCharUppercase instead of get first code point. Change-Id: I0a28305397bfc1e7218e16df00839781a74f5599 --- native/jni/src/suggest/core/dicnode/dic_node.h | 2 +- .../src/suggest/core/dicnode/internal/dic_node_state_output.h | 1 - native/jni/src/suggest/policyimpl/typing/typing_traversal.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/native/jni/src/suggest/core/dicnode/dic_node.h b/native/jni/src/suggest/core/dicnode/dic_node.h index fd3af1592..65dad5677 100644 --- a/native/jni/src/suggest/core/dicnode/dic_node.h +++ b/native/jni/src/suggest/core/dicnode/dic_node.h @@ -218,7 +218,7 @@ class DicNode { } bool isFirstCharUppercase() const { - const int c = getOutputWordBuf()[0]; + const int c = mDicNodeState.mDicNodeStateOutput.getCodePointAt(0); return CharUtils::isAsciiUpper(c); } diff --git a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h index 216939afe..bdb182c1d 100644 --- a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h +++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h @@ -61,7 +61,6 @@ class DicNodeStateOutput { } } - // TODO: Remove int getCodePointAt(const int index) const { return mCodePointsBuf[index]; } diff --git a/native/jni/src/suggest/policyimpl/typing/typing_traversal.h b/native/jni/src/suggest/policyimpl/typing/typing_traversal.h index 3db00ad3a..7c86b7dc9 100644 --- a/native/jni/src/suggest/policyimpl/typing/typing_traversal.h +++ b/native/jni/src/suggest/policyimpl/typing/typing_traversal.h @@ -162,9 +162,8 @@ class TypingTraversal : public Traversal { if (probability < ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY) { return false; } - const int c = dicNode->getOutputWordBuf()[0]; const bool shortCappedWord = dicNode->getNodeCodePointCount() - < ScoringParams::THRESHOLD_SHORT_WORD_LENGTH && CharUtils::isAsciiUpper(c); + < ScoringParams::THRESHOLD_SHORT_WORD_LENGTH && dicNode->isFirstCharUppercase(); return !shortCappedWord || probability >= ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY_FOR_CAPPED; }