Using isSkippableChar instead of '\'' and '-'.

Change-Id: I295a72b683b2ebc28a006baa66baf7e1b97100eb
main
Keisuke Kuroyanagi 2012-09-14 18:03:10 +09:00
parent 6f8dfd92b1
commit 1cd7ca9919
4 changed files with 7 additions and 5 deletions

View File

@ -631,7 +631,7 @@ Correction::CorrectionType Correction::processCharAndCalcState(
inline static int getQuoteCount(const unsigned short *word, const int length) { inline static int getQuoteCount(const unsigned short *word, const int length) {
int quoteCount = 0; int quoteCount = 0;
for (int i = 0; i < length; ++i) { for (int i = 0; i < length; ++i) {
if (word[i] == '\'') { if (word[i] == SINGLE_QUOTE) {
++quoteCount; ++quoteCount;
} }
} }

View File

@ -27,6 +27,11 @@ namespace latinime {
class Correction; class Correction;
inline bool isSkippableChar(const uint16_t character) {
// TODO: Do not hardcode here
return character == '\'' || character == '-';
}
class ProximityInfo { class ProximityInfo {
public: public:
ProximityInfo(JNIEnv *env, const jstring localeJStr, const int maxProximityCharsSize, ProximityInfo(JNIEnv *env, const jstring localeJStr, const int maxProximityCharsSize,

View File

@ -469,9 +469,7 @@ float ProximityInfoState::getPointToKeyLength(const int inputIndex, const int co
const int index = inputIndex * mProximityInfo->getKeyCount() + keyId; const int index = inputIndex * mProximityInfo->getKeyCount() + keyId;
return min(mDistanceCache[index] * scale, mMaxPointToKeyLength); return min(mDistanceCache[index] * scale, mMaxPointToKeyLength);
} }
// TODO: Do not hardcode here if (isSkippableChar(codePoint)) {
// No penalty to ' and -
if (codePoint == '\'' || codePoint == '-') {
return 0; return 0;
} }
// If the char is not a key on the keyboard then return the max length. // If the char is not a key on the keyboard then return the max length.

View File

@ -314,7 +314,6 @@ void UnigramDictionary::initSuggestions(ProximityInfo *proximityInfo, const int
correction->initCorrection(proximityInfo, inputSize, maxDepth); correction->initCorrection(proximityInfo, inputSize, maxDepth);
} }
static const char QUOTE = '\'';
static const char SPACE = ' '; static const char SPACE = ' ';
void UnigramDictionary::getOneWordSuggestions(ProximityInfo *proximityInfo, void UnigramDictionary::getOneWordSuggestions(ProximityInfo *proximityInfo,