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

Commit 33f71458 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am abd1ad86: Merge "Just cosmetic cleanups" 

* commit 'abd1ad86':
  Just cosmetic cleanups
parents 4e61cf71 abd1ad86

native/jni/src/bigram_dictionary.cpp

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void BigramDictionary::fillBigramAddressToProbabilityMapAndFilter(const int *pre 
                &pos);

        (*map)[bigramPos] = probability;

        setInFilter(filter, bigramPos);

    } while (0 != (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags));

    } while (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags);

}



bool BigramDictionary::checkFirstCharacter(int *word, int *inputCodePoints) const {

native/jni/src/suggest/core/dicnode/dic_node_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ namespace latinime { 
            return probability;

        }

        count++;

    } while ((0 != (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags))

    } while ((BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags)

            && count < MAX_BIGRAMS_CONSIDERED_PER_CONTEXT);

    if (static_cast<int>(bigramCacheMap->size()) < MAX_BIGRAM_MAP_SIZE) {

        // TODO: does this -1 mean NOT_VALID_WORD?

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

+5 −7
Original line number Diff line number Diff line
@@ -29,16 +29,14 @@ class Scoring { 
 public:

    virtual int calculateFinalScore(const float compoundDistance, const int inputSize,

            const bool forceCommit) const = 0;

    virtual bool getMostProbableString(

            const DicTraverseSession *const traverseSession, const int terminalSize,

            const float languageWeight, int *const outputCodePoints, int *const type,

            int *const freq) const = 0;

    virtual bool getMostProbableString(const DicTraverseSession *const traverseSession,

            const int terminalSize, const float languageWeight, int *const outputCodePoints,

            int *const type, int *const freq) const = 0;

    virtual void safetyNetForMostProbableString(const int terminalSize,

            const int maxScore, int *const outputCodePoints, int *const frequencies) const = 0;

    // TODO: Make more generic

    virtual void searchWordWithDoubleLetter(DicNode *terminals,

            const int terminalSize, int *doubleLetterTerminalIndex,

            DoubleLetterLevel *doubleLetterLevel) const = 0;

    virtual void searchWordWithDoubleLetter(DicNode *terminals, const int terminalSize,

            int *doubleLetterTerminalIndex, DoubleLetterLevel *doubleLetterLevel) const = 0;

    virtual float getAdjustedLanguageWeight(DicTraverseSession *const traverseSession,

            DicNode *const terminals, const int size) const = 0;

    virtual float getDoubleLetterDemotionDistanceCost(const int terminalIndex,

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "defines.h"



namespace latinime {



class Traversal;

class Scoring;

class Weighting;

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

+4 −6
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ class Traversal { 
            const DicNode *const dicNode) const = 0;

    virtual bool canDoLookAheadCorrection(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode) const = 0;

    virtual ProximityType getProximityType(

            const DicTraverseSession *const traverseSession, const DicNode *const dicNode,

            const DicNode *const childDicNode) const = 0;

    virtual ProximityType getProximityType(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode, const DicNode *const childDicNode) const = 0;

    virtual bool sameAsTyped(const DicTraverseSession *const traverseSession,

            const DicNode *const dicNode) const = 0;

    virtual bool needsToTraverseAllUserInput() const = 0;
@@ -49,9 +48,8 @@ class Traversal { 
    virtual bool allowPartialCommit() const = 0;

    virtual int getDefaultExpandDicNodeSize() const = 0;

    virtual int getMaxCacheSize() const = 0;

    virtual bool isPossibleOmissionChildNode(

            const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode,

            const DicNode *const dicNode) const = 0;

    virtual bool isPossibleOmissionChildNode(const DicTraverseSession *const traverseSession,

            const DicNode *const parentDicNode, const DicNode *const dicNode) const = 0;

    virtual bool isGoodToTraverseNextWord(const DicNode *const dicNode) const = 0;



 protected: