From 88bc312ad34321fb3e81be2dc939a889d065f4a7 Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Wed, 17 Dec 2014 16:02:09 +0900 Subject: [PATCH] Move dictionary code to top level dictionary dir. Bug: 18725954 Change-Id: Ia442ba4b5d84311057d83edf6e7aeb151d6a820b --- native/jni/NativeFileList.mk | 124 +++++++++--------- ...oid_inputmethod_latin_BinaryDictionary.cpp | 8 +- ...nputmethod_latin_BinaryDictionaryUtils.cpp | 2 +- ...d_inputmethod_latin_DicTraverseSession.cpp | 2 +- .../dictionary/header/header_policy.cpp | 2 +- .../dictionary/header/header_policy.h | 8 +- .../header/header_read_write_utils.cpp | 6 +- .../header/header_read_write_utils.h | 4 +- .../dictionary_bigrams_structure_policy.h | 0 .../dictionary_header_structure_policy.h | 0 .../dictionary_shortcuts_structure_policy.h | 0 .../dictionary_structure_with_buffer_policy.h | 8 +- .../interface}/ngram_listener.h | 0 .../dictionary/property/historical_info.h | 0 .../property}/ngram_context.cpp | 4 +- .../property}/ngram_context.h | 0 .../dictionary/property/ngram_property.h | 4 +- .../dictionary/property/unigram_property.h | 2 +- .../property}/word_attributes.h | 0 .../dictionary/property/word_property.h | 4 +- .../structure/backward/v402/Readme.txt | 0 .../v402/bigram/ver4_bigram_list_policy.cpp | 18 +-- .../v402/bigram/ver4_bigram_list_policy.h | 4 +- .../v402/content/bigram_dict_content.cpp | 6 +- .../v402/content/bigram_dict_content.h | 10 +- .../backward/v402/content/bigram_entry.h | 6 +- .../backward/v402/content/dict_content.h | 2 +- .../v402/content/probability_dict_content.cpp | 12 +- .../v402/content/probability_dict_content.h | 10 +- .../backward/v402/content/probability_entry.h | 6 +- .../v402/content/shortcut_dict_content.cpp | 6 +- .../v402/content/shortcut_dict_content.h | 8 +- .../v402/content/single_dict_content.h | 12 +- .../content/sparse_table_dict_content.cpp | 4 +- .../v402/content/sparse_table_dict_content.h | 14 +- .../terminal_position_lookup_table.cpp | 8 +- .../content/terminal_position_lookup_table.h | 6 +- .../v402/shortcut/ver4_shortcut_list_policy.h | 10 +- .../backward/v402/ver4_dict_buffers.cpp | 8 +- .../backward/v402/ver4_dict_buffers.h | 18 +-- .../backward/v402/ver4_dict_constants.cpp | 4 +- .../backward/v402/ver4_dict_constants.h | 2 +- .../v402/ver4_patricia_trie_node_reader.cpp | 20 +-- .../v402/ver4_patricia_trie_node_reader.h | 6 +- .../v402/ver4_patricia_trie_node_writer.cpp | 28 ++-- .../v402/ver4_patricia_trie_node_writer.h | 10 +- .../v402/ver4_patricia_trie_policy.cpp | 24 ++-- .../backward/v402/ver4_patricia_trie_policy.h | 30 ++--- .../v402/ver4_patricia_trie_reading_utils.cpp | 6 +- .../v402/ver4_patricia_trie_reading_utils.h | 2 +- .../ver4_patricia_trie_writing_helper.cpp | 26 ++-- .../v402/ver4_patricia_trie_writing_helper.h | 8 +- .../v402/ver4_pt_node_array_reader.cpp | 10 +- .../backward/v402/ver4_pt_node_array_reader.h | 4 +- ...y_structure_with_buffer_policy_factory.cpp | 26 ++-- ...ary_structure_with_buffer_policy_factory.h | 8 +- .../bigram/bigram_list_read_write_utils.cpp | 6 +- .../bigram/bigram_list_read_write_utils.h | 0 .../dynamic_pt_gc_event_listeners.cpp | 10 +- .../pt_common/dynamic_pt_gc_event_listeners.h | 6 +- .../pt_common/dynamic_pt_reading_helper.cpp | 4 +- .../pt_common/dynamic_pt_reading_helper.h | 4 +- .../pt_common/dynamic_pt_reading_utils.cpp | 4 +- .../pt_common/dynamic_pt_reading_utils.h | 0 .../pt_common/dynamic_pt_updating_helper.cpp | 16 +-- .../pt_common/dynamic_pt_updating_helper.h | 2 +- .../pt_common/dynamic_pt_writing_utils.cpp | 4 +- .../pt_common/dynamic_pt_writing_utils.h | 2 +- .../pt_common/patricia_trie_reading_utils.cpp | 8 +- .../pt_common/patricia_trie_reading_utils.h | 0 .../pt_common/pt_node_array_reader.h | 0 .../structure/pt_common/pt_node_params.h | 6 +- .../structure/pt_common/pt_node_reader.h | 2 +- .../structure/pt_common/pt_node_writer.h | 2 +- .../shortcut/shortcut_list_reading_utils.cpp | 4 +- .../shortcut/shortcut_list_reading_utils.h | 0 .../structure/v2/bigram/bigram_list_policy.h | 4 +- .../structure/v2/patricia_trie_policy.cpp | 16 +-- .../structure/v2/patricia_trie_policy.h | 16 +-- .../v2/shortcut/shortcut_list_policy.h | 4 +- .../v2/ver2_patricia_trie_node_reader.cpp | 4 +- .../v2/ver2_patricia_trie_node_reader.h | 4 +- .../v2/ver2_pt_node_array_reader.cpp | 4 +- .../structure/v2/ver2_pt_node_array_reader.h | 2 +- ...namic_language_model_probability_utils.cpp | 2 +- ...dynamic_language_model_probability_utils.h | 2 +- .../content/language_model_dict_content.cpp | 6 +- .../v4/content/language_model_dict_content.h | 14 +- ...age_model_dict_content_global_counters.cpp | 4 +- ...guage_model_dict_content_global_counters.h | 4 +- .../structure/v4/content/probability_entry.h | 8 +- .../v4/content/shortcut_dict_content.cpp | 4 +- .../v4/content/shortcut_dict_content.h | 6 +- .../v4/content/single_dict_content.h | 6 +- .../v4/content/sparse_table_dict_content.cpp | 4 +- .../v4/content/sparse_table_dict_content.h | 6 +- .../terminal_position_lookup_table.cpp | 4 +- .../content/terminal_position_lookup_table.h | 4 +- .../v4/shortcut/ver4_shortcut_list_policy.h | 8 +- .../structure/v4/ver4_dict_buffers.cpp | 8 +- .../structure/v4/ver4_dict_buffers.h | 14 +- .../structure/v4/ver4_dict_constants.cpp | 2 +- .../structure/v4/ver4_dict_constants.h | 0 .../v4/ver4_patricia_trie_node_reader.cpp | 18 +-- .../v4/ver4_patricia_trie_node_reader.h | 4 +- .../v4/ver4_patricia_trie_node_writer.cpp | 24 ++-- .../v4/ver4_patricia_trie_node_writer.h | 8 +- .../v4/ver4_patricia_trie_policy.cpp | 22 ++-- .../structure/v4/ver4_patricia_trie_policy.h | 22 ++-- .../v4/ver4_patricia_trie_reading_utils.cpp | 4 +- .../v4/ver4_patricia_trie_reading_utils.h | 0 .../v4/ver4_patricia_trie_writing_helper.cpp | 22 ++-- .../v4/ver4_patricia_trie_writing_helper.h | 6 +- .../v4/ver4_pt_node_array_reader.cpp | 8 +- .../structure/v4/ver4_pt_node_array_reader.h | 2 +- .../binary_dictionary_bigrams_iterator.h | 2 +- .../binary_dictionary_shortcut_iterator.h | 2 +- .../utils}/bloom_filter.h | 0 .../utils/buffer_with_extendable_buffer.cpp | 2 +- .../utils/buffer_with_extendable_buffer.h | 2 +- .../dictionary/utils/byte_array_utils.cpp | 2 +- .../dictionary/utils/byte_array_utils.h | 0 .../utils/dict_file_writing_utils.cpp | 18 +-- .../utils/dict_file_writing_utils.h | 4 +- .../dictionary/utils/entry_counters.h | 0 .../dictionary/utils/file_utils.cpp | 2 +- .../dictionary/utils/file_utils.h | 0 .../utils/forgetting_curve_utils.cpp | 6 +- .../dictionary/utils/forgetting_curve_utils.h | 4 +- .../dictionary/utils/format_utils.cpp | 4 +- .../dictionary/utils/format_utils.h | 0 .../dictionary/utils/mmapped_buffer.cpp | 4 +- .../dictionary/utils/mmapped_buffer.h | 0 .../utils}/multi_bigram_map.cpp | 2 +- .../utils}/multi_bigram_map.h | 8 +- .../dictionary/utils/probability_utils.cpp | 2 +- .../dictionary/utils/probability_utils.h | 0 .../dictionary/utils/sparse_table.cpp | 2 +- .../dictionary/utils/sparse_table.h | 2 +- .../dictionary/utils/trie_map.cpp | 4 +- .../dictionary/utils/trie_map.h | 2 +- .../suggest/core/dicnode/dic_node_utils.cpp | 2 +- .../suggest/core/dictionary/dictionary.cpp | 4 +- .../src/suggest/core/dictionary/dictionary.h | 10 +- .../core/dictionary/dictionary_utils.cpp | 4 +- .../suggest/core/dictionary/digraph_utils.cpp | 2 +- .../core/result/suggestions_output_utils.cpp | 2 +- .../core/result/suggestions_output_utils.h | 2 +- .../core/session/dic_traverse_session.cpp | 6 +- .../core/session/dic_traverse_session.h | 2 +- native/jni/src/suggest/core/suggest.cpp | 4 +- native/jni/src/utils/jni_data_utils.h | 8 +- .../header/header_read_write_utils_test.cpp | 4 +- ...odel_dict_content_global_counters_test.cpp | 4 +- .../language_model_dict_content_test.cpp | 2 +- .../v4/content/probability_entry_test.cpp | 2 +- .../terminal_position_lookup_table_test.cpp | 4 +- .../utils}/bloom_filter_test.cpp | 2 +- .../buffer_with_extendable_buffer_test.cpp | 2 +- .../utils/byte_array_utils_test.cpp | 2 +- .../dictionary/utils/format_utils_test.cpp | 2 +- .../utils/probability_utils_test.cpp | 2 +- .../dictionary/utils/sparse_table_test.cpp | 4 +- .../dictionary/utils/trie_map_test.cpp | 2 +- 164 files changed, 546 insertions(+), 546 deletions(-) rename native/jni/src/{suggest/policyimpl => }/dictionary/header/header_policy.cpp (99%) rename native/jni/src/{suggest/policyimpl => }/dictionary/header/header_policy.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/header/header_read_write_utils.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/header/header_read_write_utils.h (97%) rename native/jni/src/{suggest/core/policy => dictionary/interface}/dictionary_bigrams_structure_policy.h (100%) rename native/jni/src/{suggest/core/policy => dictionary/interface}/dictionary_header_structure_policy.h (100%) rename native/jni/src/{suggest/core/policy => dictionary/interface}/dictionary_shortcuts_structure_policy.h (100%) rename native/jni/src/{suggest/core/policy => dictionary/interface}/dictionary_structure_with_buffer_policy.h (94%) rename native/jni/src/{suggest/core/dictionary => dictionary/interface}/ngram_listener.h (100%) rename native/jni/src/{suggest/core => }/dictionary/property/historical_info.h (100%) rename native/jni/src/{suggest/core/session => dictionary/property}/ngram_context.cpp (97%) rename native/jni/src/{suggest/core/session => dictionary/property}/ngram_context.h (100%) rename native/jni/src/{suggest/core => }/dictionary/property/ngram_property.h (94%) rename native/jni/src/{suggest/core => }/dictionary/property/unigram_property.h (98%) rename native/jni/src/{suggest/core/dictionary => dictionary/property}/word_attributes.h (100%) rename native/jni/src/{suggest/core => }/dictionary/property/word_property.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/Readme.txt (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/bigram_dict_content.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/bigram_dict_content.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/bigram_entry.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/dict_content.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/probability_dict_content.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/probability_dict_content.h (83%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/probability_entry.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp (96%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/shortcut_dict_content.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/single_dict_content.h (85%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp (89%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/sparse_table_dict_content.h (90%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h (88%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_dict_buffers.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_dict_buffers.h (86%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_dict_constants.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_dict_constants.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp (83%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h (83%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp (80%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp (88%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp (89%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h (96%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_reading_helper.h (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_reading_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_updating_helper.h (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/dynamic_pt_writing_utils.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/patricia_trie_reading_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/pt_node_array_reader.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/pt_node_params.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/pt_node_reader.h (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/pt_node_writer.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/bigram/bigram_list_policy.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/patricia_trie_policy.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/patricia_trie_policy.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/shortcut/shortcut_list_policy.h (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/ver2_patricia_trie_node_reader.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/ver2_pt_node_array_reader.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v2/ver2_pt_node_array_reader.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content.h (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp (86%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content_global_counters.h (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/probability_entry.h (96%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/shortcut_dict_content.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/shortcut_dict_content.h (93%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/single_dict_content.h (88%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/sparse_table_dict_content.cpp (88%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/sparse_table_dict_content.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/terminal_position_lookup_table.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/content/terminal_position_lookup_table.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_dict_buffers.cpp (96%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_dict_buffers.h (88%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_dict_constants.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_dict_constants.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp (83%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_node_reader.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_node_writer.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_policy.cpp (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_policy.h (86%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp (84%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp (90%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_pt_node_array_reader.cpp (90%) rename native/jni/src/{suggest/policyimpl => }/dictionary/structure/v4/ver4_pt_node_array_reader.h (94%) rename native/jni/src/{suggest/core/dictionary => dictionary/utils}/binary_dictionary_bigrams_iterator.h (97%) rename native/jni/src/{suggest/core/dictionary => dictionary/utils}/binary_dictionary_shortcut_iterator.h (97%) rename native/jni/src/{suggest/core/dictionary => dictionary/utils}/bloom_filter.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/buffer_with_extendable_buffer.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/buffer_with_extendable_buffer.h (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/byte_array_utils.cpp (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/byte_array_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/dict_file_writing_utils.cpp (89%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/dict_file_writing_utils.h (94%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/entry_counters.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/file_utils.cpp (99%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/file_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/forgetting_curve_utils.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/forgetting_curve_utils.h (97%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/format_utils.cpp (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/format_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/mmapped_buffer.cpp (96%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/mmapped_buffer.h (100%) rename native/jni/src/{suggest/core/dictionary => dictionary/utils}/multi_bigram_map.cpp (98%) rename native/jni/src/{suggest/core/dictionary => dictionary/utils}/multi_bigram_map.h (92%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/probability_utils.cpp (91%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/probability_utils.h (100%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/sparse_table.cpp (98%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/sparse_table.h (95%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/trie_map.cpp (99%) rename native/jni/src/{suggest/policyimpl => }/dictionary/utils/trie_map.h (99%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/header/header_read_write_utils_test.cpp (95%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp (91%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/structure/v4/content/language_model_dict_content_test.cpp (98%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/structure/v4/content/probability_entry_test.cpp (96%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp (94%) rename native/jni/tests/{suggest/core/dictionary => dictionary/utils}/bloom_filter_test.cpp (98%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/buffer_with_extendable_buffer_test.cpp (97%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/byte_array_utils_test.cpp (98%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/format_utils_test.cpp (98%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/probability_utils_test.cpp (93%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/sparse_table_test.cpp (91%) rename native/jni/tests/{suggest/policyimpl => }/dictionary/utils/trie_map_test.cpp (99%) diff --git a/native/jni/NativeFileList.mk b/native/jni/NativeFileList.mk index 0be7153d6..d8b69bfd7 100644 --- a/native/jni/NativeFileList.mk +++ b/native/jni/NativeFileList.mk @@ -20,6 +20,52 @@ LATIN_IME_JNI_SRC_FILES := \ jni_common.cpp LATIN_IME_CORE_SRC_FILES := \ + $(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 \ + dynamic_pt_reading_utils.cpp \ + dynamic_pt_updating_helper.cpp \ + dynamic_pt_writing_utils.cpp \ + patricia_trie_reading_utils.cpp \ + shortcut/shortcut_list_reading_utils.cpp) \ + $(addprefix dictionary/structure/v2/, \ + patricia_trie_policy.cpp \ + ver2_patricia_trie_node_reader.cpp \ + ver2_pt_node_array_reader.cpp) \ + $(addprefix dictionary/structure/v4/, \ + ver4_dict_buffers.cpp \ + ver4_dict_constants.cpp \ + ver4_patricia_trie_node_reader.cpp \ + ver4_patricia_trie_node_writer.cpp \ + ver4_patricia_trie_policy.cpp \ + ver4_patricia_trie_reading_utils.cpp \ + ver4_patricia_trie_writing_helper.cpp \ + ver4_pt_node_array_reader.cpp) \ + $(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 dictionary/utils/, \ + buffer_with_extendable_buffer.cpp \ + byte_array_utils.cpp \ + dict_file_writing_utils.cpp \ + file_utils.cpp \ + 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 \ @@ -29,8 +75,7 @@ LATIN_IME_CORE_SRC_FILES := \ dictionary.cpp \ dictionary_utils.cpp \ digraph_utils.cpp \ - error_type_utils.cpp \ - multi_bigram_map.cpp) \ + error_type_utils.cpp ) \ $(addprefix suggest/core/layout/, \ additional_proximity_chars.cpp \ proximity_info.cpp \ @@ -39,54 +84,9 @@ LATIN_IME_CORE_SRC_FILES := \ 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/, \ - bigram/bigram_list_read_write_utils.cpp \ - dynamic_pt_gc_event_listeners.cpp \ - dynamic_pt_reading_helper.cpp \ - dynamic_pt_reading_utils.cpp \ - dynamic_pt_updating_helper.cpp \ - dynamic_pt_writing_utils.cpp \ - patricia_trie_reading_utils.cpp \ - shortcut/shortcut_list_reading_utils.cpp) \ - $(addprefix suggest/policyimpl/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/, \ - ver4_dict_buffers.cpp \ - ver4_dict_constants.cpp \ - ver4_patricia_trie_node_reader.cpp \ - ver4_patricia_trie_node_writer.cpp \ - ver4_patricia_trie_policy.cpp \ - 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/, \ - 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/, \ - buffer_with_extendable_buffer.cpp \ - byte_array_utils.cpp \ - dict_file_writing_utils.cpp \ - file_utils.cpp \ - forgetting_curve_utils.cpp \ - format_utils.cpp \ - mmapped_buffer.cpp \ - probability_utils.cpp \ - sparse_table.cpp \ - trie_map.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 \ diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index 8f1e35e0f..3341e1163 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -22,15 +22,15 @@ #include #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" diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp index 68bf417e5..0885f2de9 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionaryUtils.cpp @@ -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" diff --git a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp index 3c6bff3b6..45f5492b1 100644 --- a/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp +++ b/native/jni/com_android_inputmethod_latin_DicTraverseSession.cpp @@ -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; diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp b/native/jni/src/dictionary/header/header_policy.cpp similarity index 99% rename from native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp rename to native/jni/src/dictionary/header/header_policy.cpp index c93f31017..d4f84d39f 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.cpp +++ b/native/jni/src/dictionary/header/header_policy.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/header/header_policy.h" +#include "dictionary/header/header_policy.h" #include diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h b/native/jni/src/dictionary/header/header_policy.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h rename to native/jni/src/dictionary/header/header_policy.h index f76931baa..47cc9196a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h +++ b/native/jni/src/dictionary/header/header_policy.h @@ -20,10 +20,10 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/header/header_read_write_utils.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/utils/entry_counters.h" +#include "dictionary/utils/format_utils.h" #include "utils/char_utils.h" #include "utils/time_keeper.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp b/native/jni/src/dictionary/header/header_read_write_utils.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp rename to native/jni/src/dictionary/header/header_read_write_utils.cpp index 19ed0d468..779f8b8c3 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp +++ b/native/jni/src/dictionary/header/header_read_write_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" +#include "dictionary/header/header_read_write_utils.h" #include #include @@ -22,8 +22,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h b/native/jni/src/dictionary/header/header_read_write_utils.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h rename to native/jni/src/dictionary/header/header_read_write_utils.h index 5dd91b26c..f67d614df 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h +++ b/native/jni/src/dictionary/header/header_read_write_utils.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/utils/format_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/core/policy/dictionary_bigrams_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_bigrams_structure_policy.h similarity index 100% rename from native/jni/src/suggest/core/policy/dictionary_bigrams_structure_policy.h rename to native/jni/src/dictionary/interface/dictionary_bigrams_structure_policy.h diff --git a/native/jni/src/suggest/core/policy/dictionary_header_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_header_structure_policy.h similarity index 100% rename from native/jni/src/suggest/core/policy/dictionary_header_structure_policy.h rename to native/jni/src/dictionary/interface/dictionary_header_structure_policy.h diff --git a/native/jni/src/suggest/core/policy/dictionary_shortcuts_structure_policy.h b/native/jni/src/dictionary/interface/dictionary_shortcuts_structure_policy.h similarity index 100% rename from native/jni/src/suggest/core/policy/dictionary_shortcuts_structure_policy.h rename to native/jni/src/dictionary/interface/dictionary_shortcuts_structure_policy.h diff --git a/native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h b/native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h similarity index 94% rename from native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h rename to native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h index 33a0fbc19..ace48491d 100644 --- a/native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h +++ b/native/jni/src/dictionary/interface/dictionary_structure_with_buffer_policy.h @@ -20,10 +20,10 @@ #include #include "defines.h" -#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/core/dictionary/property/word_property.h" -#include "suggest/core/dictionary/word_attributes.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/property/word_attributes.h" +#include "dictionary/property/word_property.h" +#include "dictionary/utils/binary_dictionary_shortcut_iterator.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/ngram_listener.h b/native/jni/src/dictionary/interface/ngram_listener.h similarity index 100% rename from native/jni/src/suggest/core/dictionary/ngram_listener.h rename to native/jni/src/dictionary/interface/ngram_listener.h diff --git a/native/jni/src/suggest/core/dictionary/property/historical_info.h b/native/jni/src/dictionary/property/historical_info.h similarity index 100% rename from native/jni/src/suggest/core/dictionary/property/historical_info.h rename to native/jni/src/dictionary/property/historical_info.h diff --git a/native/jni/src/suggest/core/session/ngram_context.cpp b/native/jni/src/dictionary/property/ngram_context.cpp similarity index 97% rename from native/jni/src/suggest/core/session/ngram_context.cpp rename to native/jni/src/dictionary/property/ngram_context.cpp index 17ef9ae60..7b9c3eff6 100644 --- a/native/jni/src/suggest/core/session/ngram_context.cpp +++ b/native/jni/src/dictionary/property/ngram_context.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/core/session/ngram_context.h" +#include "dictionary/property/ngram_context.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" #include "utils/char_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/core/session/ngram_context.h b/native/jni/src/dictionary/property/ngram_context.h similarity index 100% rename from native/jni/src/suggest/core/session/ngram_context.h rename to native/jni/src/dictionary/property/ngram_context.h diff --git a/native/jni/src/suggest/core/dictionary/property/ngram_property.h b/native/jni/src/dictionary/property/ngram_property.h similarity index 94% rename from native/jni/src/suggest/core/dictionary/property/ngram_property.h rename to native/jni/src/dictionary/property/ngram_property.h index e67b4da31..5f259ec59 100644 --- a/native/jni/src/suggest/core/dictionary/property/ngram_property.h +++ b/native/jni/src/dictionary/property/ngram_property.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/core/session/ngram_context.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/property/ngram_context.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/property/unigram_property.h b/native/jni/src/dictionary/property/unigram_property.h similarity index 98% rename from native/jni/src/suggest/core/dictionary/property/unigram_property.h rename to native/jni/src/dictionary/property/unigram_property.h index f194f979a..92f61b85d 100644 --- a/native/jni/src/suggest/core/dictionary/property/unigram_property.h +++ b/native/jni/src/dictionary/property/unigram_property.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" +#include "dictionary/property/historical_info.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/word_attributes.h b/native/jni/src/dictionary/property/word_attributes.h similarity index 100% rename from native/jni/src/suggest/core/dictionary/word_attributes.h rename to native/jni/src/dictionary/property/word_attributes.h diff --git a/native/jni/src/suggest/core/dictionary/property/word_property.h b/native/jni/src/dictionary/property/word_property.h similarity index 94% rename from native/jni/src/suggest/core/dictionary/property/word_property.h rename to native/jni/src/dictionary/property/word_property.h index 9efc7f304..3028e020a 100644 --- a/native/jni/src/suggest/core/dictionary/property/word_property.h +++ b/native/jni/src/dictionary/property/word_property.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/ngram_property.h" -#include "suggest/core/dictionary/property/unigram_property.h" +#include "dictionary/property/ngram_property.h" +#include "dictionary/property/unigram_property.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/Readme.txt b/native/jni/src/dictionary/structure/backward/v402/Readme.txt similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/Readme.txt rename to native/jni/src/dictionary/structure/backward/v402/Readme.txt diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp rename to native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp index bc0f47f79..60749bce6 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.cpp @@ -19,18 +19,18 @@ * Do not edit this file other than updating policy's interface. * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp + * dictionary/structure/v4/bigram/ver4_bigram_list_policy.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" +#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" -#include "suggest/core/dictionary/property/ngram_property.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/property/ngram_property.h" +#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" +#include "dictionary/structure/backward/v402/content/bigram_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h rename to native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h index aac6f5470..58c88ce8a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h +++ b/native/jni/src/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h @@ -26,8 +26,8 @@ #define LATINIME_BACKWARD_V402_VER4_BIGRAM_LIST_POLICY_H #include "defines.h" -#include "suggest/core/policy/dictionary_bigrams_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h" +#include "dictionary/interface/dictionary_bigrams_structure_policy.h" +#include "dictionary/structure/backward/v402/content/bigram_entry.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp index 15ac88319..7fa85dec2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.cpp @@ -18,12 +18,12 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp + * dictionary/structure/v4/content/bigram_dict_content.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h" +#include "dictionary/structure/backward/v402/content/bigram_dict_content.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h index b554e5676..14f334a12 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_dict_content.h @@ -18,17 +18,17 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h + * dictionary/structure/v4/content/bigram_dict_content.h */ #ifndef LATINIME_BACKWARD_V402_BIGRAM_DICT_CONTENT_H #define LATINIME_BACKWARD_V402_BIGRAM_DICT_CONTENT_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/content/bigram_entry.h" +#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h b/native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h rename to native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h index 480095a2f..36ad855ee 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_entry.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/bigram_entry.h @@ -18,15 +18,15 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h + * dictionary/structure/v4/content/bigram_entry.h */ #ifndef LATINIME_BACKWARD_V402_BIGRAM_ENTRY_H #define LATINIME_BACKWARD_V402_BIGRAM_ENTRY_H #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/dict_content.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/dict_content.h index 0f2f25534..d3b84fa04 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/dict_content.h @@ -18,7 +18,7 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/dict_content.h + * dictionary/structure/v4/content/dict_content.h */ #ifndef LATINIME_BACKWARD_V402_DICT_CONTENT_H diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp rename to native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp index 61ef4aa42..b167f0ab2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp @@ -18,15 +18,15 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.cpp + * dictionary/structure/v4/content/probability_dict_content.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h" +#include "dictionary/structure/backward/v402/content/probability_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/backward/v402/content/probability_entry.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h similarity index 83% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h index 3734797d4..464b29f3f 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.h @@ -18,17 +18,17 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.h + * dictionary/structure/v4/content/probability_dict_content.h */ #ifndef LATINIME_BACKWARD_V402_PROBABILITY_DICT_CONTENT_H #define LATINIME_BACKWARD_V402_PROBABILITY_DICT_CONTENT_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/backward/v402/content/single_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h rename to native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h index 4111a49c0..94e36bf51 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h @@ -18,15 +18,15 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h + * dictionary/structure/v4/content/probability_entry.h */ #ifndef LATINIME_BACKWARD_V402_PROBABILITY_ENTRY_H #define LATINIME_BACKWARD_V402_PROBABILITY_ENTRY_H #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp similarity index 96% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp rename to native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp index 56bc8b98d..e538a02a1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.cpp @@ -18,12 +18,12 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp + * dictionary/structure/v4/content/shortcut_dict_content.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h" +#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h index 179cec5bb..3b725e896 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/shortcut_dict_content.h @@ -18,16 +18,16 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h + * dictionary/structure/v4/content/shortcut_dict_content.h */ #ifndef LATINIME_BACKWARD_V402_SHORTCUT_DICT_CONTENT_H #define LATINIME_BACKWARD_V402_SHORTCUT_DICT_CONTENT_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h similarity index 85% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h index 49f446814..89df2a1e0 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/single_dict_content.h @@ -18,18 +18,18 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h + * dictionary/structure/v4/content/single_dict_content.h */ #ifndef LATINIME_BACKWARD_V402_SINGLE_DICT_CONTENT_H #define LATINIME_BACKWARD_V402_SINGLE_DICT_CONTENT_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/structure/backward/v402/content/dict_content.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/mmapped_buffer.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp similarity index 89% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp rename to native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp index 7c9b4967a..280f0f85a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.cpp @@ -18,10 +18,10 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp + * dictionary/structure/v4/content/sparse_table_dict_content.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h" +#include "dictionary/structure/backward/v402/content/sparse_table_dict_content.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h similarity index 90% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h rename to native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h index 3c626df11..4b5af87ad 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/sparse_table_dict_content.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/sparse_table_dict_content.h @@ -18,19 +18,19 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h + * dictionary/structure/v4/content/sparse_table_dict_content.h */ #ifndef LATINIME_BACKWARD_V402_SPARSE_TABLE_DICT_CONTENT_H #define LATINIME_BACKWARD_V402_SPARSE_TABLE_DICT_CONTENT_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" -#include "suggest/policyimpl/dictionary/utils/sparse_table.h" +#include "dictionary/structure/backward/v402/content/dict_content.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/mmapped_buffer.h" +#include "dictionary/utils/sparse_table.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp rename to native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp index a9f841779..30b72bbd1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.cpp @@ -18,13 +18,13 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp + * dictionary/structure/v4/content/terminal_position_lookup_table.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h similarity index 88% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h rename to native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h index eadfe0faa..641c7496f 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h @@ -18,7 +18,7 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h + * dictionary/structure/v4/content/terminal_position_lookup_table.h */ #ifndef LATINIME_BACKWARD_V402_TERMINAL_POSITION_LOOKUP_TABLE_H @@ -27,8 +27,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/single_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/content/single_dict_content.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h rename to native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h index 941fda748..8cda8c5cf 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h +++ b/native/jni/src/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h @@ -19,17 +19,17 @@ * Do not edit this file other than updating policy's interface. * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h + * dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h */ #ifndef LATINIME_BACKWARD_V402_VER4_SHORTCUT_LIST_POLICY_H #define LATINIME_BACKWARD_V402_VER4_SHORTCUT_LIST_POLICY_H #include "defines.h" -#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/interface/dictionary_shortcuts_structure_policy.h" +#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" +#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp index 3dfbd1c94..4a9704f4d 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.cpp @@ -18,18 +18,18 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp + * dictionary/structure/v4/ver4_dict_buffers.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" #include #include #include #include -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" +#include "dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/file_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h similarity index 86% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h index e775be52e..0d09fee9a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_buffers.h @@ -18,7 +18,7 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h + * dictionary/structure/v4/ver4_dict_buffers.h */ #ifndef LATINIME_BACKWARD_V402_VER4_DICT_BUFFER_H @@ -27,14 +27,14 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/bigram_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/backward/v402/content/bigram_dict_content.h" +#include "dictionary/structure/backward/v402/content/probability_dict_content.h" +#include "dictionary/structure/backward/v402/content/shortcut_dict_content.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/mmapped_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp index 81d85f495..2948d0716 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.cpp @@ -18,10 +18,10 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp + * dictionary/structure/v4/ver4_dict_constants.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h index 88ebd6a75..15581d852 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_dict_constants.h @@ -18,7 +18,7 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h + * dictionary/structure/v4/ver4_dict_constants.h */ #ifndef LATINIME_BACKWARD_V402_VER4_DICT_CONSTANTS_H diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp similarity index 83% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp index 5c639b19c..871ef7aaf 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.cpp @@ -18,19 +18,19 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp + * dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/backward/v402/content/probability_dict_content.h" +#include "dictionary/structure/backward/v402/content/probability_entry.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h index 1999a51a6..367d6f9f8 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h @@ -18,15 +18,15 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h + * dictionary/structure/v4/ver4_patricia_trie_node_reader.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_READER_H #define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_READER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_reader.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp index d558b949a..e3ab5ec20 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp @@ -18,23 +18,23 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp + * dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" +#include "dictionary/structure/backward/v402/content/probability_entry.h" +#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h index d0bab50f8..db3cea174 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h @@ -18,17 +18,17 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h + * dictionary/structure/v4/ver4_patricia_trie_node_writer.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_WRITER_H #define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_NODE_WRITER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/probability_entry.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_writer.h" +#include "dictionary/structure/backward/v402/content/probability_entry.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp index 051aed45a..6fb9cffb7 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp @@ -19,25 +19,25 @@ * Do not edit this file other than updating policy's interface. * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp + * dictionary/structure/v4/ver4_patricia_trie_policy.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_policy.h" #include #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_vector.h" -#include "suggest/core/dictionary/multi_bigram_map.h" -#include "suggest/core/dictionary/ngram_listener.h" -#include "suggest/core/dictionary/property/ngram_property.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/core/dictionary/property/word_property.h" -#include "suggest/core/session/ngram_context.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/interface/ngram_listener.h" +#include "dictionary/property/ngram_context.h" +#include "dictionary/property/ngram_property.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/property/word_property.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" +#include "dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/utils/multi_bigram_map.h" +#include "dictionary/utils/probability_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h similarity index 83% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h index 80b1111b4..bce5f6bea 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h @@ -19,7 +19,7 @@ * Do not edit this file other than updating policy's interface. * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h + * dictionary/structure/v4/ver4_patricia_trie_policy.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_POLICY_H @@ -28,20 +28,20 @@ #include #include "defines.h" -#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h" -#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h" +#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" +#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h" +#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" +#include "dictionary/utils/binary_dictionary_bigrams_iterator.h" +#include "dictionary/utils/binary_dictionary_shortcut_iterator.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/entry_counters.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp similarity index 80% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp index 80d531198..b8a4cf847 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.cpp @@ -18,12 +18,12 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp + * dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h index 3579c26d6..c3e736bdc 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_reading_utils.h @@ -18,7 +18,7 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h + * dictionary/structure/v4/ver4_patricia_trie_reading_utils.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_READING_UTILS_H diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp index 985c16803..c0af9eae6 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.cpp @@ -18,25 +18,25 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp + * dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h" #include #include -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/backward/v402/bigram/ver4_bigram_list_policy.h" +#include "dictionary/structure/backward/v402/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/file_utils.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h index 1aad33e38..f2b873826 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_writing_helper.h @@ -18,16 +18,16 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h + * dictionary/structure/v4/ver4_patricia_trie_writing_helper.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_WRITING_HELPER_H #define LATINIME_BACKWARD_V402_VER4_PATRICIA_TRIE_WRITING_HELPER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" +#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" +#include "dictionary/structure/backward/v402/content/terminal_position_lookup_table.h" +#include "dictionary/utils/entry_counters.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp similarity index 88% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp rename to native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp index 537a6d420..d27d70816 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.cpp @@ -18,14 +18,14 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp + * dictionary/structure/v4/ver4_pt_node_array_reader.cpp */ -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" +#include "dictionary/structure/backward/v402/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h rename to native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h index 4f8056801..0039bf8fc 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_pt_node_array_reader.h @@ -18,14 +18,14 @@ * !!!!! DO NOT EDIT THIS FILE !!!!! * * This file was generated from - * suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h + * dictionary/structure/v4/ver4_pt_node_array_reader.h */ #ifndef LATINIME_BACKWARD_V402_VER4_PT_NODE_ARRAY_READER_H #define LATINIME_BACKWARD_V402_VER4_PT_NODE_ARRAY_READER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h" +#include "dictionary/structure/pt_common/pt_node_array_reader.h" namespace latinime { namespace backward { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp similarity index 89% rename from native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp rename to native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp index 9a9a21b6b..4470e8568 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp +++ b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp @@ -14,23 +14,23 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h" +#include "dictionary/structure/dictionary_structure_with_buffer_policy_factory.h" #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/structure/backward/v402/ver4_dict_constants.h" +#include "dictionary/structure/backward/v402/ver4_patricia_trie_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/v2/patricia_trie_policy.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_patricia_trie_policy.h" +#include "dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/file_utils.h" +#include "dictionary/utils/format_utils.h" +#include "dictionary/utils/mmapped_buffer.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h rename to native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h index 768454d8d..b0c04c0b1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h +++ b/native/jni/src/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h @@ -20,10 +20,10 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/utils/format_utils.h" +#include "dictionary/utils/mmapped_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp rename to native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp index 1b2f857ab..64f9b6663 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" +#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h b/native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h rename to native/jni/src/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp index db1a802d0..b5e2e9dae 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" +#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_writer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h similarity index 96% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h index b8a4a92e8..8c7ad965b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h @@ -20,9 +20,9 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/pt_node_writer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp index 5e4a4b166..294bc6ea9 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h" +#include "dictionary/structure/pt_common/pt_node_array_reader.h" #include "utils/char_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h index 21c287fdc..d8ddc7c2b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_helper.h @@ -21,8 +21,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_reader.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp index 3586b50ab..3eb55ed9b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_reading_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp index e524e86e5..ccad345c8 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.cpp @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h" +#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/pt_common/pt_node_reader.h" +#include "dictionary/structure/pt_common/pt_node_writer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h index db5f6ab17..e8cf98c39 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_updating_helper.h @@ -18,7 +18,7 @@ #define LATINIME_DYNAMIC_PT_UPDATING_HELPER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_params.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp index 664aeebbb..ea760a538 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" #include #include #include -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h rename to native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h index 362fbd1cc..b4817af41 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_writing_utils.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp rename to native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp index b8d78bf10..e2807c492 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.cpp @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" #include "defines.h" -#include "suggest/core/policy/dictionary_bigrams_structure_policy.h" -#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/interface/dictionary_bigrams_structure_policy.h" +#include "dictionary/interface/dictionary_shortcuts_structure_policy.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h rename to native/jni/src/dictionary/structure/pt_common/patricia_trie_reading_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h b/native/jni/src/dictionary/structure/pt_common/pt_node_array_reader.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h rename to native/jni/src/dictionary/structure/pt_common/pt_node_array_reader.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h b/native/jni/src/dictionary/structure/pt_common/pt_node_params.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h rename to native/jni/src/dictionary/structure/pt_common/pt_node_params.h index e52706e07..905deb1bc 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h +++ b/native/jni/src/dictionary/structure/pt_common/pt_node_params.h @@ -20,9 +20,9 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" #include "utils/char_utils.h" #include "utils/int_array_view.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h b/native/jni/src/dictionary/structure/pt_common/pt_node_reader.h similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h rename to native/jni/src/dictionary/structure/pt_common/pt_node_reader.h index 31299a707..15da19e0b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h +++ b/native/jni/src/dictionary/structure/pt_common/pt_node_reader.h @@ -19,7 +19,7 @@ #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_params.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h b/native/jni/src/dictionary/structure/pt_common/pt_node_writer.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h rename to native/jni/src/dictionary/structure/pt_common/pt_node_writer.h index 954db9b0a..e6cad25aa 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h +++ b/native/jni/src/dictionary/structure/pt_common/pt_node_writer.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_params.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp rename to native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp index 40b872055..14428edd4 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" +#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h rename to native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h b/native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h rename to native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h index e2608435c..25081fa04 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h +++ b/native/jni/src/dictionary/structure/v2/bigram/bigram_list_policy.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_bigrams_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" +#include "dictionary/interface/dictionary_bigrams_structure_policy.h" +#include "dictionary/structure/pt_common/bigram/bigram_list_read_write_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp rename to native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp index 1a51acad5..4e8b96b08 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.cpp +++ b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.cpp @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h" +#include "dictionary/structure/v2/patricia_trie_policy.h" #include "defines.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_vector.h" -#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h" -#include "suggest/core/dictionary/multi_bigram_map.h" -#include "suggest/core/dictionary/ngram_listener.h" -#include "suggest/core/session/ngram_context.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/interface/ngram_listener.h" +#include "dictionary/property/ngram_context.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/utils/binary_dictionary_bigrams_iterator.h" +#include "dictionary/utils/multi_bigram_map.h" +#include "dictionary/utils/probability_utils.h" #include "utils/char_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h rename to native/jni/src/dictionary/structure/v2/patricia_trie_policy.h index 8933962ab..8edfa7d10 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h +++ b/native/jni/src/dictionary/structure/v2/patricia_trie_policy.h @@ -21,14 +21,14 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/v2/bigram/bigram_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/structure/v2/bigram/bigram_list_policy.h" +#include "dictionary/structure/v2/shortcut/shortcut_list_policy.h" +#include "dictionary/structure/v2/ver2_patricia_trie_node_reader.h" +#include "dictionary/structure/v2/ver2_pt_node_array_reader.h" +#include "dictionary/utils/format_utils.h" +#include "dictionary/utils/mmapped_buffer.h" #include "utils/byte_array_view.h" #include "utils/int_array_view.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h b/native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h rename to native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h index 5319dd26c..995b1ed01 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/shortcut/shortcut_list_policy.h +++ b/native/jni/src/dictionary/structure/v2/shortcut/shortcut_list_policy.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" +#include "dictionary/interface/dictionary_shortcuts_structure_policy.h" +#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp rename to native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp index 90d4687dd..cbb8ead81 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp +++ b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h" +#include "dictionary/structure/v2/ver2_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h rename to native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h index 838d37314..dc87c7c68 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h +++ b/native/jni/src/dictionary/structure/v2/ver2_patricia_trie_node_reader.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_reader.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp rename to native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp index 72ad1eb66..8b9b02df1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.cpp +++ b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h" +#include "dictionary/structure/v2/ver2_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h rename to native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h index 548f36bf3..32fa96d15 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h +++ b/native/jni/src/dictionary/structure/v2/ver2_pt_node_array_reader.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h" +#include "dictionary/structure/pt_common/pt_node_array_reader.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp rename to native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp index 025ee9932..165947f87 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp +++ b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h" +#include "dictionary/structure/v4/content/dynamic_language_model_probability_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h rename to native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h index 644ae2ca7..71824c954 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h +++ b/native/jni/src/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" +#include "dictionary/property/historical_info.h" #include "utils/ngram_utils.h" #include "utils/time_keeper.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp index 6db7ea444..c10e4906b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp +++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h" +#include "dictionary/structure/v4/content/language_model_dict_content.h" #include #include -#include "suggest/policyimpl/dictionary/structure/v4/content/dynamic_language_model_probability_utils.h" -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/structure/v4/content/dynamic_language_model_probability_utils.h" +#include "dictionary/utils/probability_utils.h" #include "utils/ngram_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h index 9678c35f9..db8c6e12b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h +++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content.h @@ -21,13 +21,13 @@ #include #include "defines.h" -#include "suggest/core/dictionary/word_attributes.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" -#include "suggest/policyimpl/dictionary/utils/trie_map.h" +#include "dictionary/property/word_attributes.h" +#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h" +#include "dictionary/structure/v4/content/probability_entry.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/utils/entry_counters.h" +#include "dictionary/utils/trie_map.h" #include "utils/byte_array_view.h" #include "utils/int_array_view.h" diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp similarity index 86% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp index d6d91887e..89cf0e306 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp +++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h" +#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h" #include -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h rename to native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h index 283c2691a..3f87c0ea0 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h +++ b/native/jni/src/dictionary/structure/v4/content/language_model_dict_content_global_counters.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/dict_file_writing_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h b/native/jni/src/dictionary/structure/v4/content/probability_entry.h similarity index 96% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h rename to native/jni/src/dictionary/structure/v4/content/probability_entry.h index 9c4ab18e4..473354b90 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h +++ b/native/jni/src/dictionary/structure/v4/content/probability_entry.h @@ -21,10 +21,10 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/core/dictionary/property/ngram_property.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/property/ngram_property.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp rename to native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp index 41d9c544c..e3b419449 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.cpp +++ b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h" +#include "dictionary/structure/v4/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h similarity index 93% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h rename to native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h index 85c9ce8d8..27de4e79e 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h +++ b/native/jni/src/dictionary/structure/v4/content/shortcut_dict_content.h @@ -20,9 +20,9 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/content/sparse_table_dict_content.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h b/native/jni/src/dictionary/structure/v4/content/single_dict_content.h similarity index 88% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h rename to native/jni/src/dictionary/structure/v4/content/single_dict_content.h index 309c434cf..6faa9a28b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h +++ b/native/jni/src/dictionary/structure/v4/content/single_dict_content.h @@ -20,9 +20,9 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/dict_file_writing_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp similarity index 88% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp rename to native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp index 896ce6bd2..685365f36 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.cpp +++ b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h" +#include "dictionary/structure/v4/content/sparse_table_dict_content.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/dict_file_writing_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h rename to native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h index 0ce2da7bf..6245abc8e 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/sparse_table_dict_content.h +++ b/native/jni/src/dictionary/structure/v4/content/sparse_table_dict_content.h @@ -20,9 +20,9 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/sparse_table.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/sparse_table.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp rename to native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp index 7bda3dc95..5503151fd 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.cpp +++ b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h rename to native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h index febcbe5b4..f45ceb52d 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h +++ b/native/jni/src/dictionary/structure/v4/content/terminal_position_lookup_table.h @@ -21,8 +21,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/single_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/content/single_dict_content.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h rename to native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h index 790273541..25ab22543 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h +++ b/native/jni/src/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h @@ -18,10 +18,10 @@ #define LATINIME_VER4_SHORTCUT_LIST_POLICY_H #include "defines.h" -#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/interface/dictionary_shortcuts_structure_policy.h" +#include "dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.h" +#include "dictionary/structure/v4/content/shortcut_dict_content.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp similarity index 96% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp rename to native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp index 4d088dcab..b0a82839b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" #include #include @@ -23,9 +23,9 @@ #include #include -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" +#include "dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/file_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h similarity index 88% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h rename to native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h index 5407525af..c8270c93c 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h +++ b/native/jni/src/dictionary/structure/v4/ver4_dict_buffers.h @@ -21,13 +21,13 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/v4/content/language_model_dict_content.h" +#include "dictionary/structure/v4/content/shortcut_dict_content.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/mmapped_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp rename to native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp index bd89b8da7..fd6907824 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h b/native/jni/src/dictionary/structure/v4/ver4_dict_constants.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h rename to native/jni/src/dictionary/structure/v4/ver4_dict_constants.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp similarity index 83% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp index 4110d6036..b38b03dcb 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/v4/content/language_model_dict_content.h" +#include "dictionary/structure/v4/content/probability_entry.h" +#include "dictionary/structure/v4/ver4_patricia_trie_reading_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h index f4df544e2..4e5ae3a89 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_reader.h @@ -18,8 +18,8 @@ #define LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_reader.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp index 3488f7d2a..d974b50f4 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" -#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/structure/v4/content/probability_entry.h" +#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/forgetting_curve_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h index 4ecf88729..55856110b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.h @@ -18,10 +18,10 @@ #define LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/pt_common/pt_node_params.h" +#include "dictionary/structure/pt_common/pt_node_writer.h" +#include "dictionary/structure/v4/content/probability_entry.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp index a96719533..1dbec5545 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp @@ -14,23 +14,23 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h" +#include "dictionary/structure/v4/ver4_patricia_trie_policy.h" #include #include #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_vector.h" -#include "suggest/core/dictionary/multi_bigram_map.h" -#include "suggest/core/dictionary/ngram_listener.h" -#include "suggest/core/dictionary/property/ngram_property.h" -#include "suggest/core/dictionary/property/unigram_property.h" -#include "suggest/core/dictionary/property/word_property.h" -#include "suggest/core/session/ngram_context.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/interface/ngram_listener.h" +#include "dictionary/property/ngram_context.h" +#include "dictionary/property/ngram_property.h" +#include "dictionary/property/unigram_property.h" +#include "dictionary/property/word_property.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_helper.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h" +#include "dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/utils/multi_bigram_map.h" +#include "dictionary/utils/probability_utils.h" #include "utils/ngram_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h similarity index 86% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h index 93faa83a0..d130a4e78 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_policy.h +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.h @@ -20,17 +20,17 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h" -#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/structure/pt_common/dynamic_pt_updating_helper.h" +#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/v4/ver4_patricia_trie_writing_helper.h" +#include "dictionary/structure/v4/ver4_pt_node_array_reader.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/entry_counters.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp similarity index 84% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp index 254022db4..ccb70cdd3 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h" +#include "dictionary/structure/v4/ver4_patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp similarity index 90% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp index 34af76c5d..6dfdf4d31 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp @@ -14,21 +14,21 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h" +#include "dictionary/structure/v4/ver4_patricia_trie_writing_helper.h" #include #include -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/v4/shortcut/ver4_shortcut_list_policy.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_reader.h" +#include "dictionary/structure/v4/ver4_patricia_trie_node_writer.h" +#include "dictionary/structure/v4/ver4_pt_node_array_reader.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/file_utils.h" +#include "dictionary/utils/forgetting_curve_utils.h" #include "utils/ngram_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h rename to native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h index c56cea5cf..68dd1caa2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_writing_helper.h @@ -18,9 +18,9 @@ #define LATINIME_VER4_PATRICIA_TRIE_WRITING_HELPER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" +#include "dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/utils/entry_counters.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp similarity index 90% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp rename to native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp index b014c523d..63d0b4ad5 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h" +#include "dictionary/structure/v4/ver4_pt_node_array_reader.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/patricia_trie_reading_utils.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/structure/pt_common/dynamic_pt_reading_utils.h" +#include "dictionary/structure/pt_common/patricia_trie_reading_utils.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h rename to native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h index d81808efc..ccb760bc1 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_pt_node_array_reader.h +++ b/native/jni/src/dictionary/structure/v4/ver4_pt_node_array_reader.h @@ -18,7 +18,7 @@ #define LATINIME_VER4_PT_NODE_ARRAY_READER_H #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h" +#include "dictionary/structure/pt_common/pt_node_array_reader.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h similarity index 97% rename from native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h rename to native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h index 178b06554..8a614730b 100644 --- a/native/jni/src/suggest/core/dictionary/binary_dictionary_bigrams_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h @@ -18,7 +18,7 @@ #define LATINIME_BINARY_DICTIONARY_BIGRAMS_ITERATOR_H #include "defines.h" -#include "suggest/core/policy/dictionary_bigrams_structure_policy.h" +#include "dictionary/interface/dictionary_bigrams_structure_policy.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h similarity index 97% rename from native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h rename to native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h index ee1606b6a..a4ddd58c2 100644 --- a/native/jni/src/suggest/core/dictionary/binary_dictionary_shortcut_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h @@ -18,7 +18,7 @@ #define LATINIME_BINARY_DICTIONARY_SHORTCUT_ITERATOR_H #include "defines.h" -#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" +#include "dictionary/interface/dictionary_shortcuts_structure_policy.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/bloom_filter.h b/native/jni/src/dictionary/utils/bloom_filter.h similarity index 100% rename from native/jni/src/suggest/core/dictionary/bloom_filter.h rename to native/jni/src/dictionary/utils/bloom_filter.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp rename to native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp index da2c30cd6..217569651 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp +++ b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h rename to native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h index fad83aa25..0a141d4db 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h +++ b/native/jni/src/dictionary/utils/buffer_with_extendable_buffer.h @@ -22,7 +22,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp b/native/jni/src/dictionary/utils/byte_array_utils.cpp similarity index 92% rename from native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp rename to native/jni/src/dictionary/utils/byte_array_utils.cpp index 1833e8832..d38f08217 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.cpp +++ b/native/jni/src/dictionary/utils/byte_array_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h b/native/jni/src/dictionary/utils/byte_array_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h rename to native/jni/src/dictionary/utils/byte_array_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp b/native/jni/src/dictionary/utils/dict_file_writing_utils.cpp similarity index 89% rename from native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp rename to native/jni/src/dictionary/utils/dict_file_writing_utils.cpp index edcb43678..033a758ba 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp +++ b/native/jni/src/dictionary/utils/dict_file_writing_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/dict_file_writing_utils.h" #include #include @@ -22,14 +22,14 @@ #include #include -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/structure/backward/v402/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" -#include "suggest/policyimpl/dictionary/utils/file_utils.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/structure/backward/v402/ver4_dict_buffers.h" +#include "dictionary/structure/pt_common/dynamic_pt_writing_utils.h" +#include "dictionary/structure/v4/ver4_dict_buffers.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/entry_counters.h" +#include "dictionary/utils/file_utils.h" +#include "dictionary/utils/format_utils.h" #include "utils/time_keeper.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h b/native/jni/src/dictionary/utils/dict_file_writing_utils.h similarity index 94% rename from native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h rename to native/jni/src/dictionary/utils/dict_file_writing_utils.h index 4843b3b32..102a89da4 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h +++ b/native/jni/src/dictionary/utils/dict_file_writing_utils.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/header/header_read_write_utils.h" +#include "dictionary/utils/format_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/entry_counters.h b/native/jni/src/dictionary/utils/entry_counters.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/entry_counters.h rename to native/jni/src/dictionary/utils/entry_counters.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp b/native/jni/src/dictionary/utils/file_utils.cpp similarity index 99% rename from native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp rename to native/jni/src/dictionary/utils/file_utils.cpp index fb80f38c5..bb392fb32 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.cpp +++ b/native/jni/src/dictionary/utils/file_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/file_utils.h" +#include "dictionary/utils/file_utils.h" #include #include diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.h b/native/jni/src/dictionary/utils/file_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/file_utils.h rename to native/jni/src/dictionary/utils/file_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp b/native/jni/src/dictionary/utils/forgetting_curve_utils.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp rename to native/jni/src/dictionary/utils/forgetting_curve_utils.cpp index f05c6149e..d79ed911b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.cpp +++ b/native/jni/src/dictionary/utils/forgetting_curve_utils.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h" +#include "dictionary/utils/forgetting_curve_utils.h" #include #include #include -#include "suggest/policyimpl/dictionary/header/header_policy.h" -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/header/header_policy.h" +#include "dictionary/utils/probability_utils.h" #include "utils/time_keeper.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h b/native/jni/src/dictionary/utils/forgetting_curve_utils.h similarity index 97% rename from native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h rename to native/jni/src/dictionary/utils/forgetting_curve_utils.h index 06dcae8a1..ddaac7e3b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h +++ b/native/jni/src/dictionary/utils/forgetting_curve_utils.h @@ -20,8 +20,8 @@ #include #include "defines.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/policyimpl/dictionary/utils/entry_counters.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/utils/entry_counters.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp b/native/jni/src/dictionary/utils/format_utils.cpp similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp rename to native/jni/src/dictionary/utils/format_utils.cpp index e225c235e..cef3b094c 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.cpp +++ b/native/jni/src/dictionary/utils/format_utils.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/utils/format_utils.h" -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h b/native/jni/src/dictionary/utils/format_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h rename to native/jni/src/dictionary/utils/format_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp b/native/jni/src/dictionary/utils/mmapped_buffer.cpp similarity index 96% rename from native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp rename to native/jni/src/dictionary/utils/mmapped_buffer.cpp index 4a126ff85..c5259de6d 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.cpp +++ b/native/jni/src/dictionary/utils/mmapped_buffer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/mmapped_buffer.h" +#include "dictionary/utils/mmapped_buffer.h" #include #include @@ -23,7 +23,7 @@ #include #include -#include "suggest/policyimpl/dictionary/utils/file_utils.h" +#include "dictionary/utils/file_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h b/native/jni/src/dictionary/utils/mmapped_buffer.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h rename to native/jni/src/dictionary/utils/mmapped_buffer.h diff --git a/native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp b/native/jni/src/dictionary/utils/multi_bigram_map.cpp similarity index 98% rename from native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp rename to native/jni/src/dictionary/utils/multi_bigram_map.cpp index 761f51ec8..e730fff8e 100644 --- a/native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp +++ b/native/jni/src/dictionary/utils/multi_bigram_map.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/core/dictionary/multi_bigram_map.h" +#include "dictionary/utils/multi_bigram_map.h" #include #include diff --git a/native/jni/src/suggest/core/dictionary/multi_bigram_map.h b/native/jni/src/dictionary/utils/multi_bigram_map.h similarity index 92% rename from native/jni/src/suggest/core/dictionary/multi_bigram_map.h rename to native/jni/src/dictionary/utils/multi_bigram_map.h index d2eb5cc32..6f23d98bc 100644 --- a/native/jni/src/suggest/core/dictionary/multi_bigram_map.h +++ b/native/jni/src/dictionary/utils/multi_bigram_map.h @@ -21,10 +21,10 @@ #include #include "defines.h" -#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h" -#include "suggest/core/dictionary/bloom_filter.h" -#include "suggest/core/dictionary/ngram_listener.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/interface/ngram_listener.h" +#include "dictionary/utils/binary_dictionary_bigrams_iterator.h" +#include "dictionary/utils/bloom_filter.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp b/native/jni/src/dictionary/utils/probability_utils.cpp similarity index 91% rename from native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp rename to native/jni/src/dictionary/utils/probability_utils.cpp index e8fa06942..426a0e783 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.cpp +++ b/native/jni/src/dictionary/utils/probability_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/utils/probability_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h b/native/jni/src/dictionary/utils/probability_utils.h similarity index 100% rename from native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h rename to native/jni/src/dictionary/utils/probability_utils.h diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp b/native/jni/src/dictionary/utils/sparse_table.cpp similarity index 98% rename from native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp rename to native/jni/src/dictionary/utils/sparse_table.cpp index d336306b9..029329fab 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.cpp +++ b/native/jni/src/dictionary/utils/sparse_table.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/sparse_table.h" +#include "dictionary/utils/sparse_table.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h b/native/jni/src/dictionary/utils/sparse_table.h similarity index 95% rename from native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h rename to native/jni/src/dictionary/utils/sparse_table.h index e1a96c6f7..bd1190e8b 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h +++ b/native/jni/src/dictionary/utils/sparse_table.h @@ -20,7 +20,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp b/native/jni/src/dictionary/utils/trie_map.cpp similarity index 99% rename from native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp rename to native/jni/src/dictionary/utils/trie_map.cpp index b7ef2b9bd..0bef8c702 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp +++ b/native/jni/src/dictionary/utils/trie_map.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/trie_map.h" +#include "dictionary/utils/trie_map.h" -#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h" +#include "dictionary/utils/dict_file_writing_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h b/native/jni/src/dictionary/utils/trie_map.h similarity index 99% rename from native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h rename to native/jni/src/dictionary/utils/trie_map.h index 00765888b..5fc6c2690 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h +++ b/native/jni/src/dictionary/utils/trie_map.h @@ -23,7 +23,7 @@ #include #include "defines.h" -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" #include "utils/byte_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp index ea438922f..a20252cd2 100644 --- a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp +++ b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp @@ -16,9 +16,9 @@ #include "suggest/core/dicnode/dic_node_utils.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_vector.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp index 6a5df9d95..5c9a1392e 100644 --- a/native/jni/src/suggest/core/dictionary/dictionary.cpp +++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp @@ -19,11 +19,11 @@ #include "suggest/core/dictionary/dictionary.h" #include "defines.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/property/ngram_context.h" #include "suggest/core/dictionary/dictionary_utils.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" #include "suggest/core/result/suggestion_results.h" #include "suggest/core/session/dic_traverse_session.h" -#include "suggest/core/session/ngram_context.h" #include "suggest/core/suggest.h" #include "suggest/core/suggest_options.h" #include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h" diff --git a/native/jni/src/suggest/core/dictionary/dictionary.h b/native/jni/src/suggest/core/dictionary/dictionary.h index b1774371b..9e224ebfb 100644 --- a/native/jni/src/suggest/core/dictionary/dictionary.h +++ b/native/jni/src/suggest/core/dictionary/dictionary.h @@ -21,11 +21,11 @@ #include "defines.h" #include "jni.h" -#include "suggest/core/dictionary/ngram_listener.h" -#include "suggest/core/dictionary/property/historical_info.h" -#include "suggest/core/dictionary/property/word_property.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/interface/ngram_listener.h" +#include "dictionary/property/historical_info.h" +#include "dictionary/property/word_property.h" #include "suggest/core/suggest_interface.h" #include "utils/int_array_view.h" diff --git a/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp b/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp index 9573c37bc..7de550026 100644 --- a/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp +++ b/native/jni/src/suggest/core/dictionary/dictionary_utils.cpp @@ -16,13 +16,13 @@ #include "suggest/core/dictionary/dictionary_utils.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/property/ngram_context.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_vector.h" #include "suggest/core/dictionary/dictionary.h" #include "suggest/core/dictionary/digraph_utils.h" -#include "suggest/core/session/ngram_context.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" #include "utils/int_array_view.h" namespace latinime { diff --git a/native/jni/src/suggest/core/dictionary/digraph_utils.cpp b/native/jni/src/suggest/core/dictionary/digraph_utils.cpp index bb2ce5012..4d68f620f 100644 --- a/native/jni/src/suggest/core/dictionary/digraph_utils.cpp +++ b/native/jni/src/suggest/core/dictionary/digraph_utils.cpp @@ -19,7 +19,7 @@ #include #include "defines.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" #include "utils/char_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp index 1aff72952..7c37241de 100644 --- a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp +++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp @@ -19,9 +19,9 @@ #include #include +#include "dictionary/utils/binary_dictionary_shortcut_iterator.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_utils.h" -#include "suggest/core/dictionary/binary_dictionary_shortcut_iterator.h" #include "suggest/core/dictionary/error_type_utils.h" #include "suggest/core/policy/scoring.h" #include "suggest/core/result/suggestion_results.h" diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.h b/native/jni/src/suggest/core/result/suggestions_output_utils.h index eca1f78b2..bcb75a483 100644 --- a/native/jni/src/suggest/core/result/suggestions_output_utils.h +++ b/native/jni/src/suggest/core/result/suggestions_output_utils.h @@ -18,7 +18,7 @@ #define LATINIME_SUGGESTIONS_OUTPUT_UTILS #include "defines.h" -#include "suggest/core/dictionary/word_attributes.h" +#include "dictionary/property/word_attributes.h" namespace latinime { diff --git a/native/jni/src/suggest/core/session/dic_traverse_session.cpp b/native/jni/src/suggest/core/session/dic_traverse_session.cpp index 52dc2f86c..d7dd5a02d 100644 --- a/native/jni/src/suggest/core/session/dic_traverse_session.cpp +++ b/native/jni/src/suggest/core/session/dic_traverse_session.cpp @@ -17,10 +17,10 @@ #include "suggest/core/session/dic_traverse_session.h" #include "defines.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/property/ngram_context.h" #include "suggest/core/dictionary/dictionary.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" -#include "suggest/core/session/ngram_context.h" namespace latinime { diff --git a/native/jni/src/suggest/core/session/dic_traverse_session.h b/native/jni/src/suggest/core/session/dic_traverse_session.h index bc53167f0..f5fcfddcd 100644 --- a/native/jni/src/suggest/core/session/dic_traverse_session.h +++ b/native/jni/src/suggest/core/session/dic_traverse_session.h @@ -20,9 +20,9 @@ #include #include "defines.h" +#include "dictionary/utils/multi_bigram_map.h" #include "jni.h" #include "suggest/core/dicnode/dic_nodes_cache.h" -#include "suggest/core/dictionary/multi_bigram_map.h" #include "suggest/core/layout/proximity_info_state.h" #include "utils/int_array_view.h" diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp index e5e9b46bf..52fa5a5db 100644 --- a/native/jni/src/suggest/core/suggest.cpp +++ b/native/jni/src/suggest/core/suggest.cpp @@ -16,14 +16,14 @@ #include "suggest/core/suggest.h" +#include "dictionary/interface/dictionary_structure_with_buffer_policy.h" +#include "dictionary/property/word_attributes.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_vector.h" #include "suggest/core/dictionary/dictionary.h" #include "suggest/core/dictionary/digraph_utils.h" -#include "suggest/core/dictionary/word_attributes.h" #include "suggest/core/layout/proximity_info.h" -#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" #include "suggest/core/policy/traversal.h" #include "suggest/core/policy/weighting.h" #include "suggest/core/result/suggestions_output_utils.h" diff --git a/native/jni/src/utils/jni_data_utils.h b/native/jni/src/utils/jni_data_utils.h index 01295859c..8024e34c4 100644 --- a/native/jni/src/utils/jni_data_utils.h +++ b/native/jni/src/utils/jni_data_utils.h @@ -20,11 +20,11 @@ #include #include "defines.h" +#include "dictionary/header/header_read_write_utils.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" +#include "dictionary/property/ngram_context.h" +#include "dictionary/property/word_property.h" #include "jni.h" -#include "suggest/core/dictionary/property/word_property.h" -#include "suggest/core/session/ngram_context.h" -#include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" #include "utils/char_utils.h" namespace latinime { diff --git a/native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp b/native/jni/tests/dictionary/header/header_read_write_utils_test.cpp similarity index 95% rename from native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp rename to native/jni/tests/dictionary/header/header_read_write_utils_test.cpp index da6a2af27..eab5d6575 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/header/header_read_write_utils_test.cpp +++ b/native/jni/tests/dictionary/header/header_read_write_utils_test.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" +#include "dictionary/header/header_read_write_utils.h" #include #include #include -#include "suggest/core/policy/dictionary_header_structure_policy.h" +#include "dictionary/interface/dictionary_header_structure_policy.h" namespace latinime { namespace { diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp similarity index 91% rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp rename to native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp index 44b5a8aaa..2e3047eda 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp +++ b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_global_counters_test.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_global_counters.h" +#include "dictionary/structure/v4/content/language_model_dict_content_global_counters.h" #include -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { namespace { diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp similarity index 98% rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp rename to native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp index 313a9af10..ca8626e2f 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content_test.cpp +++ b/native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h" +#include "dictionary/structure/v4/content/language_model_dict_content.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp b/native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp similarity index 96% rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp rename to native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp index eb78034ba..ba81671b5 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/probability_entry_test.cpp +++ b/native/jni/tests/dictionary/structure/v4/content/probability_entry_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h" +#include "dictionary/structure/v4/content/probability_entry.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp b/native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp similarity index 94% rename from native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp rename to native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp index 23b9c55f7..4f23889ca 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp +++ b/native/jni/tests/dictionary/structure/v4/content/terminal_position_lookup_table_test.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h" +#include "dictionary/structure/v4/content/terminal_position_lookup_table.h" #include #include #include "defines.h" -#include "suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h" +#include "dictionary/structure/v4/ver4_dict_constants.h" namespace latinime { namespace { diff --git a/native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp b/native/jni/tests/dictionary/utils/bloom_filter_test.cpp similarity index 98% rename from native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp rename to native/jni/tests/dictionary/utils/bloom_filter_test.cpp index b62021784..bcc88438c 100644 --- a/native/jni/tests/suggest/core/dictionary/bloom_filter_test.cpp +++ b/native/jni/tests/dictionary/utils/bloom_filter_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/core/dictionary/bloom_filter.h" +#include "dictionary/utils/bloom_filter.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp b/native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp similarity index 97% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp rename to native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp index fa6c6d71e..25878910b 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer_test.cpp +++ b/native/jni/tests/dictionary/utils/buffer_with_extendable_buffer_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp b/native/jni/tests/dictionary/utils/byte_array_utils_test.cpp similarity index 98% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp rename to native/jni/tests/dictionary/utils/byte_array_utils_test.cpp index c201e0d00..07257530b 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/byte_array_utils_test.cpp +++ b/native/jni/tests/dictionary/utils/byte_array_utils_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/byte_array_utils.h" +#include "dictionary/utils/byte_array_utils.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp b/native/jni/tests/dictionary/utils/format_utils_test.cpp similarity index 98% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp rename to native/jni/tests/dictionary/utils/format_utils_test.cpp index 494200568..3561bda30 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/format_utils_test.cpp +++ b/native/jni/tests/dictionary/utils/format_utils_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/format_utils.h" +#include "dictionary/utils/format_utils.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp b/native/jni/tests/dictionary/utils/probability_utils_test.cpp similarity index 93% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp rename to native/jni/tests/dictionary/utils/probability_utils_test.cpp index be1f278c6..4020ea441 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/probability_utils_test.cpp +++ b/native/jni/tests/dictionary/utils/probability_utils_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/probability_utils.h" +#include "dictionary/utils/probability_utils.h" #include diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp b/native/jni/tests/dictionary/utils/sparse_table_test.cpp similarity index 91% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp rename to native/jni/tests/dictionary/utils/sparse_table_test.cpp index 0b57156a0..237c9631c 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/sparse_table_test.cpp +++ b/native/jni/tests/dictionary/utils/sparse_table_test.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/sparse_table.h" +#include "dictionary/utils/sparse_table.h" #include -#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" +#include "dictionary/utils/buffer_with_extendable_buffer.h" namespace latinime { namespace { diff --git a/native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp b/native/jni/tests/dictionary/utils/trie_map_test.cpp similarity index 99% rename from native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp rename to native/jni/tests/dictionary/utils/trie_map_test.cpp index 56b5aa985..745d39897 100644 --- a/native/jni/tests/suggest/policyimpl/dictionary/utils/trie_map_test.cpp +++ b/native/jni/tests/dictionary/utils/trie_map_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/utils/trie_map.h" +#include "dictionary/utils/trie_map.h" #include