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

am 6bfeeb86: Support multi words input for gesture.

Browse source 
* commit '6bfeeb86947eb2131408ae8bd55a7f90486feb1d':
  Support multi words input for gesture.
This commit is contained in:
Keisuke Kuroynagi 2013-06-17 03:13:38 -07:00 committed by Android Git Automerger
commit ee63f70fca
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
native/jni/src/suggest/core/dicnode/dic_node.h
View file

@ -128,7 +128,7 @@ class DicNode {
void initAsRootWithPreviousWord(DicNode *dicNode, const int pos, const int childrenPos, void initAsRootWithPreviousWord(DicNode *dicNode, const int pos, const int childrenPos,
const int childrenCount) { const int childrenCount) {
mIsUsed = true; mIsUsed = true;
mIsCachedForNextSuggestion = false; mIsCachedForNextSuggestion = dicNode->mIsCachedForNextSuggestion;
mDicNodeProperties.init( mDicNodeProperties.init(
pos, 0, childrenPos, 0, 0, 0, childrenCount, 0, 0, false, false, true, 0, 0); pos, 0, childrenPos, 0, 0, 0, childrenCount, 0, 0, false, false, true, 0, 0);
// TODO: Move to dicNodeState? // TODO: Move to dicNodeState?
@ -479,6 +479,11 @@ class DicNode {
return mDicNodeProperties.getDepth(); return mDicNodeProperties.getDepth();
} }
// "Length" includes spaces.
inline uint16_t getTotalLength() const {
return getDepth() + mDicNodeState.mDicNodeStatePrevWord.getPrevWordLength();
}
AK_FORCE_INLINE void dump(const char *tag) const { AK_FORCE_INLINE void dump(const char *tag) const {
#if DEBUG_DICT #if DEBUG_DICT
DUMP_WORD_AND_SCORE(tag); DUMP_WORD_AND_SCORE(tag);

8
native/jni/src/suggest/core/policy/weighting.cpp
View file

@ -106,7 +106,7 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n
// only used for typing // only used for typing
return weighting->getSubstitutionCost(); return weighting->getSubstitutionCost();
case CT_NEW_WORD_SPACE_OMITTION: case CT_NEW_WORD_SPACE_OMITTION:
return weighting->getNewWordCost(traverseSession, dicNode); return weighting->getNewWordSpatialCost(traverseSession, dicNode, inputStateG);
case CT_MATCH: case CT_MATCH:
return weighting->getMatchedCost(traverseSession, dicNode, inputStateG); return weighting->getMatchedCost(traverseSession, dicNode, inputStateG);
case CT_COMPLETION: case CT_COMPLETION:
@ -134,7 +134,8 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n
case CT_SUBSTITUTION: case CT_SUBSTITUTION:
return 0.0f; return 0.0f;
case CT_NEW_WORD_SPACE_OMITTION: case CT_NEW_WORD_SPACE_OMITTION:
return weighting->getNewWordBigramCost(traverseSession, parentDicNode, multiBigramMap); return weighting->getNewWordBigramLanguageCost(
traverseSession, parentDicNode, multiBigramMap);
case CT_MATCH: case CT_MATCH:
return 0.0f; return 0.0f;
case CT_COMPLETION: case CT_COMPLETION:
@ -146,7 +147,8 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n
return weighting->getTerminalLanguageCost(traverseSession, dicNode, languageImprobability); return weighting->getTerminalLanguageCost(traverseSession, dicNode, languageImprobability);
} }
case CT_NEW_WORD_SPACE_SUBSTITUTION: case CT_NEW_WORD_SPACE_SUBSTITUTION:
return weighting->getNewWordBigramCost(traverseSession, parentDicNode, multiBigramMap); return weighting->getNewWordBigramLanguageCost(
traverseSession, parentDicNode, multiBigramMap);
case CT_INSERTION: case CT_INSERTION:
return 0.0f; return 0.0f;
case CT_TRANSPOSITION: case CT_TRANSPOSITION:

6
native/jni/src/suggest/core/policy/weighting.h
View file

@ -56,10 +56,10 @@ class Weighting {
const DicTraverseSession *const traverseSession, const DicTraverseSession *const traverseSession,
const DicNode *const parentDicNode, const DicNode *const dicNode) const = 0; const DicNode *const parentDicNode, const DicNode *const dicNode) const = 0;
virtual float getNewWordCost(const DicTraverseSession *const traverseSession, virtual float getNewWordSpatialCost(const DicTraverseSession *const traverseSession,
const DicNode *const dicNode) const = 0; const DicNode *const dicNode, DicNode_InputStateG *const inputStateG) const = 0;
virtual float getNewWordBigramCost( virtual float getNewWordBigramLanguageCost(
const DicTraverseSession *const traverseSession, const DicNode *const dicNode, const DicTraverseSession *const traverseSession, const DicNode *const dicNode,
MultiBigramMap *const multiBigramMap) const = 0; MultiBigramMap *const multiBigramMap) const = 0;

6
native/jni/src/suggest/policyimpl/typing/typing_weighting.h
View file

@ -138,12 +138,12 @@ class TypingWeighting : public Weighting {
return cost + weightedDistance; return cost + weightedDistance;
} }
float getNewWordCost(const DicTraverseSession *const traverseSession, float getNewWordSpatialCost(const DicTraverseSession *const traverseSession,
const DicNode *const dicNode) const { const DicNode *const dicNode, DicNode_InputStateG *inputStateG) const {
return ScoringParams::COST_NEW_WORD * traverseSession->getMultiWordCostMultiplier(); return ScoringParams::COST_NEW_WORD * traverseSession->getMultiWordCostMultiplier();
} }
float getNewWordBigramCost(const DicTraverseSession *const traverseSession, float getNewWordBigramLanguageCost(const DicTraverseSession *const traverseSession,
const DicNode *const dicNode, const DicNode *const dicNode,
MultiBigramMap *const multiBigramMap) const { MultiBigramMap *const multiBigramMap) const {
return DicNodeUtils::getBigramNodeImprobability(traverseSession->getBinaryDictionaryInfo(), return DicNodeUtils::getBigramNodeImprobability(traverseSession->getBinaryDictionaryInfo(),