aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dictionaries/de_wordlist.combined.gzbin1594831 -> 1291152 bytes
-rw-r--r--dictionaries/en_GB_wordlist.combined.gzbin859526 -> 859530 bytes
-rw-r--r--dictionaries/en_wordlist.combined.gzbin901400 -> 902558 bytes
-rw-r--r--dictionaries/fr_wordlist.combined.gzbin1106063 -> 1106164 bytes
-rw-r--r--dictionaries/ru_wordlist.combined.gzbin1394258 -> 1393331 bytes
-rw-r--r--java/res/raw/main_de.dictbin1605732 -> 1605718 bytes
-rw-r--r--java/res/raw/main_en.dictbin1069783 -> 1069793 bytes
-rw-r--r--java/res/raw/main_es.dictbin1138855 -> 1138874 bytes
-rw-r--r--java/res/raw/main_fr.dictbin1329511 -> 1329601 bytes
-rw-r--r--java/res/raw/main_it.dictbin1143310 -> 1143329 bytes
-rw-r--r--java/res/raw/main_pt_br.dictbin1091965 -> 1091987 bytes
-rw-r--r--java/res/raw/main_ru.dictbin2240073 -> 2239610 bytes
-rw-r--r--native/jni/src/defines.h2
-rw-r--r--native/jni/src/proximity_info_state.cpp115
-rw-r--r--native/jni/src/proximity_info_state.h29
15 files changed, 118 insertions, 28 deletions
diff --git a/dictionaries/de_wordlist.combined.gz b/dictionaries/de_wordlist.combined.gz
index 5db1aa4f3..207597a1b 100644
--- a/dictionaries/de_wordlist.combined.gz
+++ b/dictionaries/de_wordlist.combined.gz
Binary files differ
diff --git a/dictionaries/en_GB_wordlist.combined.gz b/dictionaries/en_GB_wordlist.combined.gz
index b5909c2da..62a3d5587 100644
--- a/dictionaries/en_GB_wordlist.combined.gz
+++ b/dictionaries/en_GB_wordlist.combined.gz
Binary files differ
diff --git a/dictionaries/en_wordlist.combined.gz b/dictionaries/en_wordlist.combined.gz
index 62c454049..d550e0711 100644
--- a/dictionaries/en_wordlist.combined.gz
+++ b/dictionaries/en_wordlist.combined.gz
Binary files differ
diff --git a/dictionaries/fr_wordlist.combined.gz b/dictionaries/fr_wordlist.combined.gz
index 95a87e630..864c0409b 100644
--- a/dictionaries/fr_wordlist.combined.gz
+++ b/dictionaries/fr_wordlist.combined.gz
Binary files differ
diff --git a/dictionaries/ru_wordlist.combined.gz b/dictionaries/ru_wordlist.combined.gz
index 62ae12e90..3f17affd6 100644
--- a/dictionaries/ru_wordlist.combined.gz
+++ b/dictionaries/ru_wordlist.combined.gz
Binary files differ
diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict
index 6122cd3f0..59df8b829 100644
--- a/java/res/raw/main_de.dict
+++ b/java/res/raw/main_de.dict
Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict
index de1170afd..85ee809de 100644
--- a/java/res/raw/main_en.dict
+++ b/java/res/raw/main_en.dict
Binary files differ
diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict
index 7a4daf1f2..cb17926e0 100644
--- a/java/res/raw/main_es.dict
+++ b/java/res/raw/main_es.dict
Binary files differ
diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict
index c607d0e36..53fd8d139 100644
--- a/java/res/raw/main_fr.dict
+++ b/java/res/raw/main_fr.dict
Binary files differ
diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict
index b93a55c93..59b78d643 100644
--- a/java/res/raw/main_it.dict
+++ b/java/res/raw/main_it.dict
Binary files differ
diff --git a/java/res/raw/main_pt_br.dict b/java/res/raw/main_pt_br.dict
index 66ac3f953..2a8af6f6e 100644
--- a/java/res/raw/main_pt_br.dict
+++ b/java/res/raw/main_pt_br.dict
Binary files differ
diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict
index 050b0b8c4..dd3b7b3ab 100644
--- a/java/res/raw/main_ru.dict
+++ b/java/res/raw/main_ru.dict
Binary files differ
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h
index bbef7329d..894e5f1c9 100644
--- a/native/jni/src/defines.h
+++ b/native/jni/src/defines.h
@@ -210,6 +210,7 @@ static inline void prof_out(void) {
#define DEBUG_WORDS_PRIORITY_QUEUE false
#define DEBUG_SAMPLING_POINTS true
#define DEBUG_POINTS_PROBABILITY true
+#define DEBUG_DOUBLE_LETTER true
#ifdef FLAG_FULL_DBG
#define DEBUG_GEO_FULL true
@@ -232,6 +233,7 @@ static inline void prof_out(void) {
#define DEBUG_WORDS_PRIORITY_QUEUE false
#define DEBUG_SAMPLING_POINTS false
#define DEBUG_POINTS_PROBABILITY false
+#define DEBUG_DOUBLE_LETTER false
#define DEBUG_GEO_FULL false
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index e64d46d01..740e1a24e 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -21,7 +21,6 @@
#define LOG_TAG "LatinIME: proximity_info_state.cpp"
#include "defines.h"
-#include "geometry_utils.h"
#include "proximity_info.h"
#include "proximity_info_state.h"
@@ -37,7 +36,6 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
const ProximityInfo *proximityInfo, const int *const inputCodes, const int inputSize,
const int *const xCoordinates, const int *const yCoordinates, const int *const times,
const int *const pointerIds, const bool isGeometric) {
-
if (isGeometric) {
mIsContinuationPossible = checkAndReturnIsContinuationPossible(
inputSize, xCoordinates, yCoordinates, times);
@@ -106,7 +104,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
mDistanceCache.clear();
mNearKeysVector.clear();
mSearchKeysVector.clear();
- mRelativeSpeeds.clear();
+ mSpeedRates.clear();
+ mBeelineSpeedRates.clear();
mCharProbabilities.clear();
mDirections.clear();
}
@@ -117,6 +116,14 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
mSampledInputSize = 0;
if (xCoordinates && yCoordinates) {
+ if (DEBUG_SAMPLING_POINTS) {
+ if (isGeometric) {
+ for (int i = 0; i < inputSize; ++i) {
+ AKLOGI("(%d) x %d, y %d, time %d",
+ i, xCoordinates[i], yCoordinates[i], times[i]);
+ }
+ }
+ }
const bool proximityOnly = !isGeometric && (xCoordinates[0] < 0 || yCoordinates[0] < 0);
int lastInputIndex = pushTouchPointStartIndex;
for (int i = lastInputIndex; i < inputSize; ++i) {
@@ -179,7 +186,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
}
if (mSampledInputSize > 0 && isGeometric) {
- refreshRelativeSpeed(inputSize, xCoordinates, yCoordinates, times, lastSavedInputSize);
+ refreshSpeedRates(inputSize, xCoordinates, yCoordinates, times, lastSavedInputSize);
+ refreshBeelineSpeedRates(inputSize, xCoordinates, yCoordinates, times);
}
if (DEBUG_GEO_FULL) {
@@ -242,7 +250,13 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
originalY << ";";
}
}
+ AKLOGI("===== sampled points =====");
for (int i = 0; i < mSampledInputSize; ++i) {
+ if (isGeometric) {
+ AKLOGI("%d: x = %d, y = %d, time = %d, relative speed = %.4f, beeline speed = %.4f",
+ i, mSampledInputXs[i], mSampledInputYs[i], mTimes[i], mSpeedRates[i],
+ getBeelineSpeedRate(i));
+ }
sampledX << mSampledInputXs[i];
sampledY << mSampledInputYs[i];
if (i != mSampledInputSize - 1) {
@@ -303,13 +317,13 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi
}
}
-void ProximityInfoState::refreshRelativeSpeed(const int inputSize, const int *const xCoordinates,
+void ProximityInfoState::refreshSpeedRates(const int inputSize, const int *const xCoordinates,
const int *const yCoordinates, const int *const times, const int lastSavedInputSize) {
// Relative speed calculation.
const int sumDuration = mTimes.back() - mTimes.front();
const int sumLength = mLengthCache.back() - mLengthCache.front();
- const float averageSpeed = static_cast<float>(sumLength) / static_cast<float>(sumDuration);
- mRelativeSpeeds.resize(mSampledInputSize);
+ mAverageSpeed = static_cast<float>(sumLength) / static_cast<float>(sumDuration);
+ mSpeedRates.resize(mSampledInputSize);
for (int i = lastSavedInputSize; i < mSampledInputSize; ++i) {
const int index = mInputIndice[i];
int length = 0;
@@ -331,16 +345,17 @@ void ProximityInfoState::refreshRelativeSpeed(const int inputSize, const int *co
if (i > 0 && j < mInputIndice[i - 1]) {
break;
}
+ // TODO: use mLengthCache instead?
length += getDistanceInt(xCoordinates[j], yCoordinates[j],
xCoordinates[j + 1], yCoordinates[j + 1]);
duration += times[j + 1] - times[j];
}
if (duration == 0 || sumDuration == 0) {
// Cannot calculate speed; thus, it gives an average value (1.0);
- mRelativeSpeeds[i] = 1.0f;
+ mSpeedRates[i] = 1.0f;
} else {
const float speed = static_cast<float>(length) / static_cast<float>(duration);
- mRelativeSpeeds[i] = speed / averageSpeed;
+ mSpeedRates[i] = speed / mAverageSpeed;
}
}
@@ -351,6 +366,69 @@ void ProximityInfoState::refreshRelativeSpeed(const int inputSize, const int *co
}
}
+void ProximityInfoState::refreshBeelineSpeedRates(const int inputSize,
+ const int *const xCoordinates, const int *const yCoordinates, const int * times) {
+ mBeelineSpeedRates.resize(mSampledInputSize);
+ for (int i = 0; i < mSampledInputSize; ++i) {
+ mBeelineSpeedRates[i] = calculateBeelineSpeedRate(
+ i, inputSize, xCoordinates, yCoordinates, times);
+ }
+}
+
+float ProximityInfoState::calculateBeelineSpeedRate(
+ const int id, const int inputSize, const int *const xCoordinates,
+ const int *const yCoordinates, const int * times) const {
+ static const int MAX_PERCENTILE = 100;
+ static const int LOOKUP_TIME_PERCENTILE = 30;
+ static const int LOOKUP_RADIUS_PERCENTILE = 50;
+ if (mSampledInputSize <= 0 || mAverageSpeed < 0.1f) {
+ return 1.0f;
+ }
+ const int lookupRadius =
+ mProximityInfo->getMostCommonKeyWidth() * LOOKUP_RADIUS_PERCENTILE / MAX_PERCENTILE;
+ const int x0 = mSampledInputXs[id];
+ const int y0 = mSampledInputYs[id];
+ const int lookupTime =
+ (mTimes.back() - mTimes.front()) * LOOKUP_TIME_PERCENTILE / MAX_PERCENTILE;
+ if (lookupTime <= 0) {
+ return 1.0f;
+ }
+ int tempTime = 0;
+ int tempBeelineDistance = 0;
+ int start = mInputIndice[id];
+ // lookup forward
+ while (start > 0 && tempTime < lookupTime && tempBeelineDistance < lookupRadius) {
+ tempTime += times[start] - times[start - 1];
+ --start;
+ tempBeelineDistance = getDistanceInt(x0, y0, xCoordinates[start], yCoordinates[start]);
+ }
+ tempTime= 0;
+ tempBeelineDistance = 0;
+ int end = mInputIndice[id];
+ // lookup backward
+ while (end < static_cast<int>(inputSize - 1) && tempTime < lookupTime
+ && tempBeelineDistance < lookupRadius) {
+ tempTime += times[end + 1] - times[end];
+ ++end;
+ tempBeelineDistance = getDistanceInt(x0, y0, xCoordinates[start], yCoordinates[start]);
+ }
+
+ if (start == end) {
+ return 1.0f;
+ }
+
+ const int x2 = xCoordinates[start];
+ const int y2 = yCoordinates[start];
+ const int x3 = xCoordinates[end];
+ const int y3 = yCoordinates[end];
+ const int beelineDistance = getDistanceInt(x2, y2, x3, y3);
+ const int time = times[end] - times[start];
+ if (time <= 0) {
+ return 1.0f;
+ }
+ return (static_cast<float>(beelineDistance) / static_cast<float>(time)) / mAverageSpeed;
+}
+
bool ProximityInfoState::checkAndReturnIsContinuationPossible(const int inputSize,
const int *const xCoordinates, const int *const yCoordinates, const int *const times) {
for (int i = 0; i < mSampledInputSize; ++i) {
@@ -777,7 +855,7 @@ void ProximityInfoState::updateAlignPointProbabilities(const int start) {
float skipProbability = MAX_SKIP_PROBABILITY;
const float currentAngle = getPointAngle(i);
- const float relativeSpeed = getRelativeSpeed(i);
+ const float speedRate = getSpeedRate(i);
float nearestKeyDistance = static_cast<float>(MAX_POINT_TO_KEY_LENGTH);
for (int j = 0; j < keyCount; ++j) {
@@ -801,19 +879,19 @@ void ProximityInfoState::updateAlignPointProbabilities(const int start) {
skipProbability *= SKIP_LAST_POINT_PROBABILITY;
} else {
// If the current speed is relatively slower than adjacent keys, we promote this point.
- if (getRelativeSpeed(i - 1) - SPEED_MARGIN > relativeSpeed
- && relativeSpeed < getRelativeSpeed(i + 1) - SPEED_MARGIN) {
+ if (getSpeedRate(i - 1) - SPEED_MARGIN > speedRate
+ && speedRate < getSpeedRate(i + 1) - SPEED_MARGIN) {
if (currentAngle < CORNER_ANGLE_THRESHOLD) {
- skipProbability *= min(1.0f, relativeSpeed
+ skipProbability *= min(1.0f, speedRate
* SLOW_STRAIGHT_WEIGHT_FOR_SKIP_PROBABILITY);
} else {
// If the angle is small enough, we promote this point more. (e.g. pit vs put)
- skipProbability *= min(1.0f, relativeSpeed * SPEED_WEIGHT_FOR_SKIP_PROBABILITY
+ skipProbability *= min(1.0f, speedRate * SPEED_WEIGHT_FOR_SKIP_PROBABILITY
+ MIN_SPEED_RATE_FOR_SKIP_PROBABILITY);
}
}
- skipProbability *= min(1.0f, relativeSpeed * nearestKeyDistance *
+ skipProbability *= min(1.0f, speedRate * nearestKeyDistance *
NEAREST_DISTANCE_WEIGHT + NEAREST_DISTANCE_BIAS);
// Adjusts skip probability by a rate depending on angle.
@@ -850,10 +928,10 @@ void ProximityInfoState::updateAlignPointProbabilities(const int start) {
static const float MAX_SPEEDxNEAREST_RATE_FOR_STANDERD_DIVIATION = 0.15f;
static const float MIN_STANDERD_DIVIATION = 0.37f;
- const float speedxAngleRate = min(relativeSpeed * currentAngle / M_PI_F
+ const float speedxAngleRate = min(speedRate * currentAngle / M_PI_F
* SPEEDxANGLE_WEIGHT_FOR_STANDARD_DIVIATION,
MAX_SPEEDxANGLE_RATE_FOR_STANDERD_DIVIATION);
- const float speedxNearestKeyDistanceRate = min(relativeSpeed * nearestKeyDistance
+ const float speedxNearestKeyDistanceRate = min(speedRate * nearestKeyDistance
* SPEEDxNEAREST_WEIGHT_FOR_STANDARD_DIVIATION,
MAX_SPEEDxNEAREST_RATE_FOR_STANDERD_DIVIATION);
const float sigma = speedxAngleRate + speedxNearestKeyDistanceRate + MIN_STANDERD_DIVIATION;
@@ -932,7 +1010,7 @@ void ProximityInfoState::updateAlignPointProbabilities(const int start) {
std::stringstream sstream;
sstream << i << ", ";
sstream << "(" << mSampledInputXs[i] << ", " << mSampledInputYs[i] << "), ";
- sstream << "Speed: "<< getRelativeSpeed(i) << ", ";
+ sstream << "Speed: "<< getSpeedRate(i) << ", ";
sstream << "Angle: "<< getPointAngle(i) << ", \n";
for (hash_map_compat<int, float>::iterator it = mCharProbabilities[i].begin();
@@ -1066,5 +1144,4 @@ float ProximityInfoState::getProbability(const int index, const int keyIndex) co
}
return static_cast<float>(MAX_POINT_TO_KEY_LENGTH);
}
-
} // namespace latinime
diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h
index 79dd5be53..97281af1c 100644
--- a/native/jni/src/proximity_info_state.h
+++ b/native/jni/src/proximity_info_state.h
@@ -25,6 +25,7 @@
#include "char_utils.h"
#include "defines.h"
+#include "geometry_utils.h"
#include "hash_map_compat.h"
namespace latinime {
@@ -51,13 +52,13 @@ class ProximityInfoState {
// Defined here //
/////////////////////////////////////////
AK_FORCE_INLINE ProximityInfoState()
- : mProximityInfo(0), mMaxPointToKeyLength(0),
+ : mProximityInfo(0), mMaxPointToKeyLength(0.0f), mAverageSpeed(0.0f),
mHasTouchPositionCorrectionData(false), mMostCommonKeyWidthSquare(0), mLocaleStr(),
mKeyCount(0), mCellHeight(0), mCellWidth(0), mGridHeight(0), mGridWidth(0),
mIsContinuationPossible(false), mSampledInputXs(), mSampledInputYs(), mTimes(),
- mInputIndice(), mDistanceCache(), mLengthCache(), mRelativeSpeeds(), mDirections(),
- mCharProbabilities(), mNearKeysVector(), mSearchKeysVector(),
- mTouchPositionCorrectionEnabled(false), mSampledInputSize(0) {
+ mInputIndice(), mLengthCache(), mDistanceCache(), mSpeedRates(),
+ mDirections(), mBeelineSpeedRates(), mCharProbabilities(), mNearKeysVector(),
+ mSearchKeysVector(), mTouchPositionCorrectionEnabled(false), mSampledInputSize(0) {
memset(mInputCodes, 0, sizeof(mInputCodes));
memset(mNormalizedSquaredDistances, 0, sizeof(mNormalizedSquaredDistances));
memset(mPrimaryInputWord, 0, sizeof(mPrimaryInputWord));
@@ -162,8 +163,12 @@ class ProximityInfoState {
int32_t getAllPossibleChars(
const size_t startIndex, int32_t *const filter, const int32_t filterSize) const;
- float getRelativeSpeed(const int index) const {
- return mRelativeSpeeds[index];
+ float getSpeedRate(const int index) const {
+ return mSpeedRates[index];
+ }
+
+ AK_FORCE_INLINE float getBeelineSpeedRate(const int id) const {
+ return mBeelineSpeedRates[id];
}
float getDirection(const int index) const {
@@ -228,12 +233,17 @@ class ProximityInfoState {
void popInputData();
void updateAlignPointProbabilities(const int start);
bool suppressCharProbabilities(const int index1, const int index2);
- void refreshRelativeSpeed(const int inputSize, const int *const xCoordinates,
+ void refreshSpeedRates(const int inputSize, const int *const xCoordinates,
const int *const yCoordinates, const int *const times, const int lastSavedInputSize);
+ void refreshBeelineSpeedRates(const int inputSize,
+ const int *const xCoordinates, const int *const yCoordinates, const int * times);
+ float calculateBeelineSpeedRate(const int id, const int inputSize,
+ const int *const xCoordinates, const int *const yCoordinates, const int * times) const;
// const
const ProximityInfo *mProximityInfo;
float mMaxPointToKeyLength;
+ float mAverageSpeed;
bool mHasTouchPositionCorrectionData;
int mMostCommonKeyWidthSquare;
std::string mLocaleStr;
@@ -248,10 +258,11 @@ class ProximityInfoState {
std::vector<int> mSampledInputYs;
std::vector<int> mTimes;
std::vector<int> mInputIndice;
+ std::vector<int> mLengthCache;
std::vector<float> mDistanceCache;
- std::vector<int> mLengthCache;
- std::vector<float> mRelativeSpeeds;
+ std::vector<float> mSpeedRates;
std::vector<float> mDirections;
+ std::vector<float> mBeelineSpeedRates;
// probabilities of skipping or mapping to a key for each point.
std::vector<hash_map_compat<int, float> > mCharProbabilities;
// The vector for the key code set which holds nearby keys for each sampled input point
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-29 10:53:16 +0000