comparison 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
comparison
equal deleted inserted replaced
166:d23dad16d6f9 173:eeed3498fe96
138 138
139 void 139 void
140 MatchPipeline::finish() 140 MatchPipeline::finish()
141 { 141 {
142 m_feeder.finish(); 142 m_feeder.finish();
143 getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2); 143 m_feeder.getFinder()->setDurations(m_lastFrameIn1, m_lastFrameIn2);
144 } 144 }
145 145
146 MatchFeatureFeeder * 146 int
147 MatchPipeline::getFeeder() 147 MatchPipeline::retrievePath(bool smooth, std::vector<int> &pathx, std::vector<int> &pathy)
148 { 148 {
149 return &m_feeder; 149 return m_feeder.getFinder()->retrievePath(smooth, pathx, pathy);
150 } 150 }
151 151
152 Finder * 152 void
153 MatchPipeline::getFinder() 153 MatchPipeline::retrieveForwardPath(std::vector<int> &pathx, std::vector<int> &pathy) {
154 { 154 return m_feeder.retrieveForwardPath(pathx, pathy);
155 return m_feeder.getFinder();
156 } 155 }
157 156
157 double
158 MatchPipeline::getOverallCost()
159 {
160 return m_feeder.getFinder()->getOverallCost();
161 }
158 162
159
160