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

Commit be4d85fe authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by Android (Google) Code Review
Browse files

Merge "Fix bug and Add large test for decaying dictionary."

parents 69d10385 cfb018ba

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

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ public final class BinaryDictionary extends Dictionary { 
    public static final String UNIGRAM_COUNT_QUERY = "UNIGRAM_COUNT";

    @UsedForTesting

    public static final String BIGRAM_COUNT_QUERY = "BIGRAM_COUNT";

    @UsedForTesting

    public static final String MAX_UNIGRAM_COUNT_QUERY = "MAX_UNIGRAM_COUNT";

    @UsedForTesting

    public static final String MAX_BIGRAM_COUNT_QUERY = "MAX_BIGRAM_COUNT";



    private long mNativeDict;

    private final Locale mLocale;

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_gc_event_listeners.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ bool DynamicPatriciaTrieGcEventListeners 
            return false;

        }

        if (!ForgettingCurveUtils::isValidEncodedProbability(newProbability)) {

            isUselessPtNode = false;

            isUselessPtNode = true;

        }

    }

    if (mChildrenValue > 0) {

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_gc_event_listeners.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ class DynamicPatriciaTrieGcEventListeners { 


        bool onDescend(const int ptNodeArrayPos) {

            mValueStack.push_back(0);

            mChildrenValue = 0;

            return true;

        }

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.cpp

+10 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ namespace latinime { 
// BinaryDictionaryDecayingTests.

const char *const DynamicPatriciaTriePolicy::UNIGRAM_COUNT_QUERY = "UNIGRAM_COUNT";

const char *const DynamicPatriciaTriePolicy::BIGRAM_COUNT_QUERY = "BIGRAM_COUNT";

const char *const DynamicPatriciaTriePolicy::MAX_UNIGRAM_COUNT_QUERY = "MAX_UNIGRAM_COUNT";

const char *const DynamicPatriciaTriePolicy::MAX_BIGRAM_COUNT_QUERY = "MAX_BIGRAM_COUNT";

const char *const DynamicPatriciaTriePolicy::SET_NEEDS_TO_DECAY_FOR_TESTING_QUERY =

        "SET_NEEDS_TO_DECAY_FOR_TESTING";

const int DynamicPatriciaTriePolicy::MAX_DICT_EXTENDED_REGION_SIZE = 1024 * 1024;
@@ -355,6 +357,14 @@ void DynamicPatriciaTriePolicy::getProperty(const char *const query, char *const 
        snprintf(outResult, maxResultLength, "%d", mUnigramCount);

    } else if (strncmp(query, BIGRAM_COUNT_QUERY, maxResultLength) == 0) {

        snprintf(outResult, maxResultLength, "%d", mBigramCount);

    } else if (strncmp(query, MAX_UNIGRAM_COUNT_QUERY, maxResultLength) == 0) {

        snprintf(outResult, maxResultLength, "%d",

                mHeaderPolicy.isDecayingDict() ? ForgettingCurveUtils::MAX_UNIGRAM_COUNT :

                        DynamicPatriciaTrieWritingHelper::MAX_DICTIONARY_SIZE);

    } else if (strncmp(query, MAX_BIGRAM_COUNT_QUERY, maxResultLength) == 0) {

        snprintf(outResult, maxResultLength, "%d",

                mHeaderPolicy.isDecayingDict() ? ForgettingCurveUtils::MAX_BIGRAM_COUNT :

                        DynamicPatriciaTrieWritingHelper::MAX_DICTIONARY_SIZE);

    } else if (strncmp(query, SET_NEEDS_TO_DECAY_FOR_TESTING_QUERY, maxResultLength) == 0) {

        mNeedsToDecayForTesting = true;

    }

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ class DynamicPatriciaTriePolicy : public DictionaryStructureWithBufferPolicy { 


    static const char *const UNIGRAM_COUNT_QUERY;

    static const char *const BIGRAM_COUNT_QUERY;

    static const char *const MAX_UNIGRAM_COUNT_QUERY;

    static const char *const MAX_BIGRAM_COUNT_QUERY;

    static const char *const SET_NEEDS_TO_DECAY_FOR_TESTING_QUERY;

    static const int MAX_DICT_EXTENDED_REGION_SIZE;

    static const int MIN_DICT_SIZE_TO_REFUSE_DYNAMIC_OPERATIONS;