From aa84722e1a97cba481d717284ca8160bd5e1d2ac Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 24 May 2011 11:15:42 +0800 Subject: fixes merge k mixture model --- utils/training/merge_k_mixture_model.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'utils/training/merge_k_mixture_model.cpp') 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 ) ){ -- cgit