moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-26 13:23:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor loading in class LexicalReordering

Browse Source
This commit is contained in:
Hieu Hoang 2013-05-31 23:04:05 +01:00
parent 695617d930
commit 7839b8f0d1
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
moses/LexicalReordering.cpp
View File

@ -14,9 +14,6 @@ LexicalReordering::LexicalReordering(const std::string &line)
{
std::cerr << "Initializing LexicalReordering.." << std::endl;
vector<FactorType> f_factors, e_factors;
string filePath;
for (size_t i = 0; i < m_args.size(); ++i) {
const vector<string> &args = m_args[i];
@ -25,11 +22,11 @@ LexicalReordering::LexicalReordering(const std::string &line)
m_configuration->SetScoreProducer(this);
m_modelTypeString = m_configuration->GetModelString();
} else if (args[0] == "input-factor") {
f_factors =Tokenize<FactorType>(args[1]);
m_factorsF =Tokenize<FactorType>(args[1]);
} else if (args[0] == "output-factor") {
e_factors =Tokenize<FactorType>(args[1]);
m_factorsE =Tokenize<FactorType>(args[1]);
} else if (args[0] == "path") {
filePath = args[1];
m_filePath = args[1];
} else {
throw "Unknown argument " + args[0];
}
@ -38,27 +35,19 @@ LexicalReordering::LexicalReordering(const std::string &line)
switch(m_configuration->GetCondition()) {
case LexicalReorderingConfiguration::FE:
case LexicalReorderingConfiguration::E:
m_factorsE = e_factors;
if(m_factorsE.empty()) {
UserMessage::Add("TL factor mask for lexical reordering is unexpectedly empty");
exit(1);
throw "TL factor mask for lexical reordering is unexpectedly empty";
}
if(m_configuration->GetCondition() == LexicalReorderingConfiguration::E)
break; // else fall through
case LexicalReorderingConfiguration::F:
m_factorsF = f_factors;
if(m_factorsF.empty()) {
UserMessage::Add("SL factor mask for lexical reordering is unexpectedly empty");
exit(1);
throw "SL factor mask for lexical reordering is unexpectedly empty";
}
break;
default:
UserMessage::Add("Unknown conditioning option!");
exit(1);
throw "Unknown conditioning option!";
}
m_table = LexicalReorderingTable::LoadAvailable(filePath, m_factorsF, m_factorsE, std::vector<FactorType>());
}
LexicalReordering::~LexicalReordering()
@ -68,6 +57,11 @@ LexicalReordering::~LexicalReordering()
delete m_configuration;
}
void LexicalReordering::Load()
{
m_table = LexicalReorderingTable::LoadAvailable(m_filePath, m_factorsF, m_factorsE, std::vector<FactorType>());
}
Scores LexicalReordering::GetProb(const Phrase& f, const Phrase& e) const
{
return m_table->GetScore(f, e, Phrase(ARRAY_SIZE_INCR));

2
moses/LexicalReordering.h
View File

@ -29,6 +29,7 @@ class LexicalReordering : public StatefulFeatureFunction
public:
LexicalReordering(const std::string &line);
virtual ~LexicalReordering();
void Load();
virtual bool IsUseable(const FactorMask &mask) const;
@ -65,6 +66,7 @@ private:
//std::vector<size_t> m_scoreOffset;
//bool m_oneScorePerDirection;
std::vector<FactorType> m_factorsE, m_factorsF;
std::string m_filePath;
};
}