moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2025-01-08 04:27:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

add datastructure to store range of each symbol in source phrase

Browse Source
This commit is contained in:
Hieu Hoang 2016-04-19 23:45:17 +04:00
parent 43220ea994
commit b0084adbe4
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/other-builds/moses2/SCFG/InputPath.cpp
View File

@ -39,7 +39,7 @@ std::ostream& operator<<(std::ostream &out, const InputPath &obj)
void InputPath::AddTargetPhrase(const PhraseTable &pt, const SCFG::TargetPhraseImpl *tp) void InputPath::AddTargetPhrase(const PhraseTable &pt, const SCFG::TargetPhraseImpl *tp)
{ {
targetPhrases.AddTargetPhrase(*tp); //targetPhrases.AddTargetPhrase(*tp);
} }
} }

16
contrib/other-builds/moses2/SCFG/InputPath.h
View File

@ -9,6 +9,7 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <boost/unordered_map.hpp>
#include "../InputPathBase.h" #include "../InputPathBase.h"
#include "TargetPhrases.h" #include "TargetPhrases.h"
@ -19,6 +20,19 @@ namespace SCFG
class TargetPhrases; class TargetPhrases;
class TargetPhraseImpl; class TargetPhraseImpl;
////////////////////////////////////////////////////////////////////////////
//! The range covered by each symbol in the source
//! Terminals will cover only 1 word, NT can cover multiple words
class SymbolBind
{
public:
typedef std::pair<Range, bool> Element;
// range, isNT
std::vector<Element> coll;
};
////////////////////////////////////////////////////////////////////////////
class ActiveChartEntry class ActiveChartEntry
{ {
public: public:
@ -38,7 +52,7 @@ class InputPath: public InputPathBase
{ {
friend std::ostream& operator<<(std::ostream &, const InputPath &); friend std::ostream& operator<<(std::ostream &, const InputPath &);
public: public:
SCFG::TargetPhrases targetPhrases; boost::unordered_map<SymbolBind, SCFG::TargetPhrases> targetPhrases;
InputPath(MemPool &pool, const SubPhrase &subPhrase, const Range &range, InputPath(MemPool &pool, const SubPhrase &subPhrase, const Range &range,
size_t numPt, const InputPath *prefixPath); size_t numPt, const InputPath *prefixPath);

4
contrib/other-builds/moses2/SCFG/Manager.cpp
View File

@ -92,10 +92,12 @@ void Manager::Lookup(size_t startPos, size_t size)
pt.Lookup(GetPool(), system, m_stacks, path); pt.Lookup(GetPool(), system, m_stacks, path);
} }
/*
size_t tpsNum = path.targetPhrases.GetSize(); size_t tpsNum = path.targetPhrases.GetSize();
if (tpsNum) { if (tpsNum) {
cerr << tpsNum << " " << path << endl; cerr << tpsNum << " " << path << endl;
} }
*/
} }
void Manager::Decode(size_t startPos, size_t size) void Manager::Decode(size_t startPos, size_t size)
@ -105,6 +107,7 @@ void Manager::Decode(size_t startPos, size_t size)
Recycler<HypothesisBase*> &hypoRecycler = GetHypoRecycle(); Recycler<HypothesisBase*> &hypoRecycler = GetHypoRecycle();
/*
SCFG::TargetPhrases &tps = path.targetPhrases; SCFG::TargetPhrases &tps = path.targetPhrases;
SCFG::TargetPhrases::const_iterator iter; SCFG::TargetPhrases::const_iterator iter;
@ -116,6 +119,7 @@ void Manager::Decode(size_t startPos, size_t size)
StackAdd added = stack.Add(hypo, hypoRecycler, arcLists); StackAdd added = stack.Add(hypo, hypoRecycler, arcLists);
cerr << "added=" << added.added << " " << (const Phrase&) tp << endl; cerr << "added=" << added.added << " " << (const Phrase&) tp << endl;
} }
*/
} }
} }