update training tools

7 files changed, 14 insertions, 14 deletions

diff --git a/utils/training/estimate_interpolation.cpp b/utils/training/estimate_interpolation.cpp
index 5cdc680..b8687ee 100644
--- a/utils/training/estimate_interpolation.cpp
+++ b/utils/training/estimate_interpolation.cpp
@@ -89,7 +89,7 @@ parameter_t compute_interpolation(SingleGram * deleted_bigram,
 }
     
 int main(int argc, char * argv[]){
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -100,7 +100,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);
diff --git a/utils/training/eval_correction_rate.cpp b/utils/training/eval_correction_rate.cpp
index b45781d..3d0e4e2 100644
--- a/utils/training/eval_correction_rate.cpp
+++ b/utils/training/eval_correction_rate.cpp
@@ -116,7 +116,7 @@ bool do_one_test(PinyinLookup2 * pinyin_lookup,
 int main(int argc, char * argv[]){
     const char * evals_text = "evals2.text";
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -139,7 +139,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);
diff --git a/utils/training/export_k_mixture_model.cpp b/utils/training/export_k_mixture_model.cpp
index e446e79..97241e8 100644
--- a/utils/training/export_k_mixture_model.cpp
+++ b/utils/training/export_k_mixture_model.cpp
@@ -124,7 +124,7 @@ int main(int argc, char * argv[]){
         exit(EINVAL);
     }
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -135,7 +135,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);
diff --git a/utils/training/gen_deleted_ngram.cpp b/utils/training/gen_deleted_ngram.cpp
index b6f96fa..bdbf00e 100644
--- a/utils/training/gen_deleted_ngram.cpp
+++ b/utils/training/gen_deleted_ngram.cpp
@@ -51,7 +51,7 @@ int main(int argc, char * argv[]){
         exit(EINVAL);
     }
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -68,7 +68,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENODATA);
diff --git a/utils/training/gen_k_mixture_model.cpp b/utils/training/gen_k_mixture_model.cpp
index 2dfb3d1..0679a7f 100644
--- a/utils/training/gen_k_mixture_model.cpp
+++ b/utils/training/gen_k_mixture_model.cpp
@@ -329,7 +329,7 @@ int main(int argc, char * argv[]){
         exit(EINVAL);
     }
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -345,7 +345,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);
diff --git a/utils/training/gen_ngram.cpp b/utils/training/gen_ngram.cpp
index 1947959..4613ac4 100644
--- a/utils/training/gen_ngram.cpp
+++ b/utils/training/gen_ngram.cpp
@@ -52,7 +52,7 @@ int main(int argc, char * argv[]){
         exit(EINVAL);
     }
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -69,7 +69,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);
diff --git a/utils/training/import_k_mixture_model.cpp b/utils/training/import_k_mixture_model.cpp
index 40870cf..4c60bfd 100644
--- a/utils/training/import_k_mixture_model.cpp
+++ b/utils/training/import_k_mixture_model.cpp
@@ -273,7 +273,7 @@ int main(int argc, char * argv[]){
         exit(EINVAL);
     }
 
-    SystemTableInfo system_table_info;
+    SystemTableInfo2 system_table_info;
 
     bool retval = system_table_info.load(SYSTEM_TABLE_INFO);
     if (!retval) {
@@ -289,7 +289,7 @@ int main(int argc, char * argv[]){
     FacadePhraseIndex phrase_index;
 
     const pinyin_table_info_t * phrase_files =
-        system_table_info.get_table_info();
+        system_table_info.get_default_tables();
 
     if (!load_phrase_index(phrase_files, &phrase_index))
         exit(ENOENT);