mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2025-01-08 04:27:53 +03:00
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
This commit is contained in:
commit
ee5edc421c
@ -55,7 +55,7 @@ FeatureFunction(const std::string& line, bool registerNow)
|
||||
m_numTuneableComponents = m_numScoreComponents;
|
||||
ParseLine(line);
|
||||
// if (registerNow) Register(); // now done in FeatureFactory::DefaultSetup()
|
||||
// TO DO: eliminate the registerNow parameter
|
||||
// TO DO: eliminate the registerNow parameter
|
||||
}
|
||||
|
||||
FeatureFunction::FeatureFunction(size_t numScoreComponents, const std::string& line, bool registerNow)
|
||||
@ -68,7 +68,7 @@ FeatureFunction::FeatureFunction(size_t numScoreComponents, const std::string& l
|
||||
m_numTuneableComponents = m_numScoreComponents;
|
||||
ParseLine(line);
|
||||
// if (registerNow) Register(); // now done in FeatureFactory::DefaultSetup()
|
||||
// TO DO: eliminate the registerNow parameter
|
||||
// TO DO: eliminate the registerNow parameter
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -157,8 +157,7 @@ template <class Model> LanguageModelKen<Model>::LanguageModelKen(const std::stri
|
||||
lm::ngram::Config config;
|
||||
if(this->m_verbosity >= 1) {
|
||||
config.messages = &std::cerr;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
config.messages = NULL;
|
||||
}
|
||||
FactorCollection &collection = FactorCollection::Instance();
|
||||
|
@ -89,8 +89,7 @@ public:
|
||||
|
||||
|
||||
struct MockProducers {
|
||||
MockProducers()
|
||||
{
|
||||
MockProducers() {
|
||||
FeatureFunction::Register(&single);
|
||||
FeatureFunction::Register(&multi);
|
||||
FeatureFunction::Register(&sparse);
|
||||
|
Loading…
Reference in New Issue
Block a user