Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4437f4 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Rename updateCounter to updateEntriesForWordWithNgramContext. 

Bug: 14425059
Change-Id: Id9b0dd7e32c711ed4292981517c3febd5fe9e897
parent d7a51c24

java/src/com/android/inputmethod/latin/BinaryDictionary.java

+2 −3
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ public final class BinaryDictionary extends Dictionary { 
            int[] word, int probability, int timestamp);

    private static native boolean removeNgramEntryNative(long dict,

            int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray, int[] word);

    // TODO: Rename to updateEntriesForWordWithNgramContextNative.

    private static native boolean updateCounterNative(long dict,

    private static native boolean updateEntriesForWordWithNgramContextNative(long dict,

            int[][] prevWordCodePointArrays, boolean[] isBeginningOfSentenceArray,

            int[] word, boolean isValidWord, int count, int timestamp);

    private static native int addMultipleDictionaryEntriesNative(long dict,
@@ -512,7 +511,7 @@ public final class BinaryDictionary extends Dictionary { 
        final boolean[] isBeginningOfSentenceArray = new boolean[ngramContext.getPrevWordCount()];

        ngramContext.outputToArray(prevWordCodePointArrays, isBeginningOfSentenceArray);

        final int[] wordCodePoints = StringUtils.toCodePointArray(word);

        if (!updateCounterNative(mNativeDict, prevWordCodePointArrays,

        if (!updateEntriesForWordWithNgramContextNative(mNativeDict, prevWordCodePointArrays,

                isBeginningOfSentenceArray, wordCodePoints, isValidWord, count, timestamp)) {

            return false;

        }

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+7 −6
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ static bool latinime_BinaryDictionary_removeNgramEntry(JNIEnv *env, jclass clazz 
            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) {

static bool latinime_BinaryDictionary_updateEntriesForWordWithNgramContext(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;
@@ -445,7 +446,7 @@ static bool latinime_BinaryDictionary_updateCounter(JNIEnv *env, jclass clazz, j 
    int wordCodePoints[codePointCount];

    env->GetIntArrayRegion(word, 0, codePointCount, wordCodePoints);

    const HistoricalInfo historicalInfo(timestamp, 0 /* level */, count);

    return dictionary->updateCounter(&prevWordsInfo,

    return dictionary->updateEntriesForWordWithNgramContext(&prevWordsInfo,

            CodePointArrayView(wordCodePoints, codePointCount), isValidWord == JNI_TRUE,

            historicalInfo);

}
@@ -749,9 +750,9 @@ static const JNINativeMethod sMethods[] = { 
        reinterpret_cast<void *>(latinime_BinaryDictionary_removeNgramEntry)

    },

    {

        const_cast<char *>("updateCounterNative"),

        const_cast<char *>("updateEntriesForWordWithNgramContextNative"),

        const_cast<char *>("(J[[I[Z[IZII)Z"),

        reinterpret_cast<void *>(latinime_BinaryDictionary_updateCounter)

        reinterpret_cast<void *>(latinime_BinaryDictionary_updateEntriesForWordWithNgramContext)

    },

    {

        const_cast<char *>("addMultipleDictionaryEntriesNative"),

native/jni/src/suggest/core/dictionary/dictionary.cpp

+3 −3
Original line number Diff line number Diff line
@@ -152,12 +152,12 @@ bool Dictionary::removeNgramEntry(const PrevWordsInfo *const prevWordsInfo, 
    return mDictionaryStructureWithBufferPolicy->removeNgramEntry(prevWordsInfo, codePoints);

}



bool Dictionary::updateCounter(const PrevWordsInfo *const prevWordsInfo,

bool Dictionary::updateEntriesForWordWithNgramContext(const PrevWordsInfo *const prevWordsInfo,

        const CodePointArrayView codePoints, const bool isValidWord,

        const HistoricalInfo historicalInfo) {

    TimeKeeper::setCurrentTime();

    return mDictionaryStructureWithBufferPolicy->updateCounter(prevWordsInfo, codePoints,

            isValidWord, historicalInfo);

    return mDictionaryStructureWithBufferPolicy->updateEntriesForWordWithNgramContext(prevWordsInfo,

            codePoints, isValidWord, historicalInfo);

}



bool Dictionary::flush(const char *const filePath) {

native/jni/src/suggest/core/dictionary/dictionary.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class Dictionary { 
    bool removeNgramEntry(const PrevWordsInfo *const prevWordsInfo,

            const CodePointArrayView codePoints);



    bool updateCounter(const PrevWordsInfo *const prevWordsInfo,

    bool updateEntriesForWordWithNgramContext(const PrevWordsInfo *const prevWordsInfo,

            const CodePointArrayView codePoints, const bool isValidWord,

            const HistoricalInfo historicalInfo);

native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class DictionaryStructureWithBufferPolicy { 
            const CodePointArrayView wordCodePoints) = 0;



    // Returns whether the update was success or not.

    virtual bool updateCounter(const PrevWordsInfo *const prevWordsInfo,

    virtual bool updateEntriesForWordWithNgramContext(const PrevWordsInfo *const prevWordsInfo,

            const CodePointArrayView wordCodePoints, const bool isValidWord,

            const HistoricalInfo historicalInfo) = 0;