Mercurial > hg > match-vamp
diff src/MatchPipeline.cpp @ 173:eeed3498fe96 refactors
Merge from branch structure
author | Chris Cannam |
---|---|
date | Fri, 06 Feb 2015 18:41:35 +0000 |
parents | d23dad16d6f9 2b61e0cb6847 |
children | 24ddab06aace |
line wrap: on
line diff
--- a/src/MatchPipeline.cpp Thu Feb 05 11:53:23 2015 +0000 +++ b/src/MatchPipeline.cpp Fri Feb 06 18:41:35 2015 +0000 @@ -140,21 +140,23 @@ MatchPipeline::finish() { m_feeder.finish(); - getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2); + m_feeder.getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2); } -MatchFeatureFeeder * -MatchPipeline::getFeeder() +int +MatchPipeline::retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy) { - return &m_feeder; + return m_feeder.getFinder()->retrievePath(smooth, pathx, pathy); } -Finder * -MatchPipeline::getFinder() -{ - return m_feeder.getFinder(); +void +MatchPipeline::retrieveForwardPath(std::vector<int> &pathx, std::vector<int> &pathy) { + return m_feeder.retrieveForwardPath(pathx, pathy); } +double +MatchPipeline::getOverallCost() +{ + return m_feeder.getFinder()->getOverallCost(); +} - -