merged master into dynamic-models and solved conflicts

1 files changed, 12 insertions, 0 deletions

diff --git a/moses/FF/FeatureFunction.cpp b/moses/FF/FeatureFunction.cpp
index 90d198680..22eacd271 100644
--- a/moses/FF/FeatureFunction.cpp
+++ b/moses/FF/FeatureFunction.cpp
@@ -34,9 +34,18 @@ void FeatureFunction::Destroy()
   RemoveAllInColl(s_staticColl);
 }
 
+void FeatureFunction::CallChangeSource(InputType *&input)
+{
+  for (size_t i = 0; i < s_staticColl.size(); ++i) {
+	  const FeatureFunction &ff = *s_staticColl[i];
+	  ff.ChangeSource(input);
+  }
+}
+
 FeatureFunction::
 FeatureFunction(const std::string& line)
   : m_tuneable(true)
+  , m_verbosity(std::numeric_limits<std::size_t>::max())
   , m_numScoreComponents(1)
 {
   Initialize(line);
@@ -46,6 +55,7 @@ FeatureFunction::
 FeatureFunction(size_t numScoreComponents,
                 const std::string& line)
   : m_tuneable(true)
+  , m_verbosity(std::numeric_limits<std::size_t>::max())
   , m_numScoreComponents(numScoreComponents)
 {
   Initialize(line);
@@ -107,6 +117,8 @@ void FeatureFunction::SetParameter(const std::string& key, const std::string& va
 {
   if (key == "tuneable") {
     m_tuneable = Scan<bool>(value);
+  } else if (key == "verbosity") {
+    m_verbosity = Scan<size_t>(value);
   } else if (key == "filterable") { //ignore
   } else {
     UTIL_THROW(util::Exception, "Unknown argument " << key << "=" << value);