am a65c267b: Move some dictionary related implementations to the dictionary directory

* commit 'a65c267b1f1207e54c6f821148c600e3899b7f9c':
  Move some dictionary related implementations to the dictionary directory
main
Ken Wakasa 2013-05-30 16:16:35 -07:00 committed by Android Git Automerger
commit e203961dd6
29 changed files with 60 additions and 53 deletions

View File

@ -49,9 +49,7 @@ LATIN_IME_CORE_SRC_FILES := \
bigram_dictionary.cpp \ bigram_dictionary.cpp \
char_utils.cpp \ char_utils.cpp \
correction.cpp \ correction.cpp \
dictionary.cpp \
dic_traverse_wrapper.cpp \ dic_traverse_wrapper.cpp \
digraph_utils.cpp \
unigram_dictionary.cpp \ unigram_dictionary.cpp \
words_priority_queue.cpp \ words_priority_queue.cpp \
suggest/core/suggest.cpp \ suggest/core/suggest.cpp \
@ -59,6 +57,9 @@ LATIN_IME_CORE_SRC_FILES := \
dic_node.cpp \ dic_node.cpp \
dic_node_utils.cpp \ dic_node_utils.cpp \
dic_nodes_cache.cpp) \ dic_nodes_cache.cpp) \
$(addprefix suggest/core/dictionary/, \
dictionary.cpp \
digraph_utils.cpp) \
$(addprefix suggest/core/layout/, \ $(addprefix suggest/core/layout/, \
additional_proximity_chars.cpp \ additional_proximity_chars.cpp \
proximity_info.cpp \ proximity_info.cpp \

View File

@ -29,13 +29,14 @@
#include <cstdio> // for fopen() etc. #include <cstdio> // for fopen() etc.
#endif // USE_MMAP_FOR_DICTIONARY #endif // USE_MMAP_FOR_DICTIONARY
#include "binary_format.h"
#include "com_android_inputmethod_latin_BinaryDictionary.h" #include "com_android_inputmethod_latin_BinaryDictionary.h"
#include "correction.h" #include "correction.h"
#include "dictionary.h"
#include "jni.h" #include "jni.h"
#include "jni_common.h" #include "jni_common.h"
#include "suggest_options.h" #include "suggest_options.h"
#include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/dictionary/dictionary.h"
namespace latinime { namespace latinime {

View File

@ -19,11 +19,12 @@
#define LOG_TAG "LatinIME: bigram_dictionary.cpp" #define LOG_TAG "LatinIME: bigram_dictionary.cpp"
#include "bigram_dictionary.h" #include "bigram_dictionary.h"
#include "binary_format.h"
#include "bloom_filter.h"
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h" #include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/dictionary/bloom_filter.h"
#include "suggest/core/dictionary/dictionary.h"
namespace latinime { namespace latinime {

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "dic_node.h" #include "suggest/core/dicnode/dic_node.h"
namespace latinime { namespace latinime {

View File

@ -19,11 +19,11 @@
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "dic_node_state.h" #include "suggest/core/dicnode/dic_node_state.h"
#include "dic_node_profiler.h" #include "suggest/core/dicnode/dic_node_profiler.h"
#include "dic_node_properties.h" #include "suggest/core/dicnode/dic_node_properties.h"
#include "dic_node_release_listener.h" #include "suggest/core/dicnode/dic_node_release_listener.h"
#include "digraph_utils.h" #include "suggest/core/dictionary/digraph_utils.h"
#if DEBUG_DICT #if DEBUG_DICT
#define LOGI_SHOW_ADD_COST_PROP \ #define LOGI_SHOW_ADD_COST_PROP \

View File

@ -21,8 +21,8 @@
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"
#include "dic_node.h" #include "suggest/core/dicnode/dic_node.h"
#include "dic_node_release_listener.h" #include "suggest/core/dicnode/dic_node_release_listener.h"
#define MAX_DIC_NODE_PRIORITY_QUEUE_CAPACITY 200 #define MAX_DIC_NODE_PRIORITY_QUEUE_CAPACITY 200

View File

@ -19,8 +19,8 @@
#include <stdint.h> #include <stdint.h>
#include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "suggest/core/dictionary/binary_format.h"
namespace latinime { namespace latinime {

View File

@ -18,10 +18,10 @@
#define LATINIME_DIC_NODE_STATE_H #define LATINIME_DIC_NODE_STATE_H
#include "defines.h" #include "defines.h"
#include "dic_node_state_input.h" #include "suggest/core/dicnode/dic_node_state_input.h"
#include "dic_node_state_output.h" #include "suggest/core/dicnode/dic_node_state_output.h"
#include "dic_node_state_prevword.h" #include "suggest/core/dicnode/dic_node_state_prevword.h"
#include "dic_node_state_scoring.h" #include "suggest/core/dicnode/dic_node_state_scoring.h"
namespace latinime { namespace latinime {

View File

@ -21,7 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "defines.h" #include "defines.h"
#include "dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
namespace latinime { namespace latinime {

View File

@ -20,7 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "defines.h" #include "defines.h"
#include "digraph_utils.h" #include "suggest/core/dictionary/digraph_utils.h"
namespace latinime { namespace latinime {

View File

@ -17,11 +17,11 @@
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include "binary_format.h" #include "suggest/core/dicnode/dic_node.h"
#include "dic_node.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "dic_node_utils.h" #include "suggest/core/dicnode/dic_node_vector.h"
#include "dic_node_vector.h" #include "suggest/core/dictionary/binary_format.h"
#include "multi_bigram_map.h" #include "suggest/core/dictionary/multi_bigram_map.h"
#include "suggest/core/layout/proximity_info.h" #include "suggest/core/layout/proximity_info.h"
#include "suggest/core/layout/proximity_info_state.h" #include "suggest/core/layout/proximity_info_state.h"

View File

@ -20,7 +20,7 @@
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"
#include "dic_node.h" #include "suggest/core/dicnode/dic_node.h"
namespace latinime { namespace latinime {

View File

@ -17,9 +17,9 @@
#include <list> #include <list>
#include "defines.h" #include "defines.h"
#include "dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_priority_queue.h"
#include "dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "dic_nodes_cache.h" #include "suggest/core/dicnode/dic_nodes_cache.h"
namespace latinime { namespace latinime {

View File

@ -20,7 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "defines.h" #include "defines.h"
#include "dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_priority_queue.h"
#define INITIAL_QUEUE_ID_ACTIVE 0 #define INITIAL_QUEUE_ID_ACTIVE 0
#define INITIAL_QUEUE_ID_NEXT_ACTIVE 1 #define INITIAL_QUEUE_ID_NEXT_ACTIVE 1

View File

@ -21,9 +21,9 @@
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
#include "bloom_filter.h"
#include "char_utils.h" #include "char_utils.h"
#include "hash_map_compat.h" #include "hash_map_compat.h"
#include "suggest/core/dictionary/bloom_filter.h"
namespace latinime { namespace latinime {

View File

@ -16,17 +16,17 @@
#define LOG_TAG "LatinIME: dictionary.cpp" #define LOG_TAG "LatinIME: dictionary.cpp"
#include "dictionary.h" #include "suggest/core/dictionary/dictionary.h"
#include <map> // TODO: remove #include <map> // TODO: remove
#include <stdint.h> #include <stdint.h>
#include "bigram_dictionary.h" #include "bigram_dictionary.h"
#include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "dic_traverse_wrapper.h" #include "dic_traverse_wrapper.h"
#include "suggest_options.h" #include "suggest_options.h"
#include "suggest/core/suggest.h" #include "suggest/core/suggest.h"
#include "suggest/core/dictionary/binary_format.h"
#include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h" #include "suggest/policyimpl/gesture/gesture_suggest_policy_factory.h"
#include "suggest/policyimpl/typing/typing_suggest_policy_factory.h" #include "suggest/policyimpl/typing/typing_suggest_policy_factory.h"
#include "unigram_dictionary.h" #include "unigram_dictionary.h"

View File

@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
#include "suggest/core/dictionary/digraph_utils.h"
#include "char_utils.h" #include "char_utils.h"
#include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "digraph_utils.h" #include "suggest/core/dictionary/binary_format.h"
namespace latinime { namespace latinime {

View File

@ -17,6 +17,8 @@
#ifndef DIGRAPH_UTILS_H #ifndef DIGRAPH_UTILS_H
#define DIGRAPH_UTILS_H #define DIGRAPH_UTILS_H
#include "defines.h"
namespace latinime { namespace latinime {
class DigraphUtils { class DigraphUtils {

View File

@ -17,12 +17,11 @@
#ifndef LATINIME_MULTI_BIGRAM_MAP_H #ifndef LATINIME_MULTI_BIGRAM_MAP_H
#define LATINIME_MULTI_BIGRAM_MAP_H #define LATINIME_MULTI_BIGRAM_MAP_H
#include <cstring>
#include <stdint.h> #include <stdint.h>
#include "defines.h" #include "defines.h"
#include "binary_format.h"
#include "hash_map_compat.h" #include "hash_map_compat.h"
#include "suggest/core/dictionary/binary_format.h"
namespace latinime { namespace latinime {

View File

@ -19,7 +19,7 @@
#include "defines.h" #include "defines.h"
#include "suggest/core/dicnode/dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "terminal_attributes.h" #include "suggest/core/dictionary/terminal_attributes.h"
namespace latinime { namespace latinime {

View File

@ -18,7 +18,8 @@
#define LATINIME_TERMINAL_ATTRIBUTES_H #define LATINIME_TERMINAL_ATTRIBUTES_H
#include <stdint.h> #include <stdint.h>
#include "binary_format.h"
#include "suggest/core/dictionary/binary_format.h"
namespace latinime { namespace latinime {

View File

@ -18,7 +18,7 @@
#define LATINIME_TOUCH_POSITION_CORRECTION_UTILS_H #define LATINIME_TOUCH_POSITION_CORRECTION_UTILS_H
#include "defines.h" #include "defines.h"
#include "proximity_info_params.h" #include "suggest/core/layout/proximity_info_params.h"
namespace latinime { namespace latinime {
class TouchPositionCorrectionUtils { class TouchPositionCorrectionUtils {

View File

@ -16,12 +16,12 @@
#include "suggest/core/session/dic_traverse_session.h" #include "suggest/core/session/dic_traverse_session.h"
#include "binary_format.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h"
#include "dic_traverse_wrapper.h" #include "dic_traverse_wrapper.h"
#include "jni.h" #include "jni.h"
#include "suggest/core/dicnode/dic_node_utils.h" #include "suggest/core/dicnode/dic_node_utils.h"
#include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/dictionary/dictionary.h"
namespace latinime { namespace latinime {

View File

@ -22,8 +22,8 @@
#include "defines.h" #include "defines.h"
#include "jni.h" #include "jni.h"
#include "multi_bigram_map.h"
#include "suggest/core/dicnode/dic_nodes_cache.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 "suggest/core/layout/proximity_info_state.h"
namespace latinime { namespace latinime {

View File

@ -17,18 +17,18 @@
#include "suggest/core/suggest.h" #include "suggest/core/suggest.h"
#include "char_utils.h" #include "char_utils.h"
#include "dictionary.h"
#include "digraph_utils.h"
#include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_priority_queue.h"
#include "suggest/core/dicnode/dic_node_vector.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/shortcut_utils.h" #include "suggest/core/dictionary/shortcut_utils.h"
#include "suggest/core/dictionary/terminal_attributes.h"
#include "suggest/core/layout/proximity_info.h" #include "suggest/core/layout/proximity_info.h"
#include "suggest/core/policy/scoring.h" #include "suggest/core/policy/scoring.h"
#include "suggest/core/policy/traversal.h" #include "suggest/core/policy/traversal.h"
#include "suggest/core/policy/weighting.h" #include "suggest/core/policy/weighting.h"
#include "suggest/core/session/dic_traverse_session.h" #include "suggest/core/session/dic_traverse_session.h"
#include "terminal_attributes.h"
namespace latinime { namespace latinime {

View File

@ -18,13 +18,13 @@
#define LOG_TAG "LatinIME: unigram_dictionary.cpp" #define LOG_TAG "LatinIME: unigram_dictionary.cpp"
#include "binary_format.h"
#include "char_utils.h" #include "char_utils.h"
#include "defines.h" #include "defines.h"
#include "dictionary.h" #include "suggest/core/dictionary/binary_format.h"
#include "digraph_utils.h" #include "suggest/core/dictionary/dictionary.h"
#include "suggest/core/dictionary/digraph_utils.h"
#include "suggest/core/dictionary/terminal_attributes.h"
#include "suggest/core/layout/proximity_info.h" #include "suggest/core/layout/proximity_info.h"
#include "terminal_attributes.h"
#include "unigram_dictionary.h" #include "unigram_dictionary.h"
#include "words_priority_queue.h" #include "words_priority_queue.h"
#include "words_priority_queue_pool.h" #include "words_priority_queue_pool.h"

View File

@ -19,8 +19,9 @@
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
#include "defines.h" #include "defines.h"
#include "digraph_utils.h" #include "suggest/core/dictionary/digraph_utils.h"
namespace latinime { namespace latinime {