diff options
author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-11-11 02:05:13 +0300 |
---|---|---|
committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-11-11 02:05:13 +0300 |
commit | d7278293877afe443a8668d5abea25bb37542c6e (patch) | |
tree | f3e380c11d4b5f6f117ea69922b457de4a7ef50c /moses/TrellisPath.cpp | |
parent | 806f888c10ac02eba67454d55aa0880464e4f284 (diff) | |
parent | b733804fdcf20a5a9e822861471248c8fdbc0e2d (diff) |
Merge branch 'master' of https://github.com/modernmt/mosesdecoder
Conflicts:
moses/parameters/InputOptions.cpp
moses/parameters/InputOptions.h
Diffstat (limited to 'moses/TrellisPath.cpp')
-rw-r--r-- | moses/TrellisPath.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/moses/TrellisPath.cpp b/moses/TrellisPath.cpp index 1ff46117a..86fab4d30 100644 --- a/moses/TrellisPath.cpp +++ b/moses/TrellisPath.cpp @@ -23,13 +23,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include "TrellisPathList.h" #include "TrellisPathCollection.h" #include "StaticData.h" - +#include "Manager.h" using namespace std; namespace Moses { TrellisPath::TrellisPath(const Hypothesis *hypo) - : m_prevEdgeChanged(NOT_FOUND) + : m_prevEdgeChanged(NOT_FOUND) { m_totalScore = hypo->GetFutureScore(); @@ -208,9 +208,11 @@ Phrase TrellisPath::GetTargetPhrase() const Phrase TrellisPath::GetSurfacePhrase() const { - const std::vector<FactorType> &outputFactor = StaticData::Instance().GetOutputFactorOrder(); - Phrase targetPhrase = GetTargetPhrase() - ,ret(targetPhrase.GetSize()); + const std::vector<FactorType> &outputFactor + = manager().options().output.factor_order; + // = StaticData::Instance().GetOutputFactorOrder(); + Phrase targetPhrase = GetTargetPhrase(); + Phrase ret(targetPhrase.GetSize()); for (size_t pos = 0 ; pos < targetPhrase.GetSize() ; ++pos) { Word &newWord = ret.AddWord(); |