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

Move ProximityInfo::calculateSweetSpotType right after ProximityInfo::setInputParams

Browse source 
Change-Id: Ifc76ab0aa3e9467d54696bb8b84bf523f001938a
This commit is contained in:
Yusuke Nojima 2011-10-04 17:04:07 +09:00
parent a25dd3b5c3
commit 16717159ff
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
native/src/proximity_info.cpp
View file

@ -116,6 +116,38 @@ void ProximityInfo::setInputParams(const int* inputCodes, const int inputLength,
mPrimaryInputWord[inputLength] = 0; mPrimaryInputWord[inputLength] = 0;
} }
inline float square(const float x) { return x * x; }
ProximityInfo::SweetSpotType ProximityInfo::calculateSweetSpotType(
int index, unsigned short baseLowerC) const {
if (KEY_COUNT == 0 || !mInputXCoordinates || !mInputYCoordinates
|| baseLowerC > MAX_CHAR_CODE) {
return UNKNOWN;
}
const int keyIndex = mCodeToKeyIndex[baseLowerC];
if (keyIndex < 0) {
return UNKNOWN;
}
const float sweetSpotRadius = mSweetSpotRadii[keyIndex];
if (sweetSpotRadius <= 0.0) {
return UNKNOWN;
}
const float sweetSpotCenterX = mSweetSpotCenterXs[keyIndex];
const float sweetSpotCenterY = mSweetSpotCenterYs[keyIndex];
const float inputX = (float)mInputXCoordinates[index];
const float inputY = (float)mInputYCoordinates[index];
const float squaredDistance =
square(inputX - sweetSpotCenterX) + square(inputY - sweetSpotCenterY);
const float squaredSweetSpotRadius = square(sweetSpotRadius);
if (squaredDistance <= squaredSweetSpotRadius) {
return IN_SWEET_SPOT;
}
if (squaredDistance <= square(NEUTRAL_AREA_RADIUS_RATIO) * squaredSweetSpotRadius) {
return IN_NEUTRAL_AREA;
}
return OUT_OF_NEUTRAL_AREA;
}
inline const int* ProximityInfo::getProximityCharsAt(const int index) const { inline const int* ProximityInfo::getProximityCharsAt(const int index) const {
return mInputCodes + (index * MAX_PROXIMITY_CHARS_SIZE); return mInputCodes + (index * MAX_PROXIMITY_CHARS_SIZE);
} }
@ -207,38 +239,6 @@ ProximityInfo::ProximityType ProximityInfo::getMatchedProximityId(
return UNRELATED_CHAR; return UNRELATED_CHAR;
} }
inline float square(const float x) { return x * x; }
ProximityInfo::SweetSpotType ProximityInfo::calculateSweetSpotType(
int index, unsigned short baseLowerC) const {
if (KEY_COUNT == 0 || !mInputXCoordinates || !mInputYCoordinates
|| baseLowerC > MAX_CHAR_CODE) {
return UNKNOWN;
}
const int keyIndex = mCodeToKeyIndex[baseLowerC];
if (keyIndex < 0) {
return UNKNOWN;
}
const float sweetSpotRadius = mSweetSpotRadii[keyIndex];
if (sweetSpotRadius <= 0.0) {
return UNKNOWN;
}
const float sweetSpotCenterX = mSweetSpotCenterXs[keyIndex];
const float sweetSpotCenterY = mSweetSpotCenterYs[keyIndex];
const float inputX = (float)mInputXCoordinates[index];
const float inputY = (float)mInputYCoordinates[index];
const float squaredDistance =
square(inputX - sweetSpotCenterX) + square(inputY - sweetSpotCenterY);
const float squaredSweetSpotRadius = square(sweetSpotRadius);
if (squaredDistance <= squaredSweetSpotRadius) {
return IN_SWEET_SPOT;
}
if (squaredDistance <= square(NEUTRAL_AREA_RADIUS_RATIO) * squaredSweetSpotRadius) {
return IN_NEUTRAL_AREA;
}
return OUT_OF_NEUTRAL_AREA;
}
bool ProximityInfo::sameAsTyped(const unsigned short *word, int length) const { bool ProximityInfo::sameAsTyped(const unsigned short *word, int length) const {
if (length != mInputLength) { if (length != mInputLength) {
return false; return false;