bug fix with interaction of alternate weights and xml markup

This commit is contained in:
phikoehn 2013-11-30 02:00:34 +00:00
parent dab6a301fa
commit 6824d84491
2 changed files with 5 additions and 2 deletions

View File

@ -121,6 +121,7 @@ int Sentence::Read(std::istream& in,const std::vector<FactorType>& factorOrder)
if (meta.find("weight-setting") != meta.end()) {
this->SetWeightSetting(meta["weight-setting"]);
this->SetSpecifiesWeightSetting(true);
staticData.SetWeightSetting(meta["weight-setting"]);
} else {
this->SetSpecifiesWeightSetting(false);
}

View File

@ -141,10 +141,12 @@ void TargetPhrase::Evaluate(const Phrase &source, const std::vector<FeatureFunct
void TargetPhrase::Evaluate(const InputType &input, const InputPath &inputPath)
{
const std::vector<FeatureFunction*> &ffs = FeatureFunction::GetFeatureFunctions();
const StaticData &staticData = StaticData::Instance();
for (size_t i = 0; i < ffs.size(); ++i) {
const FeatureFunction &ff = *ffs[i];
ff.Evaluate(input, inputPath, *this, m_scoreBreakdown);
if (! staticData.IsFeatureFunctionIgnored( ff )) {
ff.Evaluate(input, inputPath, *this, m_scoreBreakdown);
}
}
}