fixed previous merge; commit 20381cbf8996ea46d32c470c8580a68eda4ec64e; Merge: 03825e3 6182750

This commit is contained in:
Nicola Bertoldi 2014-04-29 17:54:26 +02:00
parent 20381cbf89
commit 0313523d7d
3 changed files with 10 additions and 4 deletions

View File

@ -539,13 +539,15 @@ bool StaticData::LoadData(Parameter *parameter)
std::cerr <<"After StaticData::LoadDataStatic" << std::endl;
/*
std::cerr <<"Before ShowWeights" << std::endl;
// setting "-show-weights" -> just dump out weights and exit
if (params.isParamSpecified("show-weights")) {
if (m_parameter->isParamSpecified("show-weights")) {
MosesCmd::ShowWeights();
exit(0);
}
std::cerr <<"After ShowWeights" << std::endl;
*/
std::cerr <<"Before LoadFeatureFunctions" << std::endl;
LoadFeatureFunctions();

View File

@ -147,7 +147,7 @@ const TargetPhraseCollection* PhraseDictionaryDynamicCacheBased::GetTargetPhrase
return ret;
}
ChartRuleLookupManager* PhraseDictionaryDynamicCacheBased::CreateRuleLookupManager(const ChartParser &parser, const ChartCellCollectionBase &cellCollection)
ChartRuleLookupManager* PhraseDictionaryDynamicCacheBased::CreateRuleLookupManager(const ChartParser &parser, const ChartCellCollectionBase &cellCollection, std::size_t /*maxChartSpan*/)
{
UTIL_THROW(util::Exception, "Phrase table used in chart decoder");
}

View File

@ -44,6 +44,9 @@
namespace Moses
{
class ChartParser;
class ChartCellCollectionBase;
class ChartRuleLookupManager;
/** Implementation of a Cache-based phrase table.
*/
@ -90,7 +93,8 @@ public:
// for phrase-based model
// void GetTargetPhraseCollectionBatch(const InputPathList &inputPathQueue) const;
ChartRuleLookupManager *CreateRuleLookupManager(const ChartParser &, const ChartCellCollectionBase &);
// for syntax/hiero model (CKY+ decoding)
ChartRuleLookupManager* CreateRuleLookupManager(const ChartParser&, const ChartCellCollectionBase&, std::size_t);
void SetParameter(const std::string& key, const std::string& value);