2martens/uni
1
0
Fork 0
mirror of https://github.com/2martens/uni.git synced 2026-05-07 03:46:25 +02:00
Code Releases Activity

[CCV] Switched lab pyramid to generic fusion functions

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2017-05-30 17:22:55 +02:00
parent 8899b8403a
commit 9dbe8ce79c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ccv/saliency/includes/lab_pyramid.h
View File

@ -18,6 +18,9 @@ private:
static std::vector<cv::Mat> _cs_contrast_b; static std::vector<cv::Mat> _cs_contrast_b;
static std::vector<cv::Mat> _sc_contrast_b; static std::vector<cv::Mat> _sc_contrast_b;
// feature maps // feature maps
static std::vector<cv::Mat> _F_l;
static std::vector<cv::Mat> _F_a;
static std::vector<cv::Mat> _F_b;
static cv::Mat _cs_F_l; static cv::Mat _cs_F_l;
static cv::Mat _sc_F_l; static cv::Mat _sc_F_l;
static cv::Mat _cs_F_a; static cv::Mat _cs_F_a;

15
ccv/saliency/lab_pyramid.cpp
View File

@ -11,6 +11,9 @@ std::vector<cv::Mat> lab_pyramid::_sc_contrast_a = std::vector<cv::Mat>();
std::vector<cv::Mat> lab_pyramid::_cs_contrast_b = std::vector<cv::Mat>(); std::vector<cv::Mat> lab_pyramid::_cs_contrast_b = std::vector<cv::Mat>();
std::vector<cv::Mat> lab_pyramid::_sc_contrast_b = std::vector<cv::Mat>(); std::vector<cv::Mat> lab_pyramid::_sc_contrast_b = std::vector<cv::Mat>();
// feature maps // feature maps
std::vector<cv::Mat> lab_pyramid::_F_l= std::vector<cv::Mat>();
std::vector<cv::Mat> lab_pyramid::_F_a= std::vector<cv::Mat>();
std::vector<cv::Mat> lab_pyramid::_F_b= std::vector<cv::Mat>();
cv::Mat lab_pyramid::_cs_F_l; cv::Mat lab_pyramid::_cs_F_l;
cv::Mat lab_pyramid::_sc_F_l; cv::Mat lab_pyramid::_sc_F_l;
cv::Mat lab_pyramid::_cs_F_a; cv::Mat lab_pyramid::_cs_F_a;
@ -113,16 +116,22 @@ void lab_pyramid::compute_dog(lab_pyramid center, lab_pyramid surround, int numb
void lab_pyramid::compute_feature_maps() { void lab_pyramid::compute_feature_maps() {
_cs_F_l = across_scale_addition(_cs_contrast_l); _cs_F_l = across_scale_addition(_cs_contrast_l);
_sc_F_l = across_scale_addition(_sc_contrast_l); _sc_F_l = across_scale_addition(_sc_contrast_l);
_F_l.push_back(_cs_F_l);
_F_l.push_back(_sc_F_l);
_cs_F_a = across_scale_addition(_cs_contrast_a); _cs_F_a = across_scale_addition(_cs_contrast_a);
_sc_F_a = across_scale_addition(_sc_contrast_a); _sc_F_a = across_scale_addition(_sc_contrast_a);
_F_a.push_back(_cs_F_a);
_F_a.push_back(_sc_F_a);
_cs_F_b = across_scale_addition(_cs_contrast_b); _cs_F_b = across_scale_addition(_cs_contrast_b);
_sc_F_b = across_scale_addition(_sc_contrast_b); _sc_F_b = across_scale_addition(_sc_contrast_b);
_F_b.push_back(_cs_F_b);
_F_b.push_back(_sc_F_b);
} }
void lab_pyramid::compute_conspicuity_maps() { void lab_pyramid::compute_conspicuity_maps() {
_C_l = max_fusion(_cs_F_l, _sc_F_l); _C_l = max_fusion_generic(_F_l);
_C_a = max_fusion(_cs_F_a, _sc_F_a); _C_a = max_fusion_generic(_F_a);
_C_b = max_fusion(_cs_F_b, _sc_F_b); _C_b = max_fusion_generic(_F_b);
} }
cv::Mat lab_pyramid::get_conspicuity_map(int channel) { cv::Mat lab_pyramid::get_conspicuity_map(int channel) {