diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-07-17 16:36:50 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-07-17 16:36:50 +0400 |
| commit | 2b4e61d8261510732ac53eaf48a73e6198b77c2b (patch) | |
| tree | feeba83dd2c24530d5e069f0089803d77ebfc9cb /mert/mert.cpp | |
| parent | f592c222fec19e41fcfb9c059c81de2077b971fe (diff) | |
| parent | 6a94f740197ac3eff812dcf5d4bbf658eea02d5d (diff) | |
Merge branch 'trunk' into miramerge
Compiles, not tested.
Conflicts:
Jamroot
OnDiskPt/PhraseNode.h
OnDiskPt/TargetPhrase.cpp
OnDiskPt/TargetPhrase.h
OnDiskPt/TargetPhraseCollection.cpp
mert/BleuScorer.cpp
mert/Data.cpp
mert/FeatureData.cpp
moses-chart-cmd/src/Main.cpp
moses/src/AlignmentInfo.h
moses/src/ChartManager.cpp
moses/src/LM/Ken.cpp
moses/src/LM/Ken.h
moses/src/LMList.h
moses/src/LexicalReordering.h
moses/src/PhraseDictionaryTree.h
moses/src/ScoreIndexManager.h
moses/src/StaticData.h
moses/src/TargetPhrase.h
moses/src/Word.cpp
scripts/ems/experiment.meta
scripts/ems/experiment.perl
scripts/training/train-model.perl
Diffstat (limited to 'mert/mert.cpp')
| -rw-r--r-- | mert/mert.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mert/mert.cpp b/mert/mert.cpp index 58baffe93..4352927dc 100644 --- a/mert/mert.cpp +++ b/mert/mert.cpp @@ -28,6 +28,7 @@ #include "../moses/src/ThreadPool.h" using namespace std; +using namespace MosesTuning; namespace { |