update with new libpinyin path

5 files changed, 18 insertions, 16 deletions

diff --git a/estimate.py b/estimate.py
index 7b07089..6f35d70 100755
--- a/estimate.py
+++ b/estimate.py
@@ -13,7 +13,7 @@ config = MyConfig()
 
 #change cwd to the libpinyin utils/training directory
 libpinyin_dir = config.getToolsDir()
-libpinyin_sub_dir = os.path.join(libpinyin_dir, 'utils', 'training')
+libpinyin_sub_dir = os.path.join(libpinyin_dir, 'data')
 os.chdir(libpinyin_sub_dir)
 #chdir done
 
@@ -36,7 +36,7 @@ def handleOneModel(modelfile, reportfile):
     avg_lambda = 0.
 
     #begin processing
-    cmdline = ['./estimate_k_mixture_model', \
+    cmdline = ['../utils/training/estimate_k_mixture_model', \
                    '--deleted-bigram-file', \
                    config.getEstimatesModel(), \
                    '--bigram-file', \
diff --git a/evaluate.py b/evaluate.py
index ad3ea4e..01c246f 100755
--- a/evaluate.py
+++ b/evaluate.py
@@ -54,13 +54,13 @@ def buildData():
 def estimateModel(reportfile):
     #change to utils/training subdir
     cwd = os.getcwd()
-    os.chdir(os.path.join(libpinyindir, 'utils', 'training'))
+    os.chdir(os.path.join(libpinyindir, 'data'))
 
     result_line_prefix = "average lambda:"
     avg_lambda = 0.
 
     #begin processing
-    cmdline = ['./estimate_interpolation']
+    cmdline = ['../utils/training/estimate_interpolation']
 
     subprocess = Popen(cmdline, shell=False, stdout=PIPE, \
                            close_fds=True)
@@ -100,13 +100,13 @@ def modifyCodeforLambda(lambdaparam):
 def evaluateModel(reportfile):
     #change to utils/training subdir
     cwd = os.getcwd()
-    os.chdir(os.path.join(libpinyindir, 'utils', 'training'))
+    os.chdir(os.path.join(libpinyindir, 'data'))
 
     result_line_prefix = "correction rate:"
     rate = 0.
 
     #begin processing
-    cmdline = './eval_correction_rate 2>"' + reportfile + '"'
+    cmdline = '../utils/training/eval_correction_rate 2>"' + reportfile + '"'
 
     subprocess = Popen(cmdline, shell=True, stdout=PIPE, \
                            close_fds=True)
diff --git a/generate.py b/generate.py
index f3cc09c..ff7a377 100755
--- a/generate.py
+++ b/generate.py
@@ -12,7 +12,7 @@ config = MyConfig()
 
 #change cwd to the libpinyin utils/training directory
 libpinyin_dir = config.getToolsDir()
-libpinyin_sub_dir = os.path.join(libpinyin_dir, 'utils', 'training')
+libpinyin_sub_dir = os.path.join(libpinyin_dir, 'data')
 os.chdir(libpinyin_sub_dir)
 #chdir done
 
@@ -31,7 +31,8 @@ def generateOneText(infile, modelfile, reportfile):
         return False
 
     #begin processing
-    cmdline = ['./gen_k_mixture_model', '--maximum-occurs-allowed', \
+    cmdline = ['../utils/training/gen_k_mixture_model', \
+                   '--maximum-occurs-allowed', \
                    str(config.getMaximumOccursAllowed()), \
                    '--maximum-increase-rates-allowed', \
                    str(config.getMaximumIncreaseRatesAllowed()), \
diff --git a/segment.py b/segment.py
index 09cd904..180700e 100755
--- a/segment.py
+++ b/segment.py
@@ -12,7 +12,7 @@ config = MyConfig()
 
 #change cwd to the libpinyin utils/segment directory
 libpinyin_dir = config.getToolsDir()
-libpinyin_sub_dir = os.path.join(libpinyin_dir, 'utils', 'segment')
+libpinyin_sub_dir = os.path.join(libpinyin_dir, 'data')
 os.chdir(libpinyin_sub_dir)
 #chdir done
 
@@ -28,7 +28,7 @@ def segmentOneText(infile, outfile, reportfile):
         return
 
     #begin processing
-    cmdline = './ngseg >"' + outfile + '"'
+    cmdline = '../utils/segment/ngseg >"' + outfile + '"'
     subprocess = Popen(cmdline, shell=True, stdin=PIPE, stderr=PIPE, \
                            close_fds=True)
 
diff --git a/tryprune.py b/tryprune.py
index 711ed0e..80a45cf 100755
--- a/tryprune.py
+++ b/tryprune.py
@@ -13,14 +13,14 @@ config = MyConfig()
 
 #change cwd to the libpinyin utils/training directory
 libpinyin_dir = config.getToolsDir()
-libpinyin_sub_dir = os.path.join(libpinyin_dir, 'utils', 'training')
+libpinyin_sub_dir = os.path.join(libpinyin_dir, 'data')
 os.chdir(libpinyin_sub_dir)
 #chdir done
 
 
 def validateModel(modelfile):
     #begin processing
-    cmdline = ['./validate_k_mixture_model', \
+    cmdline = ['../utils/training/validate_k_mixture_model', \
                    modelfile]
 
     subprocess = Popen(cmdline, shell=False, close_fds=True)
@@ -33,7 +33,7 @@ def validateModel(modelfile):
 
 def exportModel(modelfile, textmodel):
     #begin processing
-    cmdline = ['./export_k_mixture_model', \
+    cmdline = ['../utils/training/export_k_mixture_model', \
                    '--k-mixture-model-file', \
                    modelfile]
 
@@ -52,7 +52,8 @@ def exportModel(modelfile, textmodel):
 
 def convertModel(kmm_model, inter_model):
     #begin processing
-    cmdline = './k_mixture_model_to_interpolation <"' + kmm_model + '"'
+    cmdline = '../utils/training/k_mixture_model_to_interpolation <"' \
+        + kmm_model + '"'
 
     subprocess = Popen(cmdline, shell=True, \
                            stdout=PIPE, close_fds=True)
@@ -77,7 +78,7 @@ def mergeOneModel(mergedmodel, onemodel, score):
         raise AssertionError('estimate scores mis-match.\n')
 
     #begin processing
-    cmdline = ['./merge_k_mixture_model', \
+    cmdline = ['../utils/training/merge_k_mixture_model', \
                    '--result-file', \
                    mergedmodel, \
                    onemodel]
@@ -118,7 +119,7 @@ def mergeSomeModels(mergedmodel, sortedindexname, mergenum):
 
 def pruneModel(prunedmodel, k, CDF):
     #begin processing
-    cmdline = ['./prune_k_mixture_model', \
+    cmdline = ['../utils/training/prune_k_mixture_model', \
                '-k', str(k), '--CDF', str(CDF),
                prunedmodel]