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

Commit 29432f84 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Create a new directory for layout-related implementations 

Change-Id: Ia227bb296f20dab0dfc03dfcde3a06c624eca76c
parent 8eb214d7

native/jni/Android.mk

+5 −4
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ LATIN_IME_CORE_SRC_FILES := \ 
    dictionary.cpp \

    dic_traverse_wrapper.cpp \

    digraph_utils.cpp \

    proximity_info.cpp \

    proximity_info_params.cpp \

    proximity_info_state.cpp \

    proximity_info_state_utils.cpp \

    unigram_dictionary.cpp \

    words_priority_queue.cpp \

    suggest/core/suggest.cpp \
@@ -64,6 +60,11 @@ LATIN_IME_CORE_SRC_FILES := \ 
        dic_node.cpp \

        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/layout/, \

        proximity_info.cpp \

        proximity_info_params.cpp \

        proximity_info_state.cpp \

        proximity_info_state_utils.cpp) \

    suggest/core/policy/weighting.cpp \

    suggest/core/session/dic_traverse_session.cpp \

    suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \

native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
#define LOG_TAG "LatinIME: jni: ProximityInfo"



#include "com_android_inputmethod_keyboard_ProximityInfo.h"



#include "defines.h"

#include "jni.h"

#include "jni_common.h"

#include "proximity_info.h"

#include "suggest/core/layout/proximity_info.h"



namespace latinime {

native/jni/src/correction.cpp

+4 −4
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include "char_utils.h"

#include "correction.h"

#include "defines.h"

#include "proximity_info_state.h"

#include "suggest_utils.h"

#include "suggest/core/layout/proximity_info_state.h"

#include "suggest/core/layout/touch_position_correction_utils.h"

#include "suggest/policyimpl/utils/edit_distance.h"

#include "suggest/policyimpl/utils/damerau_levenshtein_edit_distance_policy.h"
@@ -676,8 +676,8 @@ inline static bool isUpperCase(unsigned short c) { 
            if (i < adjustedProximityMatchedCount) {

                multiplyIntCapped(typedLetterMultiplier, &finalFreq);

            }

            const float factor =

                    SuggestUtils::getLengthScalingFactor(static_cast<float>(squaredDistance));

            const float factor = TouchPositionCorrectionUtils::getLengthScalingFactor(

                    static_cast<float>(squaredDistance));

            if (factor > 0.0f) {

                multiplyRate(static_cast<int>(factor * 100.0f), &finalFreq);

            } else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {

native/jni/src/correction.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include "correction_state.h"

#include "defines.h"

#include "proximity_info_state.h"

#include "suggest/core/layout/proximity_info_state.h"



namespace latinime {

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

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include "dic_node_utils.h"

#include "dic_node_vector.h"

#include "multi_bigram_map.h"

#include "proximity_info.h"

#include "proximity_info_state.h"

#include "suggest/core/layout/proximity_info.h"

#include "suggest/core/layout/proximity_info_state.h"



namespace latinime {