diff options
Diffstat (limited to 'utils/training')
| -rw-r--r-- | utils/training/gen_k_mixture_model.cpp | 8 | ||||
| -rw-r--r-- | utils/training/gen_ngram.cpp | 6 | ||||
| -rw-r--r-- | utils/training/import_k_mixture_model.cpp | 16 |
3 files changed, 10 insertions, 20 deletions
diff --git a/utils/training/gen_k_mixture_model.cpp b/utils/training/gen_k_mixture_model.cpp index 0679a7f..bcd9e08 100644 --- a/utils/training/gen_k_mixture_model.cpp +++ b/utils/training/gen_k_mixture_model.cpp @@ -57,7 +57,7 @@ static GOptionEntry entries[] = }; -bool read_document(PhraseLargeTable2 * phrase_table, +bool read_document(PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, FILE * document, HashofDocument hash_of_document, @@ -337,10 +337,8 @@ int main(int argc, char * argv[]){ exit(ENOENT); } - PhraseLargeTable2 phrase_table; - MemoryChunk * chunk = new MemoryChunk; - chunk->load(SYSTEM_PHRASE_INDEX); - phrase_table.load(chunk); + PhraseLargeTable3 phrase_table; + phrase_table.attach(SYSTEM_PHRASE_INDEX, ATTACH_READONLY); FacadePhraseIndex phrase_index; diff --git a/utils/training/gen_ngram.cpp b/utils/training/gen_ngram.cpp index 4613ac4..eb5c389 100644 --- a/utils/training/gen_ngram.cpp +++ b/utils/training/gen_ngram.cpp @@ -60,12 +60,6 @@ int main(int argc, char * argv[]){ exit(ENOENT); } - PhraseLargeTable2 phrase_table; - /* init phrase table */ - MemoryChunk * chunk = new MemoryChunk; - chunk->load(SYSTEM_PHRASE_INDEX); - phrase_table.load(chunk); - FacadePhraseIndex phrase_index; const pinyin_table_info_t * phrase_files = diff --git a/utils/training/import_k_mixture_model.cpp b/utils/training/import_k_mixture_model.cpp index 4c60bfd..5a63cfd 100644 --- a/utils/training/import_k_mixture_model.cpp +++ b/utils/training/import_k_mixture_model.cpp @@ -52,11 +52,11 @@ static size_t len = 0; bool parse_headline(KMixtureModelBigram * bigram); -bool parse_unigram(FILE * input, PhraseLargeTable2 * phrase_table, +bool parse_unigram(FILE * input, PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, KMixtureModelBigram * bigram); -bool parse_bigram(FILE * input, PhraseLargeTable2 * phrase_table, +bool parse_bigram(FILE * input, PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, KMixtureModelBigram * bigram); @@ -103,7 +103,7 @@ bool parse_headline(KMixtureModelBigram * bigram){ return true; } -bool parse_body(FILE * input, PhraseLargeTable2 * phrase_table, +bool parse_body(FILE * input, PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, KMixtureModelBigram * bigram){ taglib_push_state(); @@ -136,7 +136,7 @@ bool parse_body(FILE * input, PhraseLargeTable2 * phrase_table, return true; } -bool parse_unigram(FILE * input, PhraseLargeTable2 * phrase_table, +bool parse_unigram(FILE * input, PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, KMixtureModelBigram * bigram){ taglib_push_state(); @@ -176,7 +176,7 @@ bool parse_unigram(FILE * input, PhraseLargeTable2 * phrase_table, return true; } -bool parse_bigram(FILE * input, PhraseLargeTable2 * phrase_table, +bool parse_bigram(FILE * input, PhraseLargeTable3 * phrase_table, FacadePhraseIndex * phrase_index, KMixtureModelBigram * bigram){ taglib_push_state(); @@ -281,10 +281,8 @@ int main(int argc, char * argv[]){ exit(ENOENT); } - PhraseLargeTable2 phrase_table; - MemoryChunk * chunk = new MemoryChunk; - chunk->load(SYSTEM_PHRASE_INDEX); - phrase_table.load(chunk); + PhraseLargeTable3 phrase_table; + phrase_table.attach(SYSTEM_PHRASE_INDEX, ATTACH_READONLY); FacadePhraseIndex phrase_index; |