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

Commit c4cc7e5f authored by Keisuke Kuroynagi's avatar Keisuke Kuroynagi Committed by Android Git Automerger
Browse files

am 6613740e: Merge ""much" in suggestions of "m" after "very"" 

* commit '6613740e':
  "much" in suggestions of "m" after "very"
parents d7f75dfb 6613740e

native/jni/src/suggest/core/dicnode/dic_node_priority_queue.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include "suggest/core/dicnode/dic_node.h"

#include "suggest/core/dicnode/dic_node_release_listener.h"



#define MAX_DIC_NODE_PRIORITY_QUEUE_CAPACITY 200

// The biggest value among MAX_CACHE_DIC_NODE_SIZE, MAX_CACHE_DIC_NODE_SIZE_FOR_SINGLE_POINT, ...

#define MAX_DIC_NODE_PRIORITY_QUEUE_CAPACITY 310



namespace latinime {

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

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class Traversal { 
    virtual float getMaxSpatialDistance() const = 0;

    virtual bool autoCorrectsToMultiWordSuggestionIfTop() const = 0;

    virtual int getDefaultExpandDicNodeSize() const = 0;

    virtual int getMaxCacheSize() const = 0;

    virtual int getMaxCacheSize(const int inputSize) 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;

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

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ void Suggest::initializeSearch(DicTraverseSession *traverseSession, int commitPo 
        }

    } else {

        // Restart recognition at the root.

        traverseSession->resetCache(TRAVERSAL->getMaxCacheSize(), MAX_RESULTS);

        traverseSession->resetCache(TRAVERSAL->getMaxCacheSize(traverseSession->getInputSize()),

                MAX_RESULTS);

        // Create a new dic node here

        DicNode rootNode;

        DicNodeUtils::initAsRoot(traverseSession->getBinaryDictionaryInfo(),

native/jni/src/suggest/policyimpl/typing/scoring_params.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ const int ScoringParams::THRESHOLD_NEXT_WORD_PROBABILITY_FOR_CAPPED = 120; 
const float ScoringParams::AUTOCORRECT_OUTPUT_THRESHOLD = 1.0f;

// TODO: Unlimit max cache dic node size

const int ScoringParams::MAX_CACHE_DIC_NODE_SIZE = 170;

const int ScoringParams::MAX_CACHE_DIC_NODE_SIZE_FOR_SINGLE_POINT = 310;

const int ScoringParams::THRESHOLD_SHORT_WORD_LENGTH = 4;



const float ScoringParams::DISTANCE_WEIGHT_LENGTH = 0.132f;

native/jni/src/suggest/policyimpl/typing/scoring_params.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ class ScoringParams { 
    static const int THRESHOLD_NEXT_WORD_PROBABILITY_FOR_CAPPED;

    static const float AUTOCORRECT_OUTPUT_THRESHOLD;

    static const int MAX_CACHE_DIC_NODE_SIZE;

    static const int MAX_CACHE_DIC_NODE_SIZE_FOR_SINGLE_POINT;

    static const int THRESHOLD_SHORT_WORD_LENGTH;



    // Numerically optimized parameters (currently for tap typing only).