diff options
author | 2014-09-29 03:06:25 +0000 | |
---|---|---|
committer | 2014-09-29 03:06:25 +0000 | |
commit | 895cbb76ba139950e5e06a95b92be78404a2b34f (patch) | |
tree | f8153aa00eece290c6be29ffdf205fccf2f71ef0 /java/src/com/android/inputmethod/latin/DictionaryCollection.java | |
parent | 97d271664730c1ba9d52f7ea5798b5f455952ebd (diff) | |
parent | a4a4e9d96bfb0f41fe04abb28d8be49d7d780cbe (diff) | |
download | latinime-895cbb76ba139950e5e06a95b92be78404a2b34f.tar.gz latinime-895cbb76ba139950e5e06a95b92be78404a2b34f.tar.xz latinime-895cbb76ba139950e5e06a95b92be78404a2b34f.zip |
am a4a4e9d9: Merge "Rename PrevWordsInfo to NgramContext."
* commit 'a4a4e9d96bfb0f41fe04abb28d8be49d7d780cbe':
Rename PrevWordsInfo to NgramContext.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryCollection.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/com/android/inputmethod/latin/DictionaryCollection.java index b26b37817..a6d7205e2 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java +++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java @@ -60,7 +60,7 @@ public final class DictionaryCollection extends Dictionary { @Override public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer, - final PrevWordsInfo prevWordsInfo, final ProximityInfo proximityInfo, + final NgramContext ngramContext, final ProximityInfo proximityInfo, final SettingsValuesForSuggestion settingsValuesForSuggestion, final int sessionId, final float weightForLocale, final float[] inOutWeightOfLangModelVsSpatialModel) { @@ -69,13 +69,13 @@ public final class DictionaryCollection extends Dictionary { // To avoid creating unnecessary objects, we get the list out of the first // dictionary and add the rest to it if not null, hence the get(0) ArrayList<SuggestedWordInfo> suggestions = dictionaries.get(0).getSuggestions(composer, - prevWordsInfo, proximityInfo, settingsValuesForSuggestion, sessionId, + ngramContext, proximityInfo, settingsValuesForSuggestion, sessionId, weightForLocale, inOutWeightOfLangModelVsSpatialModel); if (null == suggestions) suggestions = new ArrayList<>(); final int length = dictionaries.size(); for (int i = 1; i < length; ++ i) { final ArrayList<SuggestedWordInfo> sugg = dictionaries.get(i).getSuggestions(composer, - prevWordsInfo, proximityInfo, settingsValuesForSuggestion, sessionId, + ngramContext, proximityInfo, settingsValuesForSuggestion, sessionId, weightForLocale, inOutWeightOfLangModelVsSpatialModel); if (null != sugg) suggestions.addAll(sugg); } |