moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-24 20:32:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

eliminate spurious copy / memory leak

Browse Source
This commit is contained in:
Rico Sennrich 2015-01-07 18:42:20 +00:00
parent 60cae6418f
commit 7123d1cc80
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerMemory.cpp
View File

@ -80,12 +80,12 @@ void ChartRuleLookupManagerMemory::GetChartRuleCollection(
} }
// copy temporarily stored rules to out collection // copy temporarily stored rules to out collection
CompletedRuleCollection rules = m_completedRules[absEndPos]; CompletedRuleCollection & rules = m_completedRules[absEndPos];
for (vector<CompletedRule*>::const_iterator iter = rules.begin(); iter != rules.end(); ++iter) { for (vector<CompletedRule*>::const_iterator iter = rules.begin(); iter != rules.end(); ++iter) {
outColl.Add((*iter)->GetTPC(), (*iter)->GetStackVector(), range); outColl.Add((*iter)->GetTPC(), (*iter)->GetStackVector(), range);
} }
m_completedRules[absEndPos].Clear(); rules.Clear();
} }

4
moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerMemoryPerSentence.cpp
View File

@ -80,12 +80,12 @@ void ChartRuleLookupManagerMemoryPerSentence::GetChartRuleCollection(
} }
// copy temporarily stored rules to out collection // copy temporarily stored rules to out collection
CompletedRuleCollection rules = m_completedRules[absEndPos]; CompletedRuleCollection & rules = m_completedRules[absEndPos];
for (vector<CompletedRule*>::const_iterator iter = rules.begin(); iter != rules.end(); ++iter) { for (vector<CompletedRule*>::const_iterator iter = rules.begin(); iter != rules.end(); ++iter) {
outColl.Add((*iter)->GetTPC(), (*iter)->GetStackVector(), range); outColl.Add((*iter)->GetTPC(), (*iter)->GetStackVector(), range);
} }
m_completedRules[absEndPos].Clear(); rules.Clear();
} }

5
moses/TranslationModel/CYKPlusParser/CompletedRuleCollection.cpp
View File

@ -32,6 +32,11 @@ CompletedRuleCollection::CompletedRuleCollection() : m_ruleLimit(StaticData::Ins
m_scoreThreshold = numeric_limits<float>::infinity(); m_scoreThreshold = numeric_limits<float>::infinity();
} }
CompletedRuleCollection::~CompletedRuleCollection()
{
Clear();
}
// copies some functionality (pruning) from ChartTranslationOptionList::Add // copies some functionality (pruning) from ChartTranslationOptionList::Add
void CompletedRuleCollection::Add(const TargetPhraseCollection &tpc, void CompletedRuleCollection::Add(const TargetPhraseCollection &tpc,
const StackVec &stackVec, const StackVec &stackVec,

1
moses/TranslationModel/CYKPlusParser/CompletedRuleCollection.h
View File

@ -75,6 +75,7 @@ struct CompletedRuleCollection {
public: public:
CompletedRuleCollection(); CompletedRuleCollection();
~CompletedRuleCollection();
CompletedRuleCollection(const CompletedRuleCollection &old) CompletedRuleCollection(const CompletedRuleCollection &old)
: m_collection(old.m_collection) : m_collection(old.m_collection)