refactor class BleuScoreFeature

contrib/other-builds/moses-chart-cmd/.cproject

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.162355801">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.162355801" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -74,7 +76,6 @@
 									<listOptionValue builtIn="false" value="boost_system-mt"/>
 									<listOptionValue builtIn="false" value="boost_thread-mt"/>
 									<listOptionValue builtIn="false" value="boost_filesystem-mt"/>
-									<listOptionValue builtIn="false" value="rt"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.128214028" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

contrib/other-builds/moses-cmd/.cproject

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.461114338">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.461114338" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -72,7 +74,6 @@
 									<listOptionValue builtIn="false" value="boost_thread-mt"/>
 									<listOptionValue builtIn="false" value="lm"/>
 									<listOptionValue builtIn="false" value="util"/>
-									<listOptionValue builtIn="false" value="rt"/>
 								</option>
 								<option id="gnu.cpp.link.option.userobjs.1542590830" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc}/../../boost/lib64/libboost_system-mt.a&quot;"/>

moses/BleuScoreFeature.cpp

@@ -1,6 +1,7 @@
 #include "BleuScoreFeature.h"
 
 #include "StaticData.h"
+#include "UserMessage.h"
 
 using namespace std;
 
@@ -87,56 +88,49 @@ m_scale_by_inverse_length(false),
 m_scale_by_avg_inverse_length(false),
 m_scale_by_x(1),
 m_historySmoothing(0.9),
-m_smoothing_scheme(PLUS_POINT_ONE) {}
+m_smoothing_scheme(PLUS_POINT_ONE)
 {
-  vector<string> referenceFiles = m_parameter->GetParam("references");
+  vector<string> toks = Tokenize(line);
-  if ((!referenceFiles.size() && bleuWeightStr.size()) || (referenceFiles.size() && !bleuWeightStr.size())) {
+  for (size_t i = 0; i < toks.size(); ++i) {
-    UserMessage::Add("You cannot use the bleu feature without references, and vice-versa");
+    vector<string> args = Tokenize(toks[i], "=");
-    return false;
+    CHECK(args.size() == 2);
-  }
-  if (!referenceFiles.size()) {
-    return true;
-  }
-  if (bleuWeightStr.size() > 1) {
-    UserMessage::Add("Can only specify one weight for the bleu feature");
-    return false;
-  }
 
-  float bleuWeight = Scan<float>(bleuWeightStr[0]);
+    if (args[0] == "references") {
-  BleuScoreFeature *bleuScoreFeature = new BleuScoreFeature();
+      vector<string> referenceFiles = Tokenize(args[1]);
-  SetWeight(bleuScoreFeature, bleuWeight);
+      CHECK(referenceFiles.size());
-
+      vector<vector<string> > references(referenceFiles.size());
-  cerr << "Loading reference file " << referenceFiles[0] << endl;
-  vector<vector<string> > references(referenceFiles.size());
-  for (size_t i =0; i < referenceFiles.size(); ++i) {
-    ifstream in(referenceFiles[i].c_str());
-    if (!in) {
-      stringstream strme;
-      strme << "Unable to load references from " << referenceFiles[i];
-      UserMessage::Add(strme.str());
-      return false;
-    }
-    string line;
-    while (getline(in,line)) {
-/*      if (GetSearchAlgorithm() == ChartDecoding) {
-      stringstream tmp;
-      tmp << "<s> " << line << " </s>";
-      line = tmp.str();
-      }*/
-      references[i].push_back(line);
-    }
-    if (i > 0) {
-      if (references[i].size() != references[i-1].size()) {
-        UserMessage::Add("Reference files are of different lengths");
-        return false;
-      }
-    }
-    in.close();
-  }
-  //Set the references in the bleu feature
-  bleuScoreFeature->LoadReferences(references);
 
+      for (size_t i =0; i < referenceFiles.size(); ++i) {
+        ifstream in(referenceFiles[i].c_str());
+        if (!in) {
+          stringstream strme;
+          strme << "Unable to load references from " << referenceFiles[i];
+          UserMessage::Add(strme.str());
+          abort();
+        }
+        string line;
+        while (getline(in,line)) {
+          /*  if (GetSearchAlgorithm() == ChartDecoding) {
+          stringstream tmp;
+          tmp << "<s> " << line << " </s>";
+          line = tmp.str();
+          }
+          */
+          references[i].push_back(line);
+        }
+        if (i > 0) {
+          if (references[i].size() != references[i-1].size()) {
+            UserMessage::Add("Reference files are of different lengths");
+            abort();
+          }
+        }
+        in.close();
+      } // for (size_t i =0; i < referenceFiles.size(); ++i) {
 
+      //Set the references in the bleu feature
+      LoadReferences(references);
+    } // if (args[0] == "references") {
+  } // for (size_t i = 0; i < toks.size(); ++i) {
 }
 
 void BleuScoreFeature::PrintHistory(std::ostream& out) const {