diff options
Diffstat (limited to 'utils/training')
| -rw-r--r-- | utils/training/import_k_mixture_model.cpp | 19 | ||||
| -rw-r--r-- | utils/training/k_mixture_model_to_interpolation.cpp | 11 |
2 files changed, 1 insertions, 29 deletions
diff --git a/utils/training/import_k_mixture_model.cpp b/utils/training/import_k_mixture_model.cpp index 7af768e..b53be75 100644 --- a/utils/training/import_k_mixture_model.cpp +++ b/utils/training/import_k_mixture_model.cpp @@ -24,25 +24,6 @@ #include "utils_helper.h" #include "k_mixture_model.h" -#define TAGLIB_GET_VALUE(var, index) \ - phrase_token_t var = null_token; \ - { \ - const char * string = (const char *) g_ptr_array_index \ - (values, index); \ - var = taglib_string_to_token \ - (phrase_table, phrase_index, string); \ - } - -#define TAGLIB_GET_TAGVALUE(type, var, conv) \ - type var; \ - { \ - gpointer value = NULL; \ - assert(g_hash_table_lookup_extended \ - (required, #var, NULL, &value)); \ - var = conv((const char *)value); \ - } - - enum LINE_TYPE{ BEGIN_LINE = 1, END_LINE, diff --git a/utils/training/k_mixture_model_to_interpolation.cpp b/utils/training/k_mixture_model_to_interpolation.cpp index 7428e01..3a83f32 100644 --- a/utils/training/k_mixture_model_to_interpolation.cpp +++ b/utils/training/k_mixture_model_to_interpolation.cpp @@ -20,16 +20,7 @@ */ #include "pinyin_internal.h" - -#define TAGLIB_GET_TAGVALUE(type, var, conv) \ - type var; \ - { \ - gpointer value = NULL; \ - assert(g_hash_table_lookup_extended \ - (required, #var, NULL, &value)); \ - var = conv((const char *)value); \ - } - +#include "utils_helper.h" enum LINE_TYPE{ BEGIN_LINE = 1, |