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

Commit 6ba8de2a authored by satok's avatar satok
Browse files

Good bye the proximity logic in Java code 

Bug: 4343280
Change-Id: I82f7d08703647a3492ce6e2d3b741146df58927e
parent 67094f5b

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

+5 −9
Original line number Diff line number Diff line
@@ -40,14 +40,13 @@ public class BinaryDictionary extends Dictionary { 
    public static final int MAX_WORDS = 18;



    private static final String TAG = "BinaryDictionary";

    private static final int MAX_PROXIMITY_CHARS_SIZE = ProximityInfo.MAX_PROXIMITY_CHARS_SIZE;

    private static final int MAX_BIGRAMS = 60;



    private static final int TYPED_LETTER_MULTIPLIER = 2;



    private int mDicTypeId;

    private long mNativeDict;

    private final int[] mInputCodes = new int[MAX_WORD_LENGTH * MAX_PROXIMITY_CHARS_SIZE];

    private final int[] mInputCodes = new int[MAX_WORD_LENGTH];

    private final char[] mOutputChars = new char[MAX_WORD_LENGTH * MAX_WORDS];

    private final char[] mOutputChars_bigrams = new char[MAX_WORD_LENGTH * MAX_BIGRAMS];

    private final int[] mScores = new int[MAX_WORDS];
@@ -111,8 +110,7 @@ public class BinaryDictionary extends Dictionary { 
    }



    private native long openNative(String sourceDir, long dictOffset, long dictSize,

            int typedLetterMultiplier, int fullWordMultiplier, int maxWordLength,

            int maxWords, int maxAlternatives);

            int typedLetterMultiplier, int fullWordMultiplier, int maxWordLength, int maxWords);

    private native void closeNative(long dict);

    private native boolean isValidWordNative(long dict, char[] word, int wordLength);

    private native int getSuggestionsNative(long dict, long proximityInfo, int[] xCoordinates,
@@ -120,7 +118,7 @@ public class BinaryDictionary extends Dictionary { 
            int[] scores);

    private native int getBigramsNative(long dict, char[] prevWord, int prevWordLength,

            int[] inputCodes, int inputCodesLength, char[] outputChars, int[] scores,

            int maxWordLength, int maxBigrams, int maxAlternatives);

            int maxWordLength, int maxBigrams);

    private static native double calcNormalizedScoreNative(

            char[] before, int beforeLength, char[] after, int afterLength, int score);

    private static native int editDistanceNative(
@@ -128,8 +126,7 @@ public class BinaryDictionary extends Dictionary { 


    private final void loadDictionary(String path, long startOffset, long length) {

        mNativeDict = openNative(path, startOffset, length,

                    TYPED_LETTER_MULTIPLIER, FULL_WORD_SCORE_MULTIPLIER,

                    MAX_WORD_LENGTH, MAX_WORDS, MAX_PROXIMITY_CHARS_SIZE);

                TYPED_LETTER_MULTIPLIER, FULL_WORD_SCORE_MULTIPLIER, MAX_WORD_LENGTH, MAX_WORDS);

    }



    @Override
@@ -148,8 +145,7 @@ public class BinaryDictionary extends Dictionary { 
        }



        int count = getBigramsNative(mNativeDict, chars, chars.length, mInputCodes, codesSize,

                mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS,

                MAX_PROXIMITY_CHARS_SIZE);

                mOutputChars_bigrams, mBigramScores, MAX_WORD_LENGTH, MAX_BIGRAMS);

        if (count > MAX_BIGRAMS) {

            count = MAX_BIGRAMS;

        }

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

+4 −10
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ public class WordComposer { 


    // TODO: remove input keyDetector

    public void add(int primaryCode, int x, int y, KeyDetector keyDetector) {

        final int[] codes;

        final int keyX;

        final int keyY;

        if (null == keyDetector
@@ -135,16 +134,13 @@ public class WordComposer { 
                || y == KeyboardActionListener.SUGGESTION_STRIP_COORDINATE

                || x == KeyboardActionListener.NOT_A_TOUCH_COORDINATE

                || y == KeyboardActionListener.NOT_A_TOUCH_COORDINATE) {

            codes = new int[] { primaryCode };

            keyX = x;

            keyY = y;

        } else {

            // TODO: Pass an integer instead of an integer array

            codes = new int[] { primaryCode };

            keyX = keyDetector.getTouchX(x);

            keyY = keyDetector.getTouchY(y);

        }

        add(primaryCode, codes, keyX, keyY);

        add(primaryCode, keyX, keyY);

    }



    /**
@@ -152,7 +148,7 @@ public class WordComposer { 
     * the array containing unicode for adjacent keys, sorted by reducing probability/proximity.

     * @param codes the array of unicode values

     */

    private void add(int primaryCode, int[] codes, int keyX, int keyY) {

    private void add(int primaryCode, int keyX, int keyY) {

        final int newIndex = size();

        mTypedWord.appendCodePoint(primaryCode);

        refreshSize();
@@ -181,13 +177,11 @@ public class WordComposer { 
            if (key.mCode == codePoint) {

                final int x = key.mX + key.mWidth / 2;

                final int y = key.mY + key.mHeight / 2;

                // TODO: Pass an integer instead of an integer array

                add(codePoint, new int[] { key.mCode }, x, y);

                add(codePoint, x, y);

                return;

            }

        }

        add(codePoint, new int[] { codePoint },

                WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE);

        add(codePoint, WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE);

    }



    /**

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+6 −9
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ void releaseDictBuf(void* dictBuf, const size_t length, int fd); 


static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object,

        jstring sourceDir, jlong dictOffset, jlong dictSize,

        jint typedLetterMultiplier, jint fullWordMultiplier, jint maxWordLength, jint maxWords,

        jint maxAlternatives) {

        jint typedLetterMultiplier, jint fullWordMultiplier, jint maxWordLength, jint maxWords) {

    PROF_OPEN;

    PROF_START(66);

    const char *sourceDirChars = env->GetStringUTFChars(sourceDir, 0);
@@ -119,7 +118,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jobject object, 
#endif // USE_MMAP_FOR_DICTIONARY

    } else {

        dictionary = new Dictionary(dictBuf, dictSize, fd, adjust, typedLetterMultiplier,

                fullWordMultiplier, maxWordLength, maxWords, maxAlternatives);

                fullWordMultiplier, maxWordLength, maxWords);

    }

    PROF_END(66);

    PROF_CLOSE;
@@ -155,8 +154,7 @@ static int latinime_BinaryDictionary_getSuggestions(JNIEnv *env, jobject object, 


static int latinime_BinaryDictionary_getBigrams(JNIEnv *env, jobject object, jlong dict,

        jcharArray prevWordArray, jint prevWordLength, jintArray inputArray, jint inputArraySize,

        jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxBigrams,

        jint maxAlternatives) {

        jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxBigrams) {

    Dictionary *dictionary = (Dictionary*)dict;

    if (!dictionary) return 0;
@@ -166,8 +164,7 @@ static int latinime_BinaryDictionary_getBigrams(JNIEnv *env, jobject object, jlo 
    int *frequencies = env->GetIntArrayElements(frequencyArray, 0);



    int count = dictionary->getBigrams((unsigned short*) prevWord, prevWordLength, inputCodes,

            inputArraySize, (unsigned short*) outputChars, frequencies, maxWordLength, maxBigrams,

            maxAlternatives);

            inputArraySize, (unsigned short*) outputChars, frequencies, maxWordLength, maxBigrams);



    env->ReleaseCharArrayElements(prevWordArray, prevWord, JNI_ABORT);

    env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT);
@@ -242,11 +239,11 @@ void releaseDictBuf(void* dictBuf, const size_t length, int fd) { 
}



static JNINativeMethod sMethods[] = {

    {"openNative", "(Ljava/lang/String;JJIIIII)J", (void*)latinime_BinaryDictionary_open},

    {"openNative", "(Ljava/lang/String;JJIIII)J", (void*)latinime_BinaryDictionary_open},

    {"closeNative", "(J)V", (void*)latinime_BinaryDictionary_close},

    {"getSuggestionsNative", "(JJ[I[I[III[C[I)I", (void*)latinime_BinaryDictionary_getSuggestions},

    {"isValidWordNative", "(J[CI)Z", (void*)latinime_BinaryDictionary_isValidWord},

    {"getBigramsNative", "(J[CI[II[C[IIII)I", (void*)latinime_BinaryDictionary_getBigrams},

    {"getBigramsNative", "(J[CI[II[C[III)I", (void*)latinime_BinaryDictionary_getBigrams},

    {"calcNormalizedScoreNative", "([CI[CII)D",

            (void*)latinime_BinaryDictionary_calcNormalizedScore},

    {"editDistanceNative", "([CI[CI)I", (void*)latinime_BinaryDictionary_editDistance}

native/src/bigram_dictionary.cpp

+3 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
namespace latinime {



BigramDictionary::BigramDictionary(const unsigned char *dict, int maxWordLength,

        int maxAlternatives, const bool isLatestDictVersion, const bool hasBigram,

        const bool isLatestDictVersion, const bool hasBigram,

        Dictionary *parentDictionary)

    : DICT(dict), MAX_WORD_LENGTH(maxWordLength),

    MAX_ALTERNATIVES(maxAlternatives), IS_LATEST_DICT_VERSION(isLatestDictVersion),

    IS_LATEST_DICT_VERSION(isLatestDictVersion),

    HAS_BIGRAM(hasBigram), mParentDictionary(parentDictionary) {

    if (DEBUG_DICT) {

        AKLOGI("BigramDictionary - constructor");
@@ -92,7 +92,6 @@ bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequ 
 * bigramFreq: an array to output frequencies.

 * maxWordLength: the maximum size of a word.

 * maxBigrams: the maximum number of bigrams fitting in the bigramChars array.

 * maxAlteratives: unused.

 * This method returns the number of bigrams this word has, for backward compatibility.

 * Note: this is not the number of bigrams output in the array, which is the number of

 * bigrams this word has WHOSE first letter also matches the letter the user typed.
@@ -103,7 +102,7 @@ bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequ 
 */

int BigramDictionary::getBigrams(unsigned short *prevWord, int prevWordLength, int *codes,

        int codesSize, unsigned short *bigramChars, int *bigramFreq, int maxWordLength,

        int maxBigrams, int maxAlternatives) {

        int maxBigrams) {

    // TODO: remove unused arguments, and refrain from storing stuff in members of this class

    // TODO: have "in" arguments before "out" ones, and make out args explicit in the name

    mBigramFreq = bigramFreq;

native/src/bigram_dictionary.h

+4 −4
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ namespace latinime { 
class Dictionary;

class BigramDictionary {

 public:

    BigramDictionary(const unsigned char *dict, int maxWordLength, int maxAlternatives,

    BigramDictionary(const unsigned char *dict, int maxWordLength,

            const bool isLatestDictVersion, const bool hasBigram, Dictionary *parentDictionary);

    int getBigrams(unsigned short *word, int length, int *codes, int codesSize,

            unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams,

            int maxAlternatives);

            unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams);

    ~BigramDictionary();

 private:

    bool addWordBigram(unsigned short *word, int length, int frequency);
@@ -39,7 +38,8 @@ class BigramDictionary { 


    const unsigned char *DICT;

    const int MAX_WORD_LENGTH;

    const int MAX_ALTERNATIVES;

    // TODO: Re-implement proximity correction for bigram correction

    static const int MAX_ALTERNATIVES = 1;

    const bool IS_LATEST_DICT_VERSION;

    const bool HAS_BIGRAM;