comparison src/MatchVampPlugin.cpp @ 173:eeed3498fe96 refactors

Merge from branch structure
author Chris Cannam
date Fri, 06 Feb 2015 18:41:35 +0000
parents 31602361fb65 d6cdbd814c8c
children e0dc4675059c
comparison
equal deleted inserted replaced
166:d23dad16d6f9 173:eeed3498fe96
206 desc.valueNames.push_back("None"); 206 desc.valueNames.push_back("None");
207 desc.valueNames.push_back("Sum to 1"); 207 desc.valueNames.push_back("Sum to 1");
208 desc.valueNames.push_back("Long-term average"); 208 desc.valueNames.push_back("Long-term average");
209 list.push_back(desc); 209 list.push_back(desc);
210 desc.valueNames.clear(); 210 desc.valueNames.clear();
211 desc.defaultValue = (float)m_defaultFcParams.silenceThreshold;
211 212
212 desc.identifier = "metric"; 213 desc.identifier = "metric";
213 desc.name = "Distance metric"; 214 desc.name = "Distance metric";
214 desc.description = "Metric for distance calculations."; 215 desc.description = "Metric for distance calculations.";
215 desc.minValue = 0; 216 desc.minValue = 0;
657 { 658 {
658 m_pipeline->finish(); 659 m_pipeline->finish();
659 660
660 FeatureSet returnFeatures; 661 FeatureSet returnFeatures;
661 662
662 Finder *finder = m_pipeline->getFinder();
663 std::vector<int> pathx; 663 std::vector<int> pathx;
664 std::vector<int> pathy; 664 std::vector<int> pathy;
665 int len = finder->retrievePath(m_smooth, pathx, pathy); 665 int len = m_pipeline->retrievePath(m_smooth, pathx, pathy);
666 666
667 double cost = finder->getOverallCost(); 667 double cost = m_pipeline->getOverallCost();
668 Feature costFeature; 668 Feature costFeature;
669 costFeature.hasTimestamp = false; 669 costFeature.hasTimestamp = false;
670 costFeature.values.push_back((float)cost); 670 costFeature.values.push_back((float)cost);
671 returnFeatures[m_overallCostOutNo].push_back(costFeature); 671 returnFeatures[m_overallCostOutNo].push_back(costFeature);
672 672