moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-10-05 15:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

code clean up

Browse Source
This commit is contained in:
Sid Jain 2020-10-15 15:15:35 +05:30
parent a312312e78
commit 8837f3c2a3
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moses2/Array.h
View File

@ -72,7 +72,7 @@ public:
}
void resize(size_t newSize) {
assert(m_size < m_maxSize);
assert(m_size <= m_maxSize);
m_size = newSize;
}
protected:

1
moses2/InputType.cpp
View File

@ -95,6 +95,7 @@ bool InputType::XmlOverlap(size_t startPos, size_t endPos) const
std::string InputType::Debug(const System &system) const
{
cerr << "InputType::Debug" << endl;
return "";
}
} /* namespace Moses2 */

8
moses2/Moses2Wrapper.cpp
View File

@ -9,11 +9,9 @@ namespace Moses2 {
m_param->LoadParam(filePath);
m_system = new System(*m_param);
}
std::string Moses2Wrapper::Translate(const std::string &input) {
//create id
long a = 11234567;
TranslationTask task(*m_system, input, a);
std::string translation = task.RunTranslation();
std::string Moses2Wrapper::Translate(const std::string &input , long id) {
TranslationTask task(*m_system, input, id);
std::string translation = task.ReturnTranslation();
//delete translation;
return translation;
}

2
moses2/Moses2Wrapper.h
View File

@ -10,7 +10,7 @@ namespace Moses2 {
public:
Moses2Wrapper(const std::string &filePath);
std::string Translate(const std::string &input);
std::string Translate(const std::string &input, long id);
};
}

11
moses2/PhraseBased/Manager.cpp
View File

@ -60,9 +60,12 @@ void Manager::Init()
InitPools();
FactorCollection &vocab = system.GetVocab();
//TODO: need option to choose Sentence vs SentenceWithCandidates
m_input = Moses2::SentenceWithCandidates::CreateFromString(GetPool(), vocab, system, m_inputStr);
//cerr << "Manager::Init: " << m_input->Debug(system) << endl << flush;
if (system.options.input.input_type == SentenceInputWithCandidates) {
m_input = Moses2::SentenceWithCandidates::CreateFromString(GetPool(), vocab, system, m_inputStr);
}
else {
m_input = Moses2::Sentence::CreateFromString(GetPool(), vocab, system, m_inputStr);
}
system.featureFunctions.InitializeForInput(*this, *m_input);
m_bitmaps = new Bitmaps(GetPool());
@ -92,7 +95,7 @@ void Manager::Init()
CalcFutureScore();
m_bitmaps->Init(sentence.GetSize(), vector<bool>(0));
switch (system.options.search.algo) {
case Normal:
m_search = new NSNormal::Search(*this);

6
moses2/TranslationTask.cpp
View File

@ -23,15 +23,11 @@ TranslationTask::TranslationTask(System &system,
TranslationTask::~TranslationTask()
{
}
std::string TranslationTask::RunTranslation()
std::string TranslationTask::ReturnTranslation() const
{
m_mgr->Decode();
string out;
out = m_mgr->OutputBest() + "\n";
delete m_mgr;
return out;
}

2
moses2/TranslationTask.h
View File

@ -16,7 +16,7 @@ public:
TranslationTask(System &system, const std::string &line, long translationId);
virtual ~TranslationTask();
virtual void Run();
virtual std::string RunTranslation();
virtual std::string ReturnTranslation() const;
protected:
ManagerBase *m_mgr;