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

am 03dc8fe1: Use more int values in ProximityInfoState::getPointScore() 

* commit '03dc8fe141fa9f6fa5fe8362d9d35b3f3c954b87':
  Use more int values in ProximityInfoState::getPointScore()
main
Ken Wakasa 2012-09-14 05:23:10 -07:00 committed by Android Git Automerger
parent ec1631199d 03dc8fe141
commit d5730a51e5
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,29 +295,30 @@ float ProximityInfoState::getPointScore(
const NearKeysDistanceMap *const currentNearKeysDistances, 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 BASE_SAMPLE_RATE_SCALE = 0.1f; static const int DISTANCE_BASE_SCALE = 100;
static const float SAVE_DISTANCE_SCALE = 20.0f; static const int SAVE_DISTANCE_SCALE = 200;
static const int SKIP_DISTANCE_SCALE = 25;
static const int CHECK_LOCALMIN_DISTANCE_THRESHOLD_SCALE = 40;
static const int STRAIGHT_SKIP_DISTANCE_THRESHOLD_SCALE = 50;
static const int CORNER_CHECK_DISTANCE_THRESHOLD_SCALE = 27;
static const float SAVE_DISTANCE_SCORE = 2.0f; static const float SAVE_DISTANCE_SCORE = 2.0f;
static const float SKIP_DISTANCE_SCALE = 2.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 = 4.0f;
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 / 36.0f; static const float STRAIGHT_ANGLE_THRESHOLD = M_PI_F / 36.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;
static const float CORNER_ANGLE_THRESHOLD = M_PI_F / 2.0f; static const float CORNER_ANGLE_THRESHOLD = M_PI_F / 2.0f;
static const float CORNER_CHECK_DISTANCE_THRESHOLD_SCALE = 2.7f;
static const float CORNER_SCORE = 1.0f; static const float CORNER_SCORE = 1.0f;
const std::size_t size = mInputXs.size(); const std::size_t size = mInputXs.size();
if (size <= 1) { if (size <= 1) {
return 0; return 0.0f;
} }
const float baseSampleRate = mProximityInfo->getMostCommonKeyWidth() * BASE_SAMPLE_RATE_SCALE; const int baseSampleRate = mProximityInfo->getMostCommonKeyWidth();
const float distNext = getDistanceFloat(x, y, mInputXs.back(), mInputYs.back()); const int distNext = getDistanceInt(x, y, mInputXs.back(), mInputYs.back())
const float distPrev = getDistanceFloat(mInputXs.back(), mInputYs.back(), * DISTANCE_BASE_SCALE;
mInputXs[size - 2], mInputYs[size - 2]); const int distPrev = getDistanceInt(mInputXs.back(), mInputYs.back(),
mInputXs[size - 2], mInputYs[size - 2]) * DISTANCE_BASE_SCALE;
float score = 0.0f; float score = 0.0f;
// Sum of distances // Sum of distances