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

am 4caf5941: Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1 

* commit '4caf594198654ff2604b9cabc604e8a837f3d7a1':
  Follow up to I907150be994c4f9ffc030c063de521eeb177d3e1
main
Ken Wakasa 2013-06-03 03:20:40 -07:00 committed by Android Git Automerger
parent 31bd7b1770 4caf594198
commit 887b635dc4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/jni/src/defines.h
View File

@ -289,7 +289,6 @@ static inline void prof_out(void) {
#define CALIBRATE_SCORE_BY_TOUCH_COORDINATES true #define CALIBRATE_SCORE_BY_TOUCH_COORDINATES true
#define SUGGEST_MULTIPLE_WORDS true #define SUGGEST_MULTIPLE_WORDS true
#define USE_SUGGEST_INTERFACE_FOR_TYPING true
#define SUGGEST_INTERFACE_OUTPUT_SCALE 1000000.0f #define SUGGEST_INTERFACE_OUTPUT_SCALE 1000000.0f
// The following "rate"s are used as a multiplier before dividing by 100, so they are in percent. // The following "rate"s are used as a multiplier before dividing by 100, so they are in percent.

8
native/jni/src/obsolete/correction.cpp
View File

@ -918,11 +918,15 @@ inline static bool isUpperCase(unsigned short c) {
// In dictionary.cpp, getSuggestion() method, // In dictionary.cpp, getSuggestion() method,
// When USE_SUGGEST_INTERFACE_FOR_TYPING is true: // When USE_SUGGEST_INTERFACE_FOR_TYPING is true:
//
// // TODO: Revise the following logic thoroughly by referring to the logic
// // marked as "Otherwise" below.
// SUGGEST_INTERFACE_OUTPUT_SCALE was multiplied to the original suggestion scores to convert // SUGGEST_INTERFACE_OUTPUT_SCALE was multiplied to the original suggestion scores to convert
// them to integers. // them to integers.
// score = (int)((original score) * SUGGEST_INTERFACE_OUTPUT_SCALE) // score = (int)((original score) * SUGGEST_INTERFACE_OUTPUT_SCALE)
// Undo the scaling here to recover the original score. // Undo the scaling here to recover the original score.
// normalizedScore = ((float)score) / SUGGEST_INTERFACE_OUTPUT_SCALE // normalizedScore = ((float)score) / SUGGEST_INTERFACE_OUTPUT_SCALE
//
// Otherwise: suggestion scores are computed using the below formula. // Otherwise: suggestion scores are computed using the below formula.
// original score // original score
// := powf(mTypedLetterMultiplier (this is defined 2), // := powf(mTypedLetterMultiplier (this is defined 2),
@ -965,9 +969,11 @@ inline static bool isUpperCase(unsigned short c) {
// so, 0 <= distance / afterLength <= 1 // so, 0 <= distance / afterLength <= 1
const float weight = 1.0f - static_cast<float>(distance) / static_cast<float>(afterLength); const float weight = 1.0f - static_cast<float>(distance) / static_cast<float>(afterLength);
if (USE_SUGGEST_INTERFACE_FOR_TYPING) { // TODO: Revise the following logic thoroughly by referring to...
if (true /* USE_SUGGEST_INTERFACE_FOR_TYPING */) {
return (static_cast<float>(score) / SUGGEST_INTERFACE_OUTPUT_SCALE) * weight; return (static_cast<float>(score) / SUGGEST_INTERFACE_OUTPUT_SCALE) * weight;
} }
// ...this logic.
const float maxScore = score >= S_INT_MAX ? static_cast<float>(S_INT_MAX) const float maxScore = score >= S_INT_MAX ? static_cast<float>(S_INT_MAX)
: static_cast<float>(MAX_INITIAL_SCORE) : static_cast<float>(MAX_INITIAL_SCORE)
* powf(static_cast<float>(TYPED_LETTER_MULTIPLIER), * powf(static_cast<float>(TYPED_LETTER_MULTIPLIER),