From 293003483072888aa954f06d3097f5b46f55e1e5 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 30 Aug 2011 14:03:43 +0800 Subject: switch to pinyin internal header --- tests/include/test_memory_chunk.cpp | 2 +- tests/lookup/test_phrase_lookup.cpp | 2 +- tests/lookup/test_simple_lookup.cpp | 2 +- tests/storage/test_flexible_ngram.cpp | 2 +- tests/storage/test_ngram.cpp | 2 +- tests/storage/test_phrase_index.cpp | 2 +- tests/storage/test_phrase_index_logger.cpp | 2 +- tests/storage/test_phrase_table.cpp | 2 +- tests/storage/test_pinyin_index.cpp | 2 +- tests/test_phrase.cpp | 1 + tests/test_pinyin.cpp | 1 + utils/segment/ngseg.cpp | 2 +- utils/segment/spseg.cpp | 2 +- utils/storage/export_interpolation.cpp | 4 +++- utils/storage/gen_binary_files.cpp | 2 +- utils/storage/gen_pinyin_table.cpp | 2 ++ utils/storage/import_interpolation.cpp | 2 +- utils/training/estimate_interpolation.cpp | 2 +- utils/training/estimate_k_mixture_model.cpp | 2 +- utils/training/eval_correction_rate.cpp | 2 +- utils/training/export_k_mixture_model.cpp | 2 +- utils/training/gen_deleted_ngram.cpp | 2 +- utils/training/gen_k_mixture_model.cpp | 2 +- utils/training/gen_ngram.cpp | 2 +- utils/training/gen_unigram.cpp | 2 +- utils/training/import_k_mixture_model.cpp | 2 +- utils/training/k_mixture_model_to_interpolation.cpp | 2 +- utils/training/merge_k_mixture_model.cpp | 2 +- utils/training/prune_k_mixture_model.cpp | 2 +- utils/training/validate_k_mixture_model.cpp | 2 +- 30 files changed, 33 insertions(+), 27 deletions(-) diff --git a/tests/include/test_memory_chunk.cpp b/tests/include/test_memory_chunk.cpp index be83247..4920424 100644 --- a/tests/include/test_memory_chunk.cpp +++ b/tests/include/test_memory_chunk.cpp @@ -1,5 +1,5 @@ #include -#include "pinyin.h" +#include "pinyin_internal.h" //Test Memory Chunk Functionality int main(int argc, char * argv[]){ diff --git a/tests/lookup/test_phrase_lookup.cpp b/tests/lookup/test_phrase_lookup.cpp index dd8bf80..24e6982 100644 --- a/tests/lookup/test_phrase_lookup.cpp +++ b/tests/lookup/test_phrase_lookup.cpp @@ -22,7 +22,7 @@ #include #include -#include "pinyin.h" +#include "pinyin_internal.h" void print_help(){ printf("Usage: test_phrase_lookup\n"); diff --git a/tests/lookup/test_simple_lookup.cpp b/tests/lookup/test_simple_lookup.cpp index b58f248..8114a12 100644 --- a/tests/lookup/test_simple_lookup.cpp +++ b/tests/lookup/test_simple_lookup.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" size_t bench_times = 1000; diff --git a/tests/storage/test_flexible_ngram.cpp b/tests/storage/test_flexible_ngram.cpp index 85a36ac..2f96906 100644 --- a/tests/storage/test_flexible_ngram.cpp +++ b/tests/storage/test_flexible_ngram.cpp @@ -1,4 +1,4 @@ -#include "pinyin.h" +#include "pinyin_internal.h" int main(int argc, char * argv[]) { FlexibleSingleGram single_gram; diff --git a/tests/storage/test_ngram.cpp b/tests/storage/test_ngram.cpp index 9577167..b3c6b67 100644 --- a/tests/storage/test_ngram.cpp +++ b/tests/storage/test_ngram.cpp @@ -1,5 +1,5 @@ #include -#include "pinyin.h" +#include "pinyin_internal.h" int main(int argc, char * argv[]){ diff --git a/tests/storage/test_phrase_index.cpp b/tests/storage/test_phrase_index.cpp index f4b4a7e..8f22a7d 100644 --- a/tests/storage/test_phrase_index.cpp +++ b/tests/storage/test_phrase_index.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" size_t bench_times = 100000; diff --git a/tests/storage/test_phrase_index_logger.cpp b/tests/storage/test_phrase_index_logger.cpp index ec5cc79..e0434c0 100644 --- a/tests/storage/test_phrase_index_logger.cpp +++ b/tests/storage/test_phrase_index_logger.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pinyin.h" +#include "pinyin_internal.h" /* TODO: check whether gb_char.bin and gb_char2.bin should be the same. */ diff --git a/tests/storage/test_phrase_table.cpp b/tests/storage/test_phrase_table.cpp index c81b472..1bab4cf 100644 --- a/tests/storage/test_phrase_table.cpp +++ b/tests/storage/test_phrase_table.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" size_t bench_times = 1000; diff --git a/tests/storage/test_pinyin_index.cpp b/tests/storage/test_pinyin_index.cpp index 9f5669b..2a945f4 100644 --- a/tests/storage/test_pinyin_index.cpp +++ b/tests/storage/test_pinyin_index.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" size_t bench_times = 1000; diff --git a/tests/test_phrase.cpp b/tests/test_phrase.cpp index dfd5595..73aa2de 100644 --- a/tests/test_phrase.cpp +++ b/tests/test_phrase.cpp @@ -20,6 +20,7 @@ */ +#include #include "pinyin.h" int main(int argc, char * argv[]){ diff --git a/tests/test_pinyin.cpp b/tests/test_pinyin.cpp index d335f77..fe37ba5 100644 --- a/tests/test_pinyin.cpp +++ b/tests/test_pinyin.cpp @@ -20,6 +20,7 @@ */ +#include #include "pinyin.h" int main(int argc, char * argv[]){ diff --git a/utils/segment/ngseg.cpp b/utils/segment/ngseg.cpp index fdea69c..380c556 100644 --- a/utils/segment/ngseg.cpp +++ b/utils/segment/ngseg.cpp @@ -22,7 +22,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" /* n-gram based sentence segment. */ diff --git a/utils/segment/spseg.cpp b/utils/segment/spseg.cpp index 7d627e2..d2495c4 100644 --- a/utils/segment/spseg.cpp +++ b/utils/segment/spseg.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" /* graph shortest path sentence segment. */ diff --git a/utils/storage/export_interpolation.cpp b/utils/storage/export_interpolation.cpp index 0516079..1e6a318 100644 --- a/utils/storage/export_interpolation.cpp +++ b/utils/storage/export_interpolation.cpp @@ -19,10 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pinyin.h" + #include #include #include +#include "pinyin_internal.h" + /* export interpolation model as textual format */ diff --git a/utils/storage/gen_binary_files.cpp b/utils/storage/gen_binary_files.cpp index 90bc0c0..4c71247 100644 --- a/utils/storage/gen_binary_files.cpp +++ b/utils/storage/gen_binary_files.cpp @@ -21,7 +21,7 @@ #include #include -#include "pinyin.h" +#include "pinyin_internal.h" void print_help(){ printf("Usage: gen_binary_files --table-dir \n"); diff --git a/utils/storage/gen_pinyin_table.cpp b/utils/storage/gen_pinyin_table.cpp index c6f7bff..83a5c8a 100644 --- a/utils/storage/gen_pinyin_table.cpp +++ b/utils/storage/gen_pinyin_table.cpp @@ -20,6 +20,8 @@ */ #include +#include +#include #include #include #include "pinyin.h" diff --git a/utils/storage/import_interpolation.cpp b/utils/storage/import_interpolation.cpp index 221048d..643bf1a 100644 --- a/utils/storage/import_interpolation.cpp +++ b/utils/storage/import_interpolation.cpp @@ -21,7 +21,7 @@ #include #include -#include "pinyin.h" +#include "pinyin_internal.h" enum LINE_TYPE{ BEGIN_LINE = 1, diff --git a/utils/training/estimate_interpolation.cpp b/utils/training/estimate_interpolation.cpp index 0dc1542..dd6ed2b 100644 --- a/utils/training/estimate_interpolation.cpp +++ b/utils/training/estimate_interpolation.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" parameter_t compute_interpolation(SingleGram * deleted_bigram, FacadePhraseIndex * unigram, diff --git a/utils/training/estimate_k_mixture_model.cpp b/utils/training/estimate_k_mixture_model.cpp index aa2111e..2a1fde7 100644 --- a/utils/training/estimate_k_mixture_model.cpp +++ b/utils/training/estimate_k_mixture_model.cpp @@ -20,7 +20,7 @@ */ #include -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" void print_help(){ diff --git a/utils/training/eval_correction_rate.cpp b/utils/training/eval_correction_rate.cpp index 721bd50..6706492 100644 --- a/utils/training/eval_correction_rate.cpp +++ b/utils/training/eval_correction_rate.cpp @@ -20,7 +20,7 @@ */ -#include "pinyin.h" +#include "pinyin_internal.h" void print_help(){ diff --git a/utils/training/export_k_mixture_model.cpp b/utils/training/export_k_mixture_model.cpp index fc91088..f00d6b4 100644 --- a/utils/training/export_k_mixture_model.cpp +++ b/utils/training/export_k_mixture_model.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" void print_help(){ diff --git a/utils/training/gen_deleted_ngram.cpp b/utils/training/gen_deleted_ngram.cpp index 54074c2..ff8eef1 100644 --- a/utils/training/gen_deleted_ngram.cpp +++ b/utils/training/gen_deleted_ngram.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" static PhraseLargeTable * g_phrases = NULL; diff --git a/utils/training/gen_k_mixture_model.cpp b/utils/training/gen_k_mixture_model.cpp index 05dfa01..83f149f 100644 --- a/utils/training/gen_k_mixture_model.cpp +++ b/utils/training/gen_k_mixture_model.cpp @@ -20,9 +20,9 @@ */ -#include "pinyin.h" #include #include +#include "pinyin_internal.h" #include "k_mixture_model.h" /* Hash token of Hash token of word count. */ diff --git a/utils/training/gen_ngram.cpp b/utils/training/gen_ngram.cpp index bfd35cc..2dfc168 100644 --- a/utils/training/gen_ngram.cpp +++ b/utils/training/gen_ngram.cpp @@ -24,7 +24,7 @@ #include #include #include -#include "pinyin.h" +#include "pinyin_internal.h" static PhraseLargeTable * g_phrases = NULL; diff --git a/utils/training/gen_unigram.cpp b/utils/training/gen_unigram.cpp index ae18146..8abfd25 100644 --- a/utils/training/gen_unigram.cpp +++ b/utils/training/gen_unigram.cpp @@ -20,7 +20,7 @@ */ #include -#include "pinyin.h" +#include "pinyin_internal.h" /* increase all unigram frequency by a constant. */ diff --git a/utils/training/import_k_mixture_model.cpp b/utils/training/import_k_mixture_model.cpp index 6d0fafd..26cc21c 100644 --- a/utils/training/import_k_mixture_model.cpp +++ b/utils/training/import_k_mixture_model.cpp @@ -20,7 +20,7 @@ */ #include -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" enum LINE_TYPE{ diff --git a/utils/training/k_mixture_model_to_interpolation.cpp b/utils/training/k_mixture_model_to_interpolation.cpp index 3ba6dd0..b0e830d 100644 --- a/utils/training/k_mixture_model_to_interpolation.cpp +++ b/utils/training/k_mixture_model_to_interpolation.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pinyin.h" +#include "pinyin_internal.h" enum LINE_TYPE{ BEGIN_LINE = 1, diff --git a/utils/training/merge_k_mixture_model.cpp b/utils/training/merge_k_mixture_model.cpp index a93fe86..0be5725 100644 --- a/utils/training/merge_k_mixture_model.cpp +++ b/utils/training/merge_k_mixture_model.cpp @@ -20,7 +20,7 @@ */ #include -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" void print_help(){ diff --git a/utils/training/prune_k_mixture_model.cpp b/utils/training/prune_k_mixture_model.cpp index 043c3ad..3069f02 100644 --- a/utils/training/prune_k_mixture_model.cpp +++ b/utils/training/prune_k_mixture_model.cpp @@ -23,7 +23,7 @@ #include #include -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" static guint32 g_prune_k = 3; diff --git a/utils/training/validate_k_mixture_model.cpp b/utils/training/validate_k_mixture_model.cpp index 16383d8..5fc7031 100644 --- a/utils/training/validate_k_mixture_model.cpp +++ b/utils/training/validate_k_mixture_model.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "pinyin.h" +#include "pinyin_internal.h" #include "k_mixture_model.h" void print_help(){ -- cgit