diff options
| author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-10-26 20:58:16 +0300 |
|---|---|---|
| committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-10-26 20:58:16 +0300 |
| commit | 8e1f21d38e22301c4cd2123f9780967a62dfdfee (patch) | |
| tree | d2b8ce6a059cc093e0caf28b6bd96a749285408d /moses/Hypothesis.cpp | |
| parent | 624c6c73426f5c79e8406e7cb6c253c9017b947a (diff) | |
| parent | 6a37dfd2ce279e8493e151b505215eb9f21865f9 (diff) | |
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Diffstat (limited to 'moses/Hypothesis.cpp')
| -rw-r--r-- | moses/Hypothesis.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/moses/Hypothesis.cpp b/moses/Hypothesis.cpp index d1ef92494..35f598cfb 100644 --- a/moses/Hypothesis.cpp +++ b/moses/Hypothesis.cpp @@ -44,7 +44,7 @@ using namespace std; namespace Moses { Hypothesis:: -Hypothesis(Manager& manager, InputType const& source, const TranslationOption &initialTransOpt, const WordsBitmap &bitmap) +Hypothesis(Manager& manager, InputType const& source, const TranslationOption &initialTransOpt, const Bitmap &bitmap) : m_prevHypo(NULL) , m_sourceCompleted(bitmap) , m_sourceInput(source) @@ -75,7 +75,7 @@ Hypothesis(Manager& manager, InputType const& source, const TranslationOption &i * continue prevHypo by appending the phrases in transOpt */ Hypothesis:: -Hypothesis(const Hypothesis &prevHypo, const TranslationOption &transOpt, const WordsBitmap &bitmap) +Hypothesis(const Hypothesis &prevHypo, const TranslationOption &transOpt, const Bitmap &bitmap) : m_prevHypo(&prevHypo) , m_sourceCompleted(bitmap) , m_sourceInput(prevHypo.m_sourceInput) @@ -244,7 +244,7 @@ PrintHypothesis() const TRACE_ERR( "... "); } if (end>=0) { - WordsRange range(start, end); + Range range(start, end); TRACE_ERR( m_prevHypo->GetCurrTargetPhrase().GetSubString(range) << " "); } TRACE_ERR( ")"<<endl); @@ -521,7 +521,7 @@ OutputSurface(std::ostream &out, const Hypothesis &edge, // trace ("report segmentation") option "-t" / "-tt" if (reportSegmentation > 0 && phrase.GetSize() > 0) { - const WordsRange &sourceRange = edge.GetCurrSourceWordsRange(); + const Range &sourceRange = edge.GetCurrSourceWordsRange(); const int sourceStart = sourceRange.GetStartPos(); const int sourceEnd = sourceRange.GetEndPos(); out << "|" << sourceStart << "-" << sourceEnd; // enriched "-tt" @@ -602,8 +602,8 @@ Hypothesis:: OutputLocalWordAlignment(vector<xmlrpc_c::value>& dest) const { using namespace std; - WordsRange const& src = this->GetCurrSourceWordsRange(); - WordsRange const& trg = this->GetCurrTargetWordsRange(); + Range const& src = this->GetCurrSourceWordsRange(); + Range const& trg = this->GetCurrTargetWordsRange(); vector<pair<size_t,size_t> const* > a = this->GetCurrTargetPhrase().GetAlignTerm().GetSortedAlignments(); |