Merge "Add whitelist dictionary" into honeycomb-mr1
diff --git a/native/src/defines.h b/native/src/defines.h
index a81aa49..00cbb6c 100644
--- a/native/src/defines.h
+++ b/native/src/defines.h
@@ -138,7 +138,7 @@
#define SUGGEST_WORDS_WITH_SPACE_PROXIMITY true
// The following "rate"s are used as a multiplier before dividing by 100, so they are in percent.
-#define WORDS_WITH_MISSING_CHARACTER_DEMOTION_RATE 100
+#define WORDS_WITH_MISSING_CHARACTER_DEMOTION_RATE 70
#define WORDS_WITH_MISSING_SPACE_CHARACTER_DEMOTION_RATE 80
#define WORDS_WITH_EXCESSIVE_CHARACTER_DEMOTION_RATE 75
#define WORDS_WITH_EXCESSIVE_CHARACTER_OUT_OF_PROXIMITY_DEMOTION_RATE 75
diff --git a/native/src/unigram_dictionary.cpp b/native/src/unigram_dictionary.cpp
index c2cd760..30fbaea 100644
--- a/native/src/unigram_dictionary.cpp
+++ b/native/src/unigram_dictionary.cpp
@@ -521,7 +521,7 @@
finalFreq = capped255MultForFullMatchAccentsOrCapitalizationDifference(finalFreq);
}
}
- if (sameLength && skipPos < 0) finalFreq *= FULL_WORD_MULTIPLIER;
+ if (sameLength) finalFreq *= FULL_WORD_MULTIPLIER;
return finalFreq;
}