diff options
| -rw-r--r-- | tests/lookup/test_phrase_lookup.cpp | 16 | ||||
| -rw-r--r-- | utils/segment/ngseg.cpp | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tests/lookup/test_phrase_lookup.cpp b/tests/lookup/test_phrase_lookup.cpp index 0333290..dd8bf80 100644 --- a/tests/lookup/test_phrase_lookup.cpp +++ b/tests/lookup/test_phrase_lookup.cpp @@ -24,16 +24,15 @@ #include <locale.h> #include "pinyin.h" -PhraseLookup * g_phrase_lookup = NULL; - void print_help(){ printf("Usage: test_phrase_lookup\n"); } -bool try_phrase_lookup(utf16_t * utf16, glong utf16_len){ +bool try_phrase_lookup(PhraseLookup * phrase_lookup, + utf16_t * utf16, glong utf16_len){ char * result_string = NULL; MatchResults results = g_array_new(FALSE, FALSE, sizeof(phrase_token_t)); - g_phrase_lookup->get_best_match(utf16_len, utf16, results); + phrase_lookup->get_best_match(utf16_len, utf16, results); #if 0 for ( size_t i = 0; i < results->len; ++i) { phrase_token_t * token = &g_array_index(results, phrase_token_t, i); @@ -43,7 +42,7 @@ bool try_phrase_lookup(utf16_t * utf16, glong utf16_len){ } printf("\n"); #endif - g_phrase_lookup->convert_to_utf8(results, "\n", result_string); + phrase_lookup->convert_to_utf8(results, "\n", result_string); if (result_string) printf("%s\n", result_string); else @@ -91,8 +90,8 @@ int main(int argc, char * argv[]){ Bigram user_bigram; //init phrase lookup - g_phrase_lookup = new PhraseLookup(&phrase_table, &phrase_index, - &system_bigram, &user_bigram); + PhraseLookup phrase_lookup(&phrase_table, &phrase_index, + &system_bigram, &user_bigram); //try one sentence char * linebuf = NULL; @@ -116,11 +115,10 @@ int main(int argc, char * argv[]){ continue; } - try_phrase_lookup(sentence, len); + try_phrase_lookup(&phrase_lookup, sentence, len); g_free(sentence); } - delete g_phrase_lookup; free(linebuf); return 0; } diff --git a/utils/segment/ngseg.cpp b/utils/segment/ngseg.cpp index 623ca10..ff11681 100644 --- a/utils/segment/ngseg.cpp +++ b/utils/segment/ngseg.cpp @@ -211,6 +211,7 @@ int main(int argc, char * argv[]){ } delete g_phrase_lookup; + g_phrase_lookup = NULL; /* print enter at file tail */ printf("\n"); g_array_free(current_utf16, TRUE); |