M mert/TerScorer.cpp

M    mert/BleuScorer.h
M    mert/ScorerFactory.h
M    mert/Scorer.h
M    mert/PerScorer.h
M    mert/TerScorer.h
M    mert/Makefile.am
AM   scripts/training/mert-moses-multi.pl


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4299 1f5c12ca-751b-0410-a591-d2e778427230

1 files changed, 4 insertions, 0 deletions

diff --git a/mert/ScorerFactory.h b/mert/ScorerFactory.h
index 1fa936ba5..9bab8d933 100644
--- a/mert/ScorerFactory.h
+++ b/mert/ScorerFactory.h
@@ -16,6 +16,7 @@
 #include "PerScorer.h"
 #include "TerScorer.h"
 #include "CderScorer.h"
+#include "MergeScorer.h"
 
 using namespace std;
 
@@ -29,6 +30,7 @@ public:
     types.push_back(string("PER"));
     types.push_back(string("TER"));
     types.push_back(string("CDER"));
+    types.push_back(string("MERGE"));
     return types;
   }
 
@@ -41,6 +43,8 @@ public:
       return (TerScorer*) new TerScorer(config);
     } else if (type == "CDER") {
       return (CderScorer*) new CderScorer(config);
+    } else if (type == "MERGE") {
+      return (MergeScorer*) new MergeScorer(config);
     } else {
       throw runtime_error("Unknown scorer type: " + type);
     }