diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-10-16 00:35:56 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-10-16 00:35:56 +0400 |
| commit | 365e68011521fee9d9e8f22801e58891c5fa5f0b (patch) | |
| tree | eb6bff09b5b0e2763f1ffef2f04d6a79ed568221 /contrib | |
| parent | 61ae24aa5d1db2c117c1aa90ca65ef4fe41490fa (diff) | |
| parent | 0eb98df0fe32a8e31188fa107f789afd73d81ccf (diff) | |
Merge remote-tracking branch 'origin/master' into miramerge
NB Untested
Conflicts:
Jamroot
moses-chart-cmd/src/Main.cpp
moses/src/ChartManager.cpp
moses/src/RuleTable/LoaderStandard.cpp
moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
moses/src/Word.cpp
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/server/mosesserver.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/server/mosesserver.cpp b/contrib/server/mosesserver.cpp index f040d8b12..dc721894e 100644 --- a/contrib/server/mosesserver.cpp +++ b/contrib/server/mosesserver.cpp @@ -175,8 +175,7 @@ public: stringstream out, graphInfo, transCollOpts; map<string, xmlrpc_c::value> retData; - SearchAlgorithm searchAlgorithm = staticData.GetSearchAlgorithm(); - if (searchAlgorithm == ChartDecoding) { + if (staticData.IsChart()) { TreeInput tinput; const vector<FactorType> &inputFactorOrder = staticData.GetInputFactorOrder(); |