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

Commit 88bc312a authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Move dictionary code to top level dictionary dir. 

Bug: 18725954
Change-Id: Ia442ba4b5d84311057d83edf6e7aeb151d6a820b
parent 0bb038a1

native/jni/NativeFileList.mk

+47 −47
Original line number Diff line number Diff line
@@ -20,34 +20,12 @@ LATIN_IME_JNI_SRC_FILES := \ 
    jni_common.cpp



LATIN_IME_CORE_SRC_FILES := \

    suggest/core/suggest.cpp \

    $(addprefix suggest/core/dicnode/, \

        dic_node.cpp \

        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/dictionary/, \

        dictionary.cpp \

        dictionary_utils.cpp \

        digraph_utils.cpp \

        error_type_utils.cpp \

        multi_bigram_map.cpp) \

    $(addprefix suggest/core/layout/, \

        additional_proximity_chars.cpp \

        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/core/session/ngram_context.cpp \

    $(addprefix suggest/core/result/, \

        suggestion_results.cpp \

        suggestions_output_utils.cpp) \

    $(addprefix suggest/policyimpl/dictionary/, \

        header/header_policy.cpp \

        header/header_read_write_utils.cpp \

        structure/dictionary_structure_with_buffer_policy_factory.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/pt_common/, \

    $(addprefix dictionary/header/, \

        header_policy.cpp \

        header_read_write_utils.cpp) \

    dictionary/property/ngram_context.cpp \

    dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp \

    $(addprefix dictionary/structure/pt_common/, \

        bigram/bigram_list_read_write_utils.cpp \

        dynamic_pt_gc_event_listeners.cpp \

        dynamic_pt_reading_helper.cpp \
@@ -56,11 +34,11 @@ LATIN_IME_CORE_SRC_FILES := \ 
        dynamic_pt_writing_utils.cpp \

        patricia_trie_reading_utils.cpp \

        shortcut/shortcut_list_reading_utils.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/v2/, \

    $(addprefix dictionary/structure/v2/, \

        patricia_trie_policy.cpp \

        ver2_patricia_trie_node_reader.cpp \

        ver2_pt_node_array_reader.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/v4/, \

    $(addprefix dictionary/structure/v4/, \

        ver4_dict_buffers.cpp \

        ver4_dict_constants.cpp \

        ver4_patricia_trie_node_reader.cpp \
@@ -69,14 +47,14 @@ LATIN_IME_CORE_SRC_FILES := \ 
        ver4_patricia_trie_reading_utils.cpp \

        ver4_patricia_trie_writing_helper.cpp \

        ver4_pt_node_array_reader.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/v4/content/, \

    $(addprefix dictionary/structure/v4/content/, \

        dynamic_language_model_probability_utils.cpp \

        language_model_dict_content.cpp \

        language_model_dict_content_global_counters.cpp \

        shortcut_dict_content.cpp \

        sparse_table_dict_content.cpp \

        terminal_position_lookup_table.cpp) \

    $(addprefix suggest/policyimpl/dictionary/utils/, \

    $(addprefix dictionary/utils/, \

        buffer_with_extendable_buffer.cpp \

        byte_array_utils.cpp \

        dict_file_writing_utils.cpp \
@@ -84,9 +62,31 @@ LATIN_IME_CORE_SRC_FILES := \ 
        forgetting_curve_utils.cpp \

        format_utils.cpp \

        mmapped_buffer.cpp \

        multi_bigram_map.cpp \

        probability_utils.cpp \

        sparse_table.cpp \

        trie_map.cpp ) \

    suggest/core/suggest.cpp \

    $(addprefix suggest/core/dicnode/, \

        dic_node.cpp \

        dic_node_utils.cpp \

        dic_nodes_cache.cpp) \

    $(addprefix suggest/core/dictionary/, \

        dictionary.cpp \

        dictionary_utils.cpp \

        digraph_utils.cpp \

        error_type_utils.cpp ) \

    $(addprefix suggest/core/layout/, \

        additional_proximity_chars.cpp \

        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 \

    $(addprefix suggest/core/result/, \

        suggestion_results.cpp \

        suggestions_output_utils.cpp) \

    suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \

    $(addprefix suggest/policyimpl/typing/, \

        scoring_params.cpp \
@@ -102,7 +102,7 @@ LATIN_IME_CORE_SRC_FILES := \ 
        time_keeper.cpp)



LATIN_IME_CORE_SRC_FILES_BACKWARD_V402 := \

    $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/, \

    $(addprefix dictionary/structure/backward/v402/, \

        ver4_dict_buffers.cpp \

        ver4_dict_constants.cpp \

        ver4_patricia_trie_node_reader.cpp \
@@ -111,34 +111,34 @@ LATIN_IME_CORE_SRC_FILES_BACKWARD_V402 := \ 
        ver4_patricia_trie_reading_utils.cpp \

        ver4_patricia_trie_writing_helper.cpp \

        ver4_pt_node_array_reader.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/content/, \

    $(addprefix dictionary/structure/backward/v402/content/, \

        bigram_dict_content.cpp \

        probability_dict_content.cpp \

        shortcut_dict_content.cpp \

        sparse_table_dict_content.cpp \

        terminal_position_lookup_table.cpp) \

    $(addprefix suggest/policyimpl/dictionary/structure/backward/v402/bigram/, \

    $(addprefix dictionary/structure/backward/v402/bigram/, \

        ver4_bigram_list_policy.cpp)



LATIN_IME_CORE_SRC_FILES += $(LATIN_IME_CORE_SRC_FILES_BACKWARD_V402)



LATIN_IME_CORE_TEST_FILES := \

    defines_test.cpp \

    dictionary/header/header_read_write_utils_test.cpp \

    dictionary/structure/v4/content/language_model_dict_content_test.cpp \

    dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp \

    dictionary/structure/v4/content/probability_entry_test.cpp \

    dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp \

    dictionary/utils/bloom_filter_test.cpp \

    dictionary/utils/buffer_with_extendable_buffer_test.cpp \

    dictionary/utils/byte_array_utils_test.cpp \

    dictionary/utils/format_utils_test.cpp \

    dictionary/utils/probability_utils_test.cpp \

    dictionary/utils/sparse_table_test.cpp \

    dictionary/utils/trie_map_test.cpp \

    suggest/core/dicnode/dic_node_pool_test.cpp \

    suggest/core/dictionary/bloom_filter_test.cpp \

    suggest/core/layout/geometry_utils_test.cpp \

    suggest/core/layout/normal_distribution_2d_test.cpp \

    suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp \

    suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp \

    suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp \

    suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp \

    suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp \

    suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp \

    suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp \

    suggest/policyimpl/dictionary/utils/format_utils_test.cpp \

    suggest/policyimpl/dictionary/utils/probability_utils_test.cpp \

    suggest/policyimpl/dictionary/utils/sparse_table_test.cpp \

    suggest/policyimpl/dictionary/utils/trie_map_test.cpp \

    suggest/policyimpl/utils/damerau_levenshtein_edit_distance_policy_test.cpp \

    utils/autocorrection_threshold_utils_test.cpp \

    utils/char_utils_test.cpp \

native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp

+4 −4
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ 
#include <vector>



#include "defines.h"

#include "dictionary/property/unigram_property.h"

#include "dictionary/property/ngram_context.h"

#include "dictionary/property/word_property.h"

#include "dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"

#include "jni.h"

#include "jni_common.h"

#include "suggest/core/dictionary/dictionary.h"

#include "suggest/core/dictionary/property/unigram_property.h"

#include "suggest/core/dictionary/property/word_property.h"

#include "suggest/core/result/suggestion_results.h"

#include "suggest/core/session/ngram_context.h"

#include "suggest/core/suggest_options.h"

#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"

#include "utils/char_utils.h"

#include "utils/int_array_view.h"

#include "utils/jni_data_utils.h"

native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include "com_android_inputmethod_latin_BinaryDictionaryUtils.h"



#include "defines.h"

#include "dictionary/utils/dict_file_writing_utils.h"

#include "jni.h"

#include "jni_common.h"

#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"

#include "utils/autocorrection_threshold_utils.h"

#include "utils/char_utils.h"

#include "utils/jni_data_utils.h"

native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
#include "com_android_inputmethod_latin_DicTraverseSession.h"



#include "defines.h"

#include "dictionary/property/ngram_context.h"

#include "jni.h"

#include "jni_common.h"

#include "suggest/core/session/dic_traverse_session.h"

#include "suggest/core/session/ngram_context.h"



namespace latinime {

class Dictionary;

native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp→native/jni/src/dictionary/header/header_policy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "suggest/policyimpl/dictionary/header/header_policy.h"

#include "dictionary/header/header_policy.h"



#include <algorithm>