Support for using factors in mert and evaluator

example:
Use --factor "0|2" to use only first and third factor from nbest list and from reference.
If you use interpolated scorer, separate records with comma (e.g. --factor "0|2,1").

1 files changed, 4 insertions, 1 deletions

diff --git a/mert/CderScorer.cpp b/mert/CderScorer.cpp
index 2105820e9..424c210b3 100644
--- a/mert/CderScorer.cpp
+++ b/mert/CderScorer.cpp
@@ -31,6 +31,7 @@ void CderScorer::setReferenceFiles(const vector<string>& referenceFiles)
     m_ref_sentences.push_back(vector<sent_t>());
     string line;
     while (getline(refin,line)) {
+      line = this->applyFactors(line);
       sent_t encoded;
       TokenizeAndEncode(line, encoded);
       m_ref_sentences[rid].push_back(encoded);
@@ -40,8 +41,10 @@ void CderScorer::setReferenceFiles(const vector<string>& referenceFiles)
 
 void CderScorer::prepareStats(size_t sid, const string& text, ScoreStats& entry)
 {
+  string sentence = this->applyFactors(text);
+
   vector<int> stats;
-  prepareStatsVector(sid, text, stats);
+  prepareStatsVector(sid, sentence, stats);
   entry.set(stats);
 }