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

am 940cca4f: Merge "Check adjacent proximity chars for insertion for typing"

Browse source 
* commit '940cca4fa946c1a461d49a50de6a2ffc8355cdd6':
  Check adjacent proximity chars for insertion for typing
This commit is contained in:
Keisuke Kuroynagi 2013-06-23 17:55:45 -07:00 committed by Android Git Automerger
commit 290a4d48c9
4 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
native/jni/src/suggest/core/layout/proximity_info_state.h
View file

@ -90,20 +90,7 @@ class ProximityInfoState {
return false; return false;
} }
// TODO: Promote insertion letter correction if that letter is a proximity of the previous AK_FORCE_INLINE bool existsAdjacentProximityChars(const int index) const {
// letter like follows:
// // Demotion for a word with excessive character
// if (excessiveCount > 0) {
// multiplyRate(WORDS_WITH_EXCESSIVE_CHARACTER_DEMOTION_RATE, &finalFreq);
// if (!lastCharExceeded
// && !proximityInfoState->existsAdjacentProximityChars(excessivePos)) {
// // If an excessive character is not adjacent to the left char or the right char,
// // we will demote this word.
// multiplyRate(WORDS_WITH_EXCESSIVE_CHARACTER_OUT_OF_PROXIMITY_DEMOTION_RATE,
// &finalFreq);
// }
// }
inline bool existsAdjacentProximityChars(const int index) const {
if (index < 0 || index >= mSampledInputSize) return false; if (index < 0 || index >= mSampledInputSize) return false;
const int currentCodePoint = getPrimaryCodePointAt(index); const int currentCodePoint = getPrimaryCodePointAt(index);
const int leftIndex = index - 1; const int leftIndex = index - 1;

1
native/jni/src/suggest/policyimpl/typing/scoring_params.cpp
View file

@ -33,6 +33,7 @@ const float ScoringParams::OMISSION_COST_SAME_CHAR = 0.491f;
const float ScoringParams::OMISSION_COST_FIRST_CHAR = 0.582f; const float ScoringParams::OMISSION_COST_FIRST_CHAR = 0.582f;
const float ScoringParams::INSERTION_COST = 0.730f; const float ScoringParams::INSERTION_COST = 0.730f;
const float ScoringParams::INSERTION_COST_SAME_CHAR = 0.586f; const float ScoringParams::INSERTION_COST_SAME_CHAR = 0.586f;
const float ScoringParams::INSERTION_COST_PROXIMITY_CHAR = 0.70f;
const float ScoringParams::INSERTION_COST_FIRST_CHAR = 0.623f; const float ScoringParams::INSERTION_COST_FIRST_CHAR = 0.623f;
const float ScoringParams::TRANSPOSITION_COST = 0.516f; const float ScoringParams::TRANSPOSITION_COST = 0.516f;
const float ScoringParams::SPACE_SUBSTITUTION_COST = 0.319f; const float ScoringParams::SPACE_SUBSTITUTION_COST = 0.319f;

1
native/jni/src/suggest/policyimpl/typing/scoring_params.h
View file

@ -42,6 +42,7 @@ class ScoringParams {
static const float OMISSION_COST_FIRST_CHAR; static const float OMISSION_COST_FIRST_CHAR;
static const float INSERTION_COST; static const float INSERTION_COST;
static const float INSERTION_COST_SAME_CHAR; static const float INSERTION_COST_SAME_CHAR;
static const float INSERTION_COST_PROXIMITY_CHAR;
static const float INSERTION_COST_FIRST_CHAR; static const float INSERTION_COST_FIRST_CHAR;
static const float TRANSPOSITION_COST; static const float TRANSPOSITION_COST;
static const float SPACE_SUBSTITUTION_COST; static const float SPACE_SUBSTITUTION_COST;

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

@ -122,19 +122,25 @@ class TypingWeighting : public Weighting {
float getInsertionCost(const DicTraverseSession *const traverseSession, float getInsertionCost(const DicTraverseSession *const traverseSession,
const DicNode *const parentDicNode, const DicNode *const dicNode) const { const DicNode *const parentDicNode, const DicNode *const dicNode) const {
const int16_t parentPointIndex = parentDicNode->getInputIndex(0); const int16_t insertedPointIndex = parentDicNode->getInputIndex(0);
const int prevCodePoint = const int prevCodePoint = traverseSession->getProximityInfoState(0)->getPrimaryCodePointAt(
traverseSession->getProximityInfoState(0)->getPrimaryCodePointAt(parentPointIndex); insertedPointIndex);
const int currentCodePoint = dicNode->getNodeCodePoint(); const int currentCodePoint = dicNode->getNodeCodePoint();
const bool sameCodePoint = prevCodePoint == currentCodePoint; const bool sameCodePoint = prevCodePoint == currentCodePoint;
const bool existsAdjacentProximityChars = traverseSession->getProximityInfoState(0)
->existsAdjacentProximityChars(insertedPointIndex);
const float dist = traverseSession->getProximityInfoState(0)->getPointToKeyLength( const float dist = traverseSession->getProximityInfoState(0)->getPointToKeyLength(
parentPointIndex + 1, currentCodePoint); insertedPointIndex + 1, dicNode->getNodeCodePoint());
const float weightedDistance = dist * ScoringParams::DISTANCE_WEIGHT_LENGTH; const float weightedDistance = dist * ScoringParams::DISTANCE_WEIGHT_LENGTH;
const bool singleChar = dicNode->getNodeCodePointCount() == 1; const bool singleChar = dicNode->getNodeCodePointCount() == 1;
const float cost = (singleChar ? ScoringParams::INSERTION_COST_FIRST_CHAR : 0.0f) float cost = (singleChar ? ScoringParams::INSERTION_COST_FIRST_CHAR : 0.0f);
+ (sameCodePoint ? ScoringParams::INSERTION_COST_SAME_CHAR if (sameCodePoint) {
: ScoringParams::INSERTION_COST); cost += ScoringParams::INSERTION_COST_SAME_CHAR;
} else if (existsAdjacentProximityChars) {
cost += ScoringParams::INSERTION_COST_PROXIMITY_CHAR;
} else {
cost += ScoringParams::INSERTION_COST;
}
return cost + weightedDistance; return cost + weightedDistance;
} }