am 5d1c5f96: am 47684fb6: Merge "Using isSkippableChar instead of \'\'\' and \'-\'." into jb-mr1-dev

* commit '5d1c5f9653c68480d2f9b7ce4b4f3451148a6205':
  Using isSkippableChar instead of '\'' and '-'.
main
Ken Wakasa 2012-09-14 10:31:08 -07:00 committed by Android Git Automerger
commit c10a5b967b
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) {
int quoteCount = 0;
for (int i = 0; i < length; ++i) {
if (word[i] == '\'') {
if (word[i] == SINGLE_QUOTE) {
++quoteCount;
}
}

View File

@ -27,6 +27,11 @@ namespace latinime {
class Correction;
inline bool isSkippableChar(const uint16_t character) {
// TODO: Do not hardcode here
return character == '\'' || character == '-';
}
class ProximityInfo {
public:
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;
return min(mDistanceCache[index] * scale, mMaxPointToKeyLength);
}
// TODO: Do not hardcode here
// No penalty to ' and -
if (codePoint == '\'' || codePoint == '-') {
if (isSkippableChar(codePoint)) {
return 0;
}
// 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);
}
static const char QUOTE = '\'';
static const char SPACE = ' ';
void UnigramDictionary::getOneWordSuggestions(ProximityInfo *proximityInfo,