Mercurial > hg > svcore
comparison transform/FeatureExtractionModelTransformer.cpp @ 895:c3656035240f tony_integration
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Wed, 02 Apr 2014 08:51:12 +0100 |
parents | 8962f80f5d8e 8db820ad2b8f |
children | defbe5bc47b7 06579b8ffb7b |
comparison
equal
deleted
inserted
replaced
894:1341cc1390be | 895:c3656035240f |
---|---|
510 } | 510 } |
511 | 511 |
512 SparseTimeValueModel * | 512 SparseTimeValueModel * |
513 FeatureExtractionModelTransformer::getAdditionalModel(int n, int binNo) | 513 FeatureExtractionModelTransformer::getAdditionalModel(int n, int binNo) |
514 { | 514 { |
515 std::cerr << "getAdditionalModel(" << n << ", " << binNo << ")" << std::endl; | 515 // std::cerr << "getAdditionalModel(" << n << ", " << binNo << ")" << std::endl; |
516 | 516 |
517 if (binNo == 0) { | 517 if (binNo == 0) { |
518 std::cerr << "Internal error: binNo == 0 in getAdditionalModel (should be using primary model)" << std::endl; | 518 std::cerr << "Internal error: binNo == 0 in getAdditionalModel (should be using primary model)" << std::endl; |
519 return 0; | 519 return 0; |
520 } | 520 } |
897 SparseTimeValueModel *targetModel = model; | 897 SparseTimeValueModel *targetModel = model; |
898 | 898 |
899 if (m_needAdditionalModels[n] && i > 0) { | 899 if (m_needAdditionalModels[n] && i > 0) { |
900 targetModel = getAdditionalModel(n, i); | 900 targetModel = getAdditionalModel(n, i); |
901 if (!targetModel) targetModel = model; | 901 if (!targetModel) targetModel = model; |
902 std::cerr << "adding point to model " << targetModel | 902 // std::cerr << "adding point to model " << targetModel |
903 << " for output " << n << " bin " << i << std::endl; | 903 // << " for output " << n << " bin " << i << std::endl; |
904 } | 904 } |
905 | 905 |
906 targetModel->addPoint | 906 targetModel->addPoint |
907 (SparseTimeValueModel::Point(frame, value, label)); | 907 (SparseTimeValueModel::Point(frame, value, label)); |
908 } | 908 } |