nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 70367620: Merge "Remove unused member of DicNodeStatePrevWord." 

* commit '70367620725e5e2aa8b043df110418ad4a3e834c':
  Remove unused member of DicNodeStatePrevWord.
main
Keisuke Kuroyanagi 2014-03-10 02:49:13 -07:00 committed by Android Git Automerger
parent 07195e92c5 7036762072
commit d300663d76
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/jni/src/suggest/core/dicnode/dic_node.h
View File

@ -138,7 +138,6 @@ class DicNode {
&dicNode->mDicNodeState.mDicNodeStateScoring); &dicNode->mDicNodeState.mDicNodeStateScoring);
mDicNodeState.mDicNodeStatePrevWord.init( mDicNodeState.mDicNodeStatePrevWord.init(
dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordCount() + 1, dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordCount() + 1,
dicNode->mDicNodeProperties.getProbability(),
dicNode->mDicNodeProperties.getPtNodePos(), dicNode->mDicNodeProperties.getPtNodePos(),
dicNode->mDicNodeState.mDicNodeStatePrevWord.mPrevWord, dicNode->mDicNodeState.mDicNodeStatePrevWord.mPrevWord,
dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength(), dicNode->mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength(),

11
native/jni/src/suggest/core/dicnode/internal/dic_node_state_prevword.h
View File

@ -30,7 +30,7 @@ namespace latinime {
class DicNodeStatePrevWord { class DicNodeStatePrevWord {
public: public:
AK_FORCE_INLINE DicNodeStatePrevWord() 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) {} mPrevWordPtNodePos(NOT_A_DICT_POS), mSecondWordFirstInputIndex(NOT_AN_INDEX) {}
~DicNodeStatePrevWord() {} ~DicNodeStatePrevWord() {}
@ -39,7 +39,6 @@ class DicNodeStatePrevWord {
mPrevWordLength = 0; mPrevWordLength = 0;
mPrevWordCount = 0; mPrevWordCount = 0;
mPrevWordStart = 0; mPrevWordStart = 0;
mPrevWordProbability = -1;
mPrevWordPtNodePos = prevWordNodePos; mPrevWordPtNodePos = prevWordNodePos;
mSecondWordFirstInputIndex = NOT_AN_INDEX; mSecondWordFirstInputIndex = NOT_AN_INDEX;
mPrevWord[0] = 0; mPrevWord[0] = 0;
@ -50,18 +49,15 @@ class DicNodeStatePrevWord {
mPrevWordLength = prevWord->mPrevWordLength; mPrevWordLength = prevWord->mPrevWordLength;
mPrevWordCount = prevWord->mPrevWordCount; mPrevWordCount = prevWord->mPrevWordCount;
mPrevWordStart = prevWord->mPrevWordStart; mPrevWordStart = prevWord->mPrevWordStart;
mPrevWordProbability = prevWord->mPrevWordProbability;
mPrevWordPtNodePos = prevWord->mPrevWordPtNodePos; mPrevWordPtNodePos = prevWord->mPrevWordPtNodePos;
mSecondWordFirstInputIndex = prevWord->mSecondWordFirstInputIndex; mSecondWordFirstInputIndex = prevWord->mSecondWordFirstInputIndex;
memmove(mPrevWord, prevWord->mPrevWord, prevWord->mPrevWordLength * sizeof(mPrevWord[0])); memmove(mPrevWord, prevWord->mPrevWord, prevWord->mPrevWordLength * sizeof(mPrevWord[0]));
} }
void init(const int16_t prevWordCount, const int16_t prevWordProbability, void init(const int16_t prevWordCount, const int prevWordNodePos, const int *const src0,
const int prevWordNodePos, const int *const src0, const int16_t length0, const int16_t length0, const int *const src1, const int16_t length1,
const int *const src1, const int16_t length1,
const int prevWordSecondWordFirstInputIndex, const int lastInputIndex) { const int prevWordSecondWordFirstInputIndex, const int lastInputIndex) {
mPrevWordCount = std::min(prevWordCount, static_cast<int16_t>(MAX_RESULTS)); mPrevWordCount = std::min(prevWordCount, static_cast<int16_t>(MAX_RESULTS));
mPrevWordProbability = prevWordProbability;
mPrevWordPtNodePos = prevWordNodePos; mPrevWordPtNodePos = prevWordNodePos;
int twoWordsLen = int twoWordsLen =
DicNodeUtils::appendTwoWords(src0, length0, src1, length1, mPrevWord); DicNodeUtils::appendTwoWords(src0, length0, src1, length1, mPrevWord);
@ -136,7 +132,6 @@ class DicNodeStatePrevWord {
int16_t mPrevWordCount; int16_t mPrevWordCount;
int16_t mPrevWordLength; int16_t mPrevWordLength;
int16_t mPrevWordStart; int16_t mPrevWordStart;
int16_t mPrevWordProbability;
int mPrevWordPtNodePos; int mPrevWordPtNodePos;
int mSecondWordFirstInputIndex; int mSecondWordFirstInputIndex;
}; };