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

am a6921d32: am 3051966b: Merge "The processNextKey becomes to use actual average duration." into jb-mr1-dev 

* commit 'a6921d326a3fae8354ee904c43b837fbc59a00e5':
  The processNextKey becomes to use actual average duration.
main
Satoshi Kataoka 2012-09-06 09:12:32 -07:00 committed by Android Git Automerger
parent 59e20c987a a6921d326a
commit 2a5ad57707
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
native/jni/src/proximity_info_state.cpp
View File

@ -224,7 +224,7 @@ float ProximityInfoState::updateNearKeysDistances(const int x, const int y,
bool ProximityInfoState::isPrevLocalMin(const NearKeysDistanceMap *const currentNearKeysDistances, bool ProximityInfoState::isPrevLocalMin(const NearKeysDistanceMap *const currentNearKeysDistances,
const NearKeysDistanceMap *const prevNearKeysDistances, const NearKeysDistanceMap *const prevNearKeysDistances,
const NearKeysDistanceMap *const prevPrevNearKeysDistances) const { const NearKeysDistanceMap *const prevPrevNearKeysDistances) const {
static const float MARGIN = 0.5f; static const float MARGIN = 0.05f;
for (NearKeysDistanceMap::const_iterator it = prevNearKeysDistances->begin(); for (NearKeysDistanceMap::const_iterator it = prevNearKeysDistances->begin();
it != prevNearKeysDistances->end(); ++it) { it != prevNearKeysDistances->end(); ++it) {
@ -245,14 +245,14 @@ float ProximityInfoState::getPointScore(
const NearKeysDistanceMap *const prevNearKeysDistances, const NearKeysDistanceMap *const prevNearKeysDistances,
const NearKeysDistanceMap *const prevPrevNearKeysDistances) const { const NearKeysDistanceMap *const prevPrevNearKeysDistances) const {
static const float BASE_SAMPLE_RATE_SCALE = 0.1f; static const float BASE_SAMPLE_RATE_SCALE = 0.1f;
static const float SAVE_DISTANCE_SCALE = 12.0f; static const float SAVE_DISTANCE_SCALE = 14.0f;
static const float SAVE_DISTANCE_SCORE = 2.0f; static const float SAVE_DISTANCE_SCORE = 2.0f;
static const float SKIP_DISTANCE_SCALE = 1.5f; static const float SKIP_DISTANCE_SCALE = 1.5f;
static const float SKIP_DISTANCE_SCORE = -1.0f; static const float SKIP_DISTANCE_SCORE = -1.0f;
static const float CHECK_LOCALMIN_DISTANCE_THRESHOLD_SCALE = 2.5f; static const float CHECK_LOCALMIN_DISTANCE_THRESHOLD_SCALE = 3.5f;
static const float CHECK_LOCALMIN_DISTANCE_SCORE = -1.0f; static const float CHECK_LOCALMIN_DISTANCE_SCORE = -1.0f;
static const float STRAIGHT_ANGLE_THRESHOLD = M_PI_F / 32.0f; static const float STRAIGHT_ANGLE_THRESHOLD = M_PI_F / 32.0f;
static const float STRAIGHT_SKIP_DISTANCE_THRESHOLD_SCALE = 4.0f; static const float STRAIGHT_SKIP_DISTANCE_THRESHOLD_SCALE = 5.0f;
static const float STRAIGHT_SKIP_NEAREST_DISTANCE_THRESHOLD = 0.5f; static const float STRAIGHT_SKIP_NEAREST_DISTANCE_THRESHOLD = 0.5f;
static const float STRAIGHT_SKIP_SCORE = -1.0f; static const float STRAIGHT_SKIP_SCORE = -1.0f;
@ -275,19 +275,19 @@ float ProximityInfoState::getPointScore(
score += SKIP_DISTANCE_SCORE; score += SKIP_DISTANCE_SCORE;
} }
// Location // Location
if (distPrev < baseSampleRate * CHECK_LOCALMIN_DISTANCE_THRESHOLD_SCALE) {
if (!isPrevLocalMin(currentNearKeysDistances, currentNearKeysDistances, if (!isPrevLocalMin(currentNearKeysDistances, currentNearKeysDistances,
prevPrevNearKeysDistances)) { prevPrevNearKeysDistances)) {
if (distPrev < baseSampleRate * CHECK_LOCALMIN_DISTANCE_THRESHOLD_SCALE) {
score += CHECK_LOCALMIN_DISTANCE_SCORE; score += CHECK_LOCALMIN_DISTANCE_SCORE;
} }
} }
// Angle // Angle
if (nearest > STRAIGHT_SKIP_NEAREST_DISTANCE_THRESHOLD
&& distPrev < baseSampleRate * STRAIGHT_SKIP_DISTANCE_THRESHOLD_SCALE) {
const float angle1 = getAngle(x, y, mInputXs.back(), mInputYs.back()); const float angle1 = getAngle(x, y, mInputXs.back(), mInputYs.back());
const float angle2 = getAngle(mInputXs.back(), mInputYs.back(), const float angle2 = getAngle(mInputXs.back(), mInputYs.back(),
mInputXs[size - 2], mInputYs[size - 2]); mInputXs[size - 2], mInputYs[size - 2]);
if (getAngleDiff(angle1, angle2) < STRAIGHT_ANGLE_THRESHOLD) { if (getAngleDiff(angle1, angle2) < STRAIGHT_ANGLE_THRESHOLD) {
if (nearest > STRAIGHT_SKIP_NEAREST_DISTANCE_THRESHOLD
&& distPrev < baseSampleRate * STRAIGHT_SKIP_DISTANCE_THRESHOLD_SCALE) {
score += STRAIGHT_SKIP_SCORE; score += STRAIGHT_SKIP_SCORE;
} }
} }
@ -383,13 +383,14 @@ float ProximityInfoState::calculateNormalizedSquaredDistance(
} }
int ProximityInfoState::getDuration(const int index) const { int ProximityInfoState::getDuration(const int index) const {
if (mInputSize > 0 && index > 0 && index < static_cast<int>(mInputSize) - 1) { if (mInputSize > 0 && index > 0 && index < mInputSize - 1) {
return mTimes[index + 1] - mTimes[index - 1]; return mTimes[index + 1] - mTimes[index - 1];
} }
return 0; return 0;
} }
float ProximityInfoState::getPointToKeyLength(int inputIndex, int codePoint, float scale) { float ProximityInfoState::getPointToKeyLength(const int inputIndex, const int codePoint,
const float scale) const {
const int keyId = mProximityInfo->getKeyIndexOf(codePoint); const int keyId = mProximityInfo->getKeyIndexOf(codePoint);
if (keyId != NOT_AN_INDEX) { if (keyId != NOT_AN_INDEX) {
const int index = inputIndex * mProximityInfo->getKeyCount() + keyId; const int index = inputIndex * mProximityInfo->getKeyCount() + keyId;
@ -404,11 +405,7 @@ float ProximityInfoState::getPointToKeyLength(int inputIndex, int codePoint, flo
return MAX_POINT_TO_KEY_LENGTH; return MAX_POINT_TO_KEY_LENGTH;
} }
int ProximityInfoState::getKeyKeyDistance(int key0, int key1) { int ProximityInfoState::getSpaceY() const {
return mProximityInfo->getKeyKeyDistanceG(key0, key1);
}
int ProximityInfoState::getSpaceY() {
const int keyId = mProximityInfo->getKeyIndexOf(' '); const int keyId = mProximityInfo->getKeyIndexOf(' ');
return mProximityInfo->getKeyCenterYOfKeyIdG(keyId); return mProximityInfo->getKeyCenterYOfKeyIdG(keyId);
} }
@ -447,4 +444,12 @@ int32_t ProximityInfoState::getAllPossibleChars(
} }
return i; return i;
} }
float ProximityInfoState::getAveragePointDuration() const {
if (mInputSize == 0) {
return 0;
}
return (mTimes[mInputSize - 1] - mTimes[0]) / static_cast<float>(mInputSize);
}
} // namespace latinime } // namespace latinime

15
native/jni/src/proximity_info_state.h
View File

@ -200,27 +200,26 @@ class ProximityInfoState {
return mInputSize; return mInputSize;
} }
int getInputX(int index) const { int getInputX(const int index) const {
return mInputXs[index]; return mInputXs[index];
} }
int getInputY(int index) const { int getInputY(const int index) const {
return mInputYs[index]; return mInputYs[index];
} }
int getLengthCache(int index) const { int getLengthCache(const int index) const {
return mLengthCache[index]; return mLengthCache[index];
} }
float getPointToKeyLength(int inputIndex, int charCode, float scale); float getPointToKeyLength(const int inputIndex, const int charCode, const float scale) const;
int getKeyKeyDistance(int key0, int key1); int getSpaceY() const;
int getSpaceY();
int32_t getAllPossibleChars( int32_t getAllPossibleChars(
const size_t startIndex, int32_t *const filter, int32_t filterSize) const; const size_t startIndex, int32_t *const filter, const int32_t filterSize) const;
float getAveragePointDuration() const;
private: private:
DISALLOW_COPY_AND_ASSIGN(ProximityInfoState); DISALLOW_COPY_AND_ASSIGN(ProximityInfoState);
typedef hash_map_compat<int, float> NearKeysDistanceMap; typedef hash_map_compat<int, float> NearKeysDistanceMap;