From 9dbe8ce79c95e60f34d11be5cc156671933532f2 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 30 May 2017 17:22:55 +0200 Subject: [PATCH] [CCV] Switched lab pyramid to generic fusion functions Signed-off-by: Jim Martens --- ccv/saliency/includes/lab_pyramid.h | 3 +++ ccv/saliency/lab_pyramid.cpp | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ccv/saliency/includes/lab_pyramid.h b/ccv/saliency/includes/lab_pyramid.h index a587a2e..2d7d0c5 100644 --- a/ccv/saliency/includes/lab_pyramid.h +++ b/ccv/saliency/includes/lab_pyramid.h @@ -18,6 +18,9 @@ private: static std::vector _cs_contrast_b; static std::vector _sc_contrast_b; // feature maps + static std::vector _F_l; + static std::vector _F_a; + static std::vector _F_b; static cv::Mat _cs_F_l; static cv::Mat _sc_F_l; static cv::Mat _cs_F_a; diff --git a/ccv/saliency/lab_pyramid.cpp b/ccv/saliency/lab_pyramid.cpp index d0597fc..3a09fbf 100644 --- a/ccv/saliency/lab_pyramid.cpp +++ b/ccv/saliency/lab_pyramid.cpp @@ -11,6 +11,9 @@ std::vector lab_pyramid::_sc_contrast_a = std::vector(); std::vector lab_pyramid::_cs_contrast_b = std::vector(); std::vector lab_pyramid::_sc_contrast_b = std::vector(); // feature maps +std::vector lab_pyramid::_F_l= std::vector(); +std::vector lab_pyramid::_F_a= std::vector(); +std::vector lab_pyramid::_F_b= std::vector(); cv::Mat lab_pyramid::_cs_F_l; cv::Mat lab_pyramid::_sc_F_l; 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() { _cs_F_l = across_scale_addition(_cs_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); _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); _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() { - _C_l = max_fusion(_cs_F_l, _sc_F_l); - _C_a = max_fusion(_cs_F_a, _sc_F_a); - _C_b = max_fusion(_cs_F_b, _sc_F_b); + _C_l = max_fusion_generic(_F_l); + _C_a = max_fusion_generic(_F_a); + _C_b = max_fusion_generic(_F_b); } cv::Mat lab_pyramid::get_conspicuity_map(int channel) {