nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add jni method to update entries for a word efficiently."

Browse source
This commit is contained in:
Keisuke Kuroyanagi 2014-10-01 08:57:02 +00:00 committed by Android (Google) Code Review
commit bcb439e702
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View file

@ -199,6 +199,9 @@ public final class BinaryDictionary extends Dictionary {
int[] word, int probability, int timestamp); int[] word, int probability, int timestamp);
private static native boolean removeNgramEntryNative(long dict, private static native boolean removeNgramEntryNative(long dict,
int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray, int[] word); int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray, int[] word);
private static native boolean updateCounterNative(long dict,
int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray,
int[] word, boolean isValidWord, int count, int timestamp);
private static native int addMultipleDictionaryEntriesNative(long dict, private static native int addMultipleDictionaryEntriesNative(long dict,
LanguageModelParam[] languageModelParams, int startIndex); LanguageModelParam[] languageModelParams, int startIndex);
private static native String getPropertyNative(long dict, String query); private static native String getPropertyNative(long dict, String query);

18
native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
View file

@ -427,6 +427,19 @@ static bool latinime_BinaryDictionary_removeNgramEntry(JNIEnv *env, jclass clazz
CodePointArrayView(wordCodePoints, codePointCount)); CodePointArrayView(wordCodePoints, codePointCount));
} }
static bool latinime_BinaryDictionary_updateCounter(JNIEnv *env, jclass clazz, jlong dict,
jobjectArray prevWordCodePointArrays, jbooleanArray isBeginningOfSentenceArray,
jintArray word, jboolean isValidWord, jint count, jint timestamp) {
Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict);
if (!dictionary) {
return false;
}
jsize wordLength = env->GetArrayLength(word);
int wordCodePoints[wordLength];
env->GetIntArrayRegion(word, 0, wordLength, wordCodePoints);
return false;
}
// Returns how many language model params are processed. // Returns how many language model params are processed.
static int latinime_BinaryDictionary_addMultipleDictionaryEntries(JNIEnv *env, jclass clazz, static int latinime_BinaryDictionary_addMultipleDictionaryEntries(JNIEnv *env, jclass clazz,
jlong dict, jobjectArray languageModelParams, jint startIndex) { jlong dict, jobjectArray languageModelParams, jint startIndex) {
@ -724,6 +737,11 @@ static const JNINativeMethod sMethods[] = {
const_cast<char *>("(J[[I[Z[I)Z"), const_cast<char *>("(J[[I[Z[I)Z"),
reinterpret_cast<void *>(latinime_BinaryDictionary_removeNgramEntry) reinterpret_cast<void *>(latinime_BinaryDictionary_removeNgramEntry)
}, },
{
const_cast<char *>("updateCounterNative"),
const_cast<char *>("(J[[I[Z[IZII)Z"),
reinterpret_cast<void *>(latinime_BinaryDictionary_updateCounter)
},
{ {
const_cast<char *>("addMultipleDictionaryEntriesNative"), const_cast<char *>("addMultipleDictionaryEntriesNative"),
const_cast<char *>( const_cast<char *>(