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

Commit 9c2a96aa authored by Jean Chalard's avatar Jean Chalard
Browse files

Preparatory refactoring 

Split out getting the pointer to the bigrams to a separate
function. This is a preparative change to bug#6313806

Change-Id: Ieb2e306a1151cd95dc1a16793c8dc2f7fed8b654
parent 473a3dd6

native/jni/src/bigram_dictionary.cpp

+19 −13
Original line number Diff line number Diff line
@@ -108,19 +108,7 @@ int BigramDictionary::getBigrams(unsigned short *prevWord, int prevWordLength, i 
    mMaxBigrams = maxBigrams;



    const uint8_t* const root = DICT;

    int pos = BinaryFormat::getTerminalPosition(root, prevWord, prevWordLength);



    if (NOT_VALID_WORD == pos) return 0;

    const int flags = BinaryFormat::getFlagsAndForwardPointer(root, &pos);

    if (0 == (flags & UnigramDictionary::FLAG_HAS_BIGRAMS)) return 0;

    if (0 == (flags & UnigramDictionary::FLAG_HAS_MULTIPLE_CHARS)) {

        BinaryFormat::getCharCodeAndForwardPointer(root, &pos);

    } else {

        pos = BinaryFormat::skipOtherCharacters(root, pos);

    }

    pos = BinaryFormat::skipChildrenPosition(flags, pos);

    pos = BinaryFormat::skipFrequency(flags, pos);

    pos = BinaryFormat::skipShortcuts(root, flags, pos);

    int pos = getBigramListForWord(root, prevWord, prevWordLength);

    int bigramFlags;

    int bigramCount = 0;

    do {
@@ -142,6 +130,24 @@ int BigramDictionary::getBigrams(unsigned short *prevWord, int prevWordLength, i 
    return bigramCount;

}



int BigramDictionary::getBigramListForWord(const uint8_t* const root,

        const unsigned short *prevWord, const int prevWordLength) {

    int pos = BinaryFormat::getTerminalPosition(root, prevWord, prevWordLength);



    if (NOT_VALID_WORD == pos) return 0;

    const int flags = BinaryFormat::getFlagsAndForwardPointer(root, &pos);

    if (0 == (flags & UnigramDictionary::FLAG_HAS_BIGRAMS)) return 0;

    if (0 == (flags & UnigramDictionary::FLAG_HAS_MULTIPLE_CHARS)) {

        BinaryFormat::getCharCodeAndForwardPointer(root, &pos);

    } else {

        pos = BinaryFormat::skipOtherCharacters(root, pos);

    }

    pos = BinaryFormat::skipChildrenPosition(flags, pos);

    pos = BinaryFormat::skipFrequency(flags, pos);

    pos = BinaryFormat::skipShortcuts(root, flags, pos);

    return pos;

}



bool BigramDictionary::checkFirstCharacter(unsigned short *word) {

    // Checks whether this word starts with same character or neighboring characters of

    // what user typed.

native/jni/src/bigram_dictionary.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef LATINIME_BIGRAM_DICTIONARY_H

#define LATINIME_BIGRAM_DICTIONARY_H



#include <stdint.h>



namespace latinime {



class Dictionary;
@@ -25,6 +27,8 @@ class BigramDictionary { 
    BigramDictionary(const unsigned char *dict, int maxWordLength, Dictionary *parentDictionary);

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

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

    int getBigramListForWord(const uint8_t* const root,

        const unsigned short *prevWord, const int prevWordLength);

    ~BigramDictionary();

 private:

    bool addWordBigram(unsigned short *word, int length, int frequency);