moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-09-20 07:42:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

make target phrases collection a variable, not a pointer

Browse Source
This commit is contained in:
Hieu Hoang 2016-08-16 13:19:21 +01:00
parent e9ec2ddd99
commit dd6bd92a21
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/moses2/SCFG/InputPath.cpp
View File

@ -22,9 +22,8 @@ InputPath::InputPath(MemPool &pool, const SubPhrase<SCFG::Word> &subPhrase,
const Range &range, size_t numPt, const InputPath *prefixPath)
:InputPathBase(pool, range, numPt, prefixPath)
,subPhrase(subPhrase)
,targetPhrases(MemPoolAllocator< std::pair<SymbolBind, SCFG::TargetPhrases*> >(pool))
{
MemPoolAllocator< std::pair<SymbolBind, SCFG::TargetPhrases> > collAlloc(pool);
targetPhrases = new (pool.Allocate<Coll>()) Coll(collAlloc);
m_activeChart = pool.Allocate<ActiveChart>(numPt);
for (size_t i = 0; i < numPt; ++i) {
ActiveChart &memAddr = m_activeChart[i];
@ -54,10 +53,10 @@ std::string InputPath::Debug(const System &system) const
}
// tps
out << "tps=" << targetPhrases->size();
out << "tps=" << targetPhrases.size();
out << " ";
BOOST_FOREACH(const SCFG::InputPath::Coll::value_type &valPair, *targetPhrases) {
BOOST_FOREACH(const SCFG::InputPath::Coll::value_type &valPair, targetPhrases) {
const SymbolBind &symbolBind = valPair.first;
const SCFG::TargetPhrases &tps = *valPair.second;
out << symbolBind.Debug(system);
@ -76,10 +75,10 @@ void InputPath::AddTargetPhrasesToPath(
{
SCFG::TargetPhrases *tpsNew;
Coll::iterator iterColl;
iterColl = targetPhrases->find(symbolBind);
if (iterColl == targetPhrases->end()) {
iterColl = targetPhrases.find(symbolBind);
if (iterColl == targetPhrases.end()) {
tpsNew = new (pool.Allocate<SCFG::TargetPhrases>()) SCFG::TargetPhrases(pool);
(*targetPhrases)[symbolBind] = tpsNew;
targetPhrases[symbolBind] = tpsNew;
}
else {
tpsNew = iterColl->second;
@ -104,7 +103,7 @@ void InputPath::AddActiveChartEntry(size_t ptInd, ActiveChartEntry *chartEntry)
size_t InputPath::GetNumRules() const
{
size_t ret = 0;
BOOST_FOREACH(const Coll::value_type &valPair, *targetPhrases) {
BOOST_FOREACH(const Coll::value_type &valPair, targetPhrases) {
const SCFG::TargetPhrases &tps = *valPair.second;
ret += tps.GetSize();
}

2
contrib/moses2/SCFG/InputPath.h
View File

@ -33,7 +33,7 @@ public:
std::equal_to<SymbolBind>,
MemPoolAllocator< std::pair<SymbolBind, SCFG::TargetPhrases*> >
> Coll;
Coll *targetPhrases;
Coll targetPhrases;
SubPhrase<SCFG::Word> subPhrase;
InputPath(MemPool &pool, const SubPhrase<SCFG::Word> &subPhrase, const Range &range,

2
contrib/moses2/SCFG/Manager.cpp
View File

@ -164,7 +164,7 @@ void Manager::Decode(SCFG::InputPath &path, Stack &stack)
m_seenPositions.clear();
// init queue
BOOST_FOREACH(const InputPath::Coll::value_type &valPair, *path.targetPhrases) {
BOOST_FOREACH(const InputPath::Coll::value_type &valPair, path.targetPhrases) {
const SymbolBind &symbolBind = valPair.first;
const SCFG::TargetPhrases &tps = *valPair.second;
CreateQueue(path, symbolBind, tps);