From 620d92c68aa065e918b810f032e97ed18876744f Mon Sep 17 00:00:00 2001 From: hieuhoang1972 Date: Tue, 12 Oct 2010 14:10:19 +0000 Subject: [PATCH] bug in on-disk pt due to refactoring git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3616 1f5c12ca-751b-0410-a591-d2e778427230 --- moses/src/ChartTranslationOptionList.cpp | 1 + moses/src/Parameter.cpp | 1 - moses/src/PhraseDictionaryOnDisk.cpp | 1 - moses/src/PhraseDictionaryOnDisk.h | 2 -- moses/src/PhraseDictionaryOnDiskChart.cpp | 2 -- moses/src/PhraseDictionarySCFG.h | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/moses/src/ChartTranslationOptionList.cpp b/moses/src/ChartTranslationOptionList.cpp index 991eb90ed..64250c2a8 100644 --- a/moses/src/ChartTranslationOptionList.cpp +++ b/moses/src/ChartTranslationOptionList.cpp @@ -19,6 +19,7 @@ ***********************************************************************/ #include +#include #include "../../moses/src/StaticData.h" #include "ChartTranslationOptionList.h" #include "ChartTranslationOption.h" diff --git a/moses/src/Parameter.cpp b/moses/src/Parameter.cpp index 5b216e6c6..a9feb9058 100644 --- a/moses/src/Parameter.cpp +++ b/moses/src/Parameter.cpp @@ -129,7 +129,6 @@ Parameter::Parameter() AddParam("non-terminals", "list of non-term symbols, space separated"); AddParam("rule-limit", "a little like table limit. But for chart decoding rules. Default is DEFAULT_MAX_TRANS_OPT_SIZE"); AddParam("source-label-overlap", "What happens if a span already has a label. 0=add more. 1=replace. 2=discard. Default is 0"); - AddParam("glue-rule-type", "Left branching, or both branching. 0=left. 2=both. 1=right(not implemented). Default=0"); AddParam("output-hypo-score", "Output the hypo score to stdout with the output string. For search error analysis. Default is false"); AddParam("unknown-lhs", "file containing target lhs of unknown words. 1 per line: LHS prob"); AddParam("translation-systems", "specify multiple translation systems, each consisting of an id, followed by a set of models ids, eg '0 T1 R1 L0'"); diff --git a/moses/src/PhraseDictionaryOnDisk.cpp b/moses/src/PhraseDictionaryOnDisk.cpp index 24f793c8c..588195944 100644 --- a/moses/src/PhraseDictionaryOnDisk.cpp +++ b/moses/src/PhraseDictionaryOnDisk.cpp @@ -110,7 +110,6 @@ void PhraseDictionaryOnDisk::CleanUp() } m_cache.clear(); - RemoveAllInColl(m_chartTargetPhraseColl); RemoveAllInColl(m_runningNodesVec); RemoveAllInColl(m_sourcePhraseNode); } diff --git a/moses/src/PhraseDictionaryOnDisk.h b/moses/src/PhraseDictionaryOnDisk.h index 6fef1e452..3bae31c1e 100644 --- a/moses/src/PhraseDictionaryOnDisk.h +++ b/moses/src/PhraseDictionaryOnDisk.h @@ -25,7 +25,6 @@ #include #include #include "PhraseDictionary.h" -#include "ChartTranslationOptionList.h" #include "../../OnDiskPt/src/OnDiskWrapper.h" #include "../../OnDiskPt/src/Word.h" #include "../../OnDiskPt/src/PhraseNode.h" @@ -52,7 +51,6 @@ protected: mutable OnDiskPt::OnDiskWrapper m_dbWrapper; mutable std::map m_cache; - mutable std::vector m_chartTargetPhraseColl; mutable std::list m_sourcePhraseNode; mutable std::vector m_runningNodesVec; diff --git a/moses/src/PhraseDictionaryOnDiskChart.cpp b/moses/src/PhraseDictionaryOnDiskChart.cpp index a1dfae21f..e6ed83835 100644 --- a/moses/src/PhraseDictionaryOnDiskChart.cpp +++ b/moses/src/PhraseDictionaryOnDiskChart.cpp @@ -43,8 +43,6 @@ namespace Moses // source phrase Phrase *cachedSource = new Phrase(src.GetSubString(range)); - m_chartTargetPhraseColl.push_back(&outColl); - size_t relEndPos = range.GetEndPos() - range.GetStartPos(); size_t absEndPos = range.GetEndPos(); diff --git a/moses/src/PhraseDictionarySCFG.h b/moses/src/PhraseDictionarySCFG.h index 060142aae..b14a4d2cf 100644 --- a/moses/src/PhraseDictionarySCFG.h +++ b/moses/src/PhraseDictionarySCFG.h @@ -24,7 +24,6 @@ #include "PhraseDictionary.h" #include "PhraseDictionaryNodeSCFG.h" -#include "ChartTranslationOptionList.h" #include "CellCollection.h" namespace Moses