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

move method body to cpp. Use unordered map

Browse Source
This commit is contained in:
Hieu Hoang 2024-02-21 14:53:57 -08:00
parent d2a6074b45
commit 82f0fcb663
2 changed files with 49 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
moses2/legacy/OutputCollector.cpp
View File

@ -2,7 +2,13 @@
namespace Moses2
{
OutputCollector::OutputCollector(std::string xout, std::string xerr = "") :
OutputCollector::OutputCollector(std::ostream* outStream,
std::ostream* debugStream) :
m_nextOutput(0), m_outStream(outStream), m_debugStream(debugStream), m_isHoldingOutputStream(
false), m_isHoldingDebugStream(false) {
}
OutputCollector::OutputCollector(std::string xout, std::string xerr) :
m_nextOutput(0) {
// TO DO open magic streams instead of regular ofstreams! [UG]
@ -37,6 +43,41 @@ namespace Moses2
}
}
OutputCollector::~OutputCollector() {
if (m_isHoldingOutputStream) delete m_outStream;
if (m_isHoldingDebugStream) delete m_debugStream;
}
void OutputCollector::Write(int sourceId, const std::string& output, const std::string& debug) {
#ifdef WITH_THREADS
boost::mutex::scoped_lock lock(m_mutex);
#endif
if (sourceId == m_nextOutput) {
//This is the one we were expecting
*m_outStream << output << std::flush;
*m_debugStream << debug << std::flush;
++m_nextOutput;
//see if there's any more
std::unordered_map<int, std::string>::iterator iter;
while ((iter = m_outputs.find(m_nextOutput)) != m_outputs.end()) {
*m_outStream << iter->second << std::flush;
++m_nextOutput;
std::unordered_map<int, std::string>::iterator debugIter = m_debugs.find(
iter->first);
m_outputs.erase(iter);
if (debugIter != m_debugs.end()) {
*m_debugStream << debugIter->second << std::flush;
m_debugs.erase(debugIter);
}
}
}
else {
//save for later
m_outputs[sourceId] = output;
m_debugs[sourceId] = debug;
}
}
}

76
moses2/legacy/OutputCollector.h Normal file → Executable file
View File

@ -28,7 +28,7 @@
#endif
#include <iostream>
#include <map>
#include <unordered_map>
#include <ostream>
#include <fstream>
#include <string>
@ -43,46 +43,11 @@ class OutputCollector
{
public:
OutputCollector(std::ostream* outStream = &std::cout,
std::ostream* debugStream = &std::cerr) :
m_nextOutput(0), m_outStream(outStream), m_debugStream(debugStream), m_isHoldingOutputStream(
false), m_isHoldingDebugStream(false) {
}
std::ostream* debugStream = &std::cerr);
OutputCollector(std::string xout, std::string xerr = "") :
m_nextOutput(0) {
// TO DO open magic streams instead of regular ofstreams! [UG]
OutputCollector(std::string xout, std::string xerr = "");
if (xout == "/dev/stderr") {
m_outStream = &std::cerr;
m_isHoldingOutputStream = false;
} else if (xout.size() && xout != "/dev/stdout" && xout != "-") {
m_outStream = new std::ofstream(xout.c_str());
UTIL_THROW_IF2(!m_outStream->good(),
"Failed to open output file" << xout);
m_isHoldingOutputStream = true;
} else {
m_outStream = &std::cout;
m_isHoldingOutputStream = false;
}
if (xerr == "/dev/stdout") {
m_debugStream = &std::cout;
m_isHoldingDebugStream = false;
} else if (xerr.size() && xerr != "/dev/stderr") {
m_debugStream = new std::ofstream(xerr.c_str());
UTIL_THROW_IF2(!m_debugStream->good(),
"Failed to open debug stream" << xerr);
m_isHoldingDebugStream = true;
} else {
m_debugStream = &std::cerr;
m_isHoldingDebugStream = false;
}
}
~OutputCollector() {
if (m_isHoldingOutputStream) delete m_outStream;
if (m_isHoldingDebugStream) delete m_debugStream;
}
~OutputCollector();
void HoldOutputStream() {
m_isHoldingOutputStream = true;
@ -100,38 +65,11 @@ public:
* Write or cache the output, as appropriate.
**/
void Write(int sourceId, const std::string& output, const std::string& debug =
"") {
#ifdef WITH_THREADS
boost::mutex::scoped_lock lock(m_mutex);
#endif
if (sourceId == m_nextOutput) {
//This is the one we were expecting
*m_outStream << output << std::flush;
*m_debugStream << debug << std::flush;
++m_nextOutput;
//see if there's any more
std::map<int, std::string>::iterator iter;
while ((iter = m_outputs.find(m_nextOutput)) != m_outputs.end()) {
*m_outStream << iter->second << std::flush;
++m_nextOutput;
std::map<int, std::string>::iterator debugIter = m_debugs.find(
iter->first);
m_outputs.erase(iter);
if (debugIter != m_debugs.end()) {
*m_debugStream << debugIter->second << std::flush;
m_debugs.erase(debugIter);
}
}
} else {
//save for later
m_outputs[sourceId] = output;
m_debugs[sourceId] = debug;
}
}
"");
private:
std::map<int, std::string> m_outputs;
std::map<int, std::string> m_debugs;
std::unordered_map<int, std::string> m_outputs;
std::unordered_map<int, std::string> m_debugs;
int m_nextOutput;
std::ostream* m_outStream;
std::ostream* m_debugStream;