diff options
| author | hieuhoang1972 <hieuhoang1972@1f5c12ca-751b-0410-a591-d2e778427230> | 2007-02-12 14:05:13 +0300 |
|---|---|---|
| committer | hieuhoang1972 <hieuhoang1972@1f5c12ca-751b-0410-a591-d2e778427230> | 2007-02-12 14:05:13 +0300 |
| commit | 6b4dfc4db216f59eea8b59cdbb5e26744f13f721 (patch) | |
| tree | 5b2184a10456eb6a6a6de6b0c2e3ddffc4089969 /moses-cmd | |
| parent | 4a30043757f7ba48bc5273f89b266b58ba3b92cf (diff) | |
added #def to use hypo pool
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1206 1f5c12ca-751b-0410-a591-d2e778427230
Diffstat (limited to 'moses-cmd')
| -rw-r--r-- | moses-cmd/.cdtbuild | 1 | ||||
| -rw-r--r-- | moses-cmd/moses-cmd.vcproj | 2 | ||||
| -rwxr-xr-x | moses-cmd/src/IOStream.cpp | 6 | ||||
| -rw-r--r-- | moses-cmd/src/Makefile.am | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/moses-cmd/.cdtbuild b/moses-cmd/.cdtbuild index deaff1ea4..91c6ffee6 100644 --- a/moses-cmd/.cdtbuild +++ b/moses-cmd/.cdtbuild @@ -61,6 +61,7 @@ <listOptionValue builtIn="false" value=""${ProjDirPath}/../srilm/lm/src""/> </option> <option id="gnu.cpp.compiler.option.preprocessor.def.542441515" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols"> +<listOptionValue builtIn="false" value="USE_HYPO_POOL"/> <listOptionValue builtIn="false" value="LM_SRI"/> <listOptionValue builtIn="false" value="LM_IRST"/> <listOptionValue builtIn="false" value="LM_INTERNAL"/> diff --git a/moses-cmd/moses-cmd.vcproj b/moses-cmd/moses-cmd.vcproj index 3322a34ab..8efed2e3e 100644 --- a/moses-cmd/moses-cmd.vcproj +++ b/moses-cmd/moses-cmd.vcproj @@ -119,7 +119,7 @@ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""$(SolutionDir)\src";"$(SolutionDir)..\mysqlpp\lib";"$(SolutionDir)..\irstlm\src";"$(SolutionDir)..\srilm\src""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LM_INTERNAL;TRACE_ENABLE;USE_HYPO_POOL;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
diff --git a/moses-cmd/src/IOStream.cpp b/moses-cmd/src/IOStream.cpp index 421e9c00b..5f3413aeb 100755 --- a/moses-cmd/src/IOStream.cpp +++ b/moses-cmd/src/IOStream.cpp @@ -169,10 +169,10 @@ void OutputSurface(std::ostream &out, const Hypothesis *hypo, const std::vector< if ( hypo != NULL) { OutputSurface(out, hypo->GetPrevHypo(), outputFactorOrder, reportSegmentation, reportAllFactors); - OutputSurface(out, hypo->GetTargetPhrase(), outputFactorOrder, reportAllFactors); + OutputSurface(out, hypo->GetCurrTargetPhrase(), outputFactorOrder, reportAllFactors); if (reportSegmentation == true - && hypo->GetTargetPhrase().GetSize() > 0) { + && hypo->GetCurrTargetPhrase().GetSize() > 0) { out << "|" << hypo->GetCurrSourceWordsRange().GetStartPos() << "-" << hypo->GetCurrSourceWordsRange().GetEndPos() << "| "; } @@ -223,7 +223,7 @@ void IOStream::OutputNBestList(const LatticePathList &nBestList, long translatio for (int currEdge = (int)edges.size() - 1 ; currEdge >= 0 ; currEdge--) { const Hypothesis &edge = *edges[currEdge]; - OutputSurface(*m_nBestStream, edge.GetTargetPhrase(), m_outputFactorOrder, false); // false for not reporting all factors + OutputSurface(*m_nBestStream, edge.GetCurrTargetPhrase(), m_outputFactorOrder, false); // false for not reporting all factors } *m_nBestStream << " ||| "; diff --git a/moses-cmd/src/Makefile.am b/moses-cmd/src/Makefile.am index 7c15b360b..0fb611053 100644 --- a/moses-cmd/src/Makefile.am +++ b/moses-cmd/src/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = moses moses_SOURCES = Main.cpp IOStream.cpp TranslationAnalysis.cpp -AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I$(top_srcdir)/moses/src +AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -DUSE_HYPO_POOL -I$(top_srcdir)/moses/src moses_LDADD = -L$(top_srcdir)/moses/src -lmoses moses_DEPENDENCIES = $(top_srcdir)/moses/src/libmoses.a |