diff options
Diffstat (limited to 'native/jni/src/unigram_dictionary.cpp')
| -rw-r--r-- | native/jni/src/unigram_dictionary.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp index 9234b1b52..3c826e918 100644 --- a/native/jni/src/unigram_dictionary.cpp +++ b/native/jni/src/unigram_dictionary.cpp @@ -21,6 +21,7 @@ #define LOG_TAG "LatinIME: unigram_dictionary.cpp" #include "char_utils.h" +#include "defines.h" #include "dictionary.h" #include "unigram_dictionary.h" @@ -202,16 +203,17 @@ int UnigramDictionary::getSuggestions(ProximityInfo *proximityInfo, PROF_START(20); if (DEBUG_DICT) { - double ns = queuePool->getMasterQueue()->getHighestNormalizedScore( + float ns = queuePool->getMasterQueue()->getHighestNormalizedScore( proximityInfo->getPrimaryInputWord(), codesSize, 0, 0, 0); ns += 0; AKLOGI("Max normalized score = %f", ns); } const int suggestedWordsCount = - queuePool->getMasterQueue()->outputSuggestions(frequencies, outWords); + queuePool->getMasterQueue()->outputSuggestions( + proximityInfo->getPrimaryInputWord(), codesSize, frequencies, outWords); if (DEBUG_DICT) { - double ns = queuePool->getMasterQueue()->getHighestNormalizedScore( + float ns = queuePool->getMasterQueue()->getHighestNormalizedScore( proximityInfo->getPrimaryInputWord(), codesSize, 0, 0, 0); ns += 0; AKLOGI("Returning %d words", suggestedWordsCount); @@ -254,7 +256,7 @@ void UnigramDictionary::getWordSuggestions(ProximityInfo *proximityInfo, bool hasAutoCorrectionCandidate = false; WordsPriorityQueue* masterQueue = queuePool->getMasterQueue(); if (masterQueue->size() > 0) { - double nsForMaster = masterQueue->getHighestNormalizedScore( + float nsForMaster = masterQueue->getHighestNormalizedScore( proximityInfo->getPrimaryInputWord(), inputLength, 0, 0, 0); hasAutoCorrectionCandidate = (nsForMaster > START_TWO_WORDS_CORRECTION_THRESHOLD); } @@ -283,7 +285,7 @@ void UnigramDictionary::getWordSuggestions(ProximityInfo *proximityInfo, const int score = sw->mScore; const unsigned short* word = sw->mWord; const int wordLength = sw->mWordLength; - double ns = Correction::RankingAlgorithm::calcNormalizedScore( + float ns = Correction::RankingAlgorithm::calcNormalizedScore( proximityInfo->getPrimaryInputWord(), i, word, wordLength, score); ns += 0; AKLOGI("--- TOP SUB WORDS for %d --- %d %f [%d]", i, score, ns, @@ -451,7 +453,7 @@ bool UnigramDictionary::getSubStringSuggestion( return false; } int score = 0; - const double ns = queue->getHighestNormalizedScore( + const float ns = queue->getHighestNormalizedScore( proximityInfo->getPrimaryInputWord(), inputWordLength, &tempOutputWord, &score, &nextWordLength); if (DEBUG_DICT) { |