am f116f910: Making spelling of the word "distracters" consistent

* commit 'f116f9103377866c3a1e5d2b03907bbfead2970b':
  Making spelling of the word "distracters" consistent
main
Adrian Velicu 2014-09-17 09:27:14 +00:00 committed by Android Git Automerger
commit de1d56fe0e
3 changed files with 8 additions and 8 deletions

View File

@ -235,7 +235,7 @@ public final class Suggest {
SuggestedWordInfo.removeDups(null /* typedWord */, suggestionsContainer); SuggestedWordInfo.removeDups(null /* typedWord */, suggestionsContainer);
// For some reason some suggestions with MIN_VALUE are making their way here. // For some reason some suggestions with MIN_VALUE are making their way here.
// TODO: Find a more robust way to detect distractors. // TODO: Find a more robust way to detect distracters.
for (int i = suggestionsContainer.size() - 1; i >= 0; --i) { for (int i = suggestionsContainer.size() - 1; i >= 0; --i) {
if (suggestionsContainer.get(i).mScore < SUPPRESS_SUGGEST_THRESHOLD) { if (suggestionsContainer.get(i).mScore < SUPPRESS_SUGGEST_THRESHOLD) {
suggestionsContainer.remove(i); suggestionsContainer.remove(i);

View File

@ -64,9 +64,9 @@ public class DistracterFilterCheckingExactMatchesAndSuggestions implements Distr
private final Object mLock = new Object(); private final Object mLock = new Object();
// If the score of the top suggestion exceeds this value, the tested word (e.g., // If the score of the top suggestion exceeds this value, the tested word (e.g.,
// an OOV, a misspelling, or an in-vocabulary word) would be considered as a distractor to // an OOV, a misspelling, or an in-vocabulary word) would be considered as a distracter to
// words in dictionary. The greater the threshold is, the less likely the tested word would // words in dictionary. The greater the threshold is, the less likely the tested word would
// become a distractor, which means the tested word will be more likely to be added to // become a distracter, which means the tested word will be more likely to be added to
// the dictionary. // the dictionary.
private static final float DISTRACTER_WORD_SCORE_THRESHOLD = 0.4f; private static final float DISTRACTER_WORD_SCORE_THRESHOLD = 0.4f;
@ -196,7 +196,7 @@ public class DistracterFilterCheckingExactMatchesAndSuggestions implements Distr
} }
final boolean Word = dictionaryFacilitator.isValidWord(testedWord, false /* ignoreCase */); final boolean Word = dictionaryFacilitator.isValidWord(testedWord, false /* ignoreCase */);
if (Word) { if (Word) {
// Valid word is not a distractor. // Valid word is not a distracter.
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "isDistracter: false (valid word)"); Log.d(TAG, "isDistracter: false (valid word)");
} }
@ -257,12 +257,12 @@ public class DistracterFilterCheckingExactMatchesAndSuggestions implements Distr
return false; return false;
} }
final SuggestedWordInfo firstSuggestion = suggestionResults.first(); final SuggestedWordInfo firstSuggestion = suggestionResults.first();
final boolean isDistractor = suggestionExceedsDistracterThreshold( final boolean isDistracter = suggestionExceedsDistracterThreshold(
firstSuggestion, consideredWord, DISTRACTER_WORD_SCORE_THRESHOLD); firstSuggestion, consideredWord, DISTRACTER_WORD_SCORE_THRESHOLD);
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "isDistracter: " + isDistractor); Log.d(TAG, "isDistracter: " + isDistracter);
} }
return isDistractor; return isDistracter;
} }
private static boolean suggestionExceedsDistracterThreshold(final SuggestedWordInfo suggestion, private static boolean suggestionExceedsDistracterThreshold(final SuggestedWordInfo suggestion,

View File

@ -57,7 +57,7 @@ public class DistracterFilterTest extends AndroidTestCase {
mDistracterFilter.close(); mDistracterFilter.close();
} }
public void testIsDistractorToWordsInDictionaries() { public void testIsDistracterToWordsInDictionaries() {
final PrevWordsInfo EMPTY_PREV_WORDS_INFO = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; final PrevWordsInfo EMPTY_PREV_WORDS_INFO = PrevWordsInfo.EMPTY_PREV_WORDS_INFO;
final Locale localeEnUs = new Locale("en", "US"); final Locale localeEnUs = new Locale("en", "US");