diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-01-21 18:29:27 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2013-01-21 22:06:54 +0900 |
| commit | ee62b78c9675bddaf2437e0cf521f6115e1d9feb (patch) | |
| tree | fbbf031cca26288828ab7f51012e43b650079540 /native/jni/src/proximity_info_state.h | |
| parent | 26a0c628b0723b2c6b7700eb0b3af3548cf312b7 (diff) | |
| download | latinime-ee62b78c9675bddaf2437e0cf521f6115e1d9feb.tar.gz latinime-ee62b78c9675bddaf2437e0cf521f6115e1d9feb.tar.xz latinime-ee62b78c9675bddaf2437e0cf521f6115e1d9feb.zip | |
Refactor proximity info
Change-Id: I668e6abfe202e1a56d59b6b6e58d1b4f003b720a
Diffstat (limited to 'native/jni/src/proximity_info_state.h')
| -rw-r--r-- | native/jni/src/proximity_info_state.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h index 0f0eb7d39..d31447ead 100644 --- a/native/jni/src/proximity_info_state.h +++ b/native/jni/src/proximity_info_state.h @@ -24,6 +24,7 @@ #include "char_utils.h" #include "defines.h" #include "hash_map_compat.h" +#include "proximity_info_params.h" #include "proximity_info_state_utils.h" namespace latinime { @@ -37,10 +38,6 @@ class ProximityInfoState { static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR; static const float NOT_A_DISTANCE_FLOAT; static const int NOT_A_CODE; - static const int LOOKUP_RADIUS_PERCENTILE; - static const int FIRST_POINT_TIME_OFFSET_MILLIS; - static const int STRONG_DOUBLE_LETTER_TIME_MILLIS; - static const int MIN_DOUBLE_LETTER_BEELINE_SPEED_PERCENTILE; ///////////////////////////////////////// // Defined in proximity_info_state.cpp // @@ -180,7 +177,8 @@ class ProximityInfoState { const int beelineSpeedRate = getBeelineSpeedPercentile(id); if (beelineSpeedRate == 0) { return A_STRONG_DOUBLE_LETTER; - } else if (beelineSpeedRate < MIN_DOUBLE_LETTER_BEELINE_SPEED_PERCENTILE) { + } else if (beelineSpeedRate + < ProximityInfoParams::MIN_DOUBLE_LETTER_BEELINE_SPEED_PERCENTILE) { return A_DOUBLE_LETTER; } else { return NOT_A_DOUBLE_LETTER; @@ -249,10 +247,6 @@ class ProximityInfoState { void popInputData(); void updateAlignPointProbabilities(const int start); bool suppressCharProbabilities(const int index1, const int index2); - 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; |