aboutsummaryrefslogtreecommitdiffstats
path: root/native/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-01-25 02:35:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-25 02:35:47 -0800
commit5fa994856131a1a25cb0325f54dd51c91a8978bb (patch)
treef645a66fe0011c2a686050850d6852f6acfa027c /native/src
parentd839c9c2cac39ff48a45774d76487f43b8024d5f (diff)
parentd9702a375ab35af58f517b75683595b17a224f35 (diff)
downloadlatinime-5fa994856131a1a25cb0325f54dd51c91a8978bb.tar.gz
latinime-5fa994856131a1a25cb0325f54dd51c91a8978bb.tar.xz
latinime-5fa994856131a1a25cb0325f54dd51c91a8978bb.zip
am d9702a37: Merge "Add a test for auto-correction."
* commit 'd9702a375ab35af58f517b75683595b17a224f35': Add a test for auto-correction.
Diffstat (limited to 'native/src')
-rw-r--r--native/src/defines.h1
-rw-r--r--native/src/proximity_info.cpp3
2 files changed, 4 insertions, 0 deletions
diff --git a/native/src/defines.h b/native/src/defines.h
index 119a7d779..096f1fbf6 100644
--- a/native/src/defines.h
+++ b/native/src/defines.h
@@ -169,6 +169,7 @@ static void prof_out(void) {
#define NOT_VALID_WORD -99
#define NOT_A_CHARACTER -1
#define NOT_A_DISTANCE -1
+#define NOT_A_COORDINATE -1
#define EQUIVALENT_CHAR_WITHOUT_DISTANCE_INFO -2
#define PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO -3
#define NOT_A_INDEX -1
diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp
index b91957c77..e0e938099 100644
--- a/native/src/proximity_info.cpp
+++ b/native/src/proximity_info.cpp
@@ -165,6 +165,9 @@ float ProximityInfo::calculateNormalizedSquaredDistance(
if (!hasSweetSpotData(keyIndex)) {
return NOT_A_DISTANCE_FLOAT;
}
+ if (NOT_A_COORDINATE == mInputXCoordinates[inputIndex]) {
+ return NOT_A_DISTANCE_FLOAT;
+ }
const float squaredDistance = calculateSquaredDistanceFromSweetSpotCenter(keyIndex, inputIndex);
const float squaredRadius = square(mSweetSpotRadii[keyIndex]);
return squaredDistance / squaredRadius;