diff options
| author | Peng Wu <alexepico@gmail.com> | 2011-05-24 11:15:42 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2011-05-24 11:15:42 +0800 |
| commit | aa84722e1a97cba481d717284ca8160bd5e1d2ac (patch) | |
| tree | 10acc024b5e2994917123bbb482dd33f5d574626 /utils | |
| parent | 47089bf0d8767dcca81fd6ca5f680bb651b356ec (diff) | |
| download | libpinyin-aa84722e1a97cba481d717284ca8160bd5e1d2ac.tar.gz libpinyin-aa84722e1a97cba481d717284ca8160bd5e1d2ac.tar.xz libpinyin-aa84722e1a97cba481d717284ca8160bd5e1d2ac.zip | |
fixes merge k mixture model
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/training/merge_k_mixture_model.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/training/merge_k_mixture_model.cpp b/utils/training/merge_k_mixture_model.cpp index 0e67fc0..3649e74 100644 --- a/utils/training/merge_k_mixture_model.cpp +++ b/utils/training/merge_k_mixture_model.cpp @@ -32,7 +32,6 @@ void print_help(){ static bool merge_two_phrase_array( /* in */ FlexibleBigramPhraseArray first, /* in */ FlexibleBigramPhraseArray second, /* out */ FlexibleBigramPhraseArray & merged ){ - merged = NULL; /* avoid to do empty merge. */ assert( NULL != first && NULL != second && NULL != merged ); @@ -96,7 +95,9 @@ static bool merge_magic_header( /* in & out */ KMixtureModelBigram * target, KMixtureModelMagicHeader merged_magic_header; memset(&merged_magic_header, 0, sizeof(KMixtureModelMagicHeader)); - assert(target->get_magic_header(target_magic_header)); + if (!target->get_magic_header(target_magic_header)) { + memset(&target_magic_header, 0, sizeof(KMixtureModelMagicHeader)); + } assert(new_one->get_magic_header(new_magic_header)); if ( target_magic_header.m_WC + new_magic_header.m_WC < std_lite::max( target_magic_header.m_WC, new_magic_header.m_WC ) ){ |