diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-03-10 09:45:54 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-03-10 09:45:54 +0000 |
| commit | 70367620725e5e2aa8b043df110418ad4a3e834c (patch) | |
| tree | d6fe68521b1c6d6b8c1488f12ae21c2d39a7b771 | |
| parent | bd44c9815d0a4d7f411d6160ccd512b0303f0d25 (diff) | |
| parent | 258260bef2beafc46e1082fda585312b797f0982 (diff) | |
| download | latinime-70367620725e5e2aa8b043df110418ad4a3e834c.tar.gz latinime-70367620725e5e2aa8b043df110418ad4a3e834c.tar.xz latinime-70367620725e5e2aa8b043df110418ad4a3e834c.zip | |
Merge "Remove unused member of DicNodeStatePrevWord."
| -rw-r--r-- | native/jni/src/suggest/core/dicnode/dic_node.h | 1 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/native/jni/src/suggest/core/dicnode/dic_node.h b/native/jni/src/suggest/core/dicnode/dic_node.h index 9069bb10c..59eff9abb 100644 --- a/native/jni/src/suggest/core/dicnode/dic_node.h +++ b/native/jni/src/suggest/core/dicnode/dic_node.h @@ -138,7 +138,6 @@ class DicNode { &dicNode->mDicNodeState.mDicNodeStateScoring); mDicNodeState.mDicNodeStatePrevWord.init( dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordCount() + 1, - dicNode->mDicNodeProperties.getProbability(), dicNode->mDicNodeProperties.getPtNodePos(), dicNode->mDicNodeState.mDicNodeStatePrevWord.mPrevWord, dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength(), diff --git a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h index a35eb5124..f8233bb96 100644 --- a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h +++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h @@ -30,7 +30,7 @@ namespace latinime { class DicNodeStatePrevWord { public: AK_FORCE_INLINE DicNodeStatePrevWord() - : mPrevWordCount(0), mPrevWordLength(0), mPrevWordStart(0), mPrevWordProbability(0), + : mPrevWordCount(0), mPrevWordLength(0), mPrevWordStart(0), mPrevWordPtNodePos(NOT_A_DICT_POS), mSecondWordFirstInputIndex(NOT_AN_INDEX) {} ~DicNodeStatePrevWord() {} @@ -39,7 +39,6 @@ class DicNodeStatePrevWord { mPrevWordLength = 0; mPrevWordCount = 0; mPrevWordStart = 0; - mPrevWordProbability = -1; mPrevWordPtNodePos = prevWordNodePos; mSecondWordFirstInputIndex = NOT_AN_INDEX; mPrevWord[0] = 0; @@ -50,18 +49,15 @@ class DicNodeStatePrevWord { mPrevWordLength = prevWord->mPrevWordLength; mPrevWordCount = prevWord->mPrevWordCount; mPrevWordStart = prevWord->mPrevWordStart; - mPrevWordProbability = prevWord->mPrevWordProbability; mPrevWordPtNodePos = prevWord->mPrevWordPtNodePos; mSecondWordFirstInputIndex = prevWord->mSecondWordFirstInputIndex; memmove(mPrevWord, prevWord->mPrevWord, prevWord->mPrevWordLength * sizeof(mPrevWord[0])); } - void init(const int16_t prevWordCount, const int16_t prevWordProbability, - const int prevWordNodePos, const int *const src0, const int16_t length0, - const int *const src1, const int16_t length1, + void init(const int16_t prevWordCount, const int prevWordNodePos, const int *const src0, + const int16_t length0, const int *const src1, const int16_t length1, const int prevWordSecondWordFirstInputIndex, const int lastInputIndex) { mPrevWordCount = std::min(prevWordCount, static_cast<int16_t>(MAX_RESULTS)); - mPrevWordProbability = prevWordProbability; mPrevWordPtNodePos = prevWordNodePos; int twoWordsLen = DicNodeUtils::appendTwoWords(src0, length0, src1, length1, mPrevWord); @@ -136,7 +132,6 @@ class DicNodeStatePrevWord { int16_t mPrevWordCount; int16_t mPrevWordLength; int16_t mPrevWordStart; - int16_t mPrevWordProbability; int mPrevWordPtNodePos; int mSecondWordFirstInputIndex; }; |