2martens/uni
1
0
Fork 0
mirror of https://github.com/2martens/uni.git synced 2026-05-06 19:36:26 +02:00
Code Releases Activity

[CCV] Removed hardcoded gabor parameters

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2017-05-30 20:59:32 +02:00
parent 5deeb1a46e
commit fcb47f3828
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ccv/saliency/includes/oriented_pyramid.h
View File

@ -14,15 +14,22 @@ private:
/** /**
* Initializes the Gabor filters. * Initializes the Gabor filters.
* @param num_orientations the number of orientations to use * @param num_orientations the number of orientations to use
* @param size the size of the Gabor filter
* @param wavelength the wavelength
* @param standard_deviation the standard deviation
*/ */
void initialize_gabor_filters(float num_orientations); void initialize_gabor_filters(float num_orientations, int size, double wavelength, double standard_deviation);
public: public:
/** /**
* Initializes the oriented pyramid. * Initializes the oriented pyramid.
* @param pyramid the laplacian pyramid * @param pyramid the laplacian pyramid
* @param num_orientations the number of Gabor filters to apply * @param num_orientations the number of Gabor filters to apply
* @param size the size of the Gabor filter
* @param wavelength the wavelength
* @param standard_deviation the standard deviation
*/ */
oriented_pyramid(const laplacian_pyramid& pyramid, int num_orientations); oriented_pyramid(const laplacian_pyramid& pyramid, int num_orientations, int size,
double wavelength, double standard_deviation);
/** /**
* Computes the feature maps. * Computes the feature maps.

16
ccv/saliency/oriented_pyramid.cpp
View File

@ -1,12 +1,13 @@
#include "includes/oriented_pyramid.h" #include "includes/oriented_pyramid.h"
#include "includes/fusion.h" #include "includes/fusion.h"
oriented_pyramid::oriented_pyramid(const laplacian_pyramid &pyramid, int num_orientations) { oriented_pyramid::oriented_pyramid(const laplacian_pyramid &pyramid, int num_orientations, int size,
double wavelength, double standard_deviation) {
_gabor_filters = std::vector<cv::Mat>(); _gabor_filters = std::vector<cv::Mat>();
_orientation_maps = std::vector<std::vector<cv::Mat>>(); _orientation_maps = std::vector<std::vector<cv::Mat>>();
_feature_maps = std::vector<cv::Mat>(); _feature_maps = std::vector<cv::Mat>();
initialize_gabor_filters(num_orientations); initialize_gabor_filters(num_orientations, size, wavelength, standard_deviation);
unsigned long number_of_layers = pyramid.get_number_of_layers(); unsigned long number_of_layers = pyramid.get_number_of_layers();
for (unsigned long i = 0; i < num_orientations; i++) { for (unsigned long i = 0; i < num_orientations; i++) {
std::vector<cv::Mat> orientation_vector = std::vector<cv::Mat>(); std::vector<cv::Mat> orientation_vector = std::vector<cv::Mat>();
@ -20,14 +21,13 @@ oriented_pyramid::oriented_pyramid(const laplacian_pyramid &pyramid, int num_ori
} }
void oriented_pyramid::initialize_gabor_filters(float num_orientations) { void oriented_pyramid::initialize_gabor_filters(float num_orientations, int size,
cv::Size size = cv::Size(20, 20); double wavelength, double standard_deviation) {
double wavelength = 3; cv::Size size_obj = cv::Size(size, size);
double standard_deviation = 18;
double start_level = num_orientations / 2.0; double start_level = num_orientations / 2.0;
for (double level = start_level; level >= 0; level--) { for (double level = start_level; level >= 0; level--) {
_gabor_filters.push_back(cv::getGaborKernel(size, standard_deviation, (level/num_orientations) * CV_PI, wavelength, _gabor_filters.push_back(cv::getGaborKernel(size_obj, standard_deviation, (level/num_orientations) * CV_PI, wavelength,
1, 0, CV_32F)); 1, 0, CV_32F));
} }
@ -35,7 +35,7 @@ void oriented_pyramid::initialize_gabor_filters(float num_orientations) {
start_level = num_orientations - 1; start_level = num_orientations - 1;
for (double level = start_level; level > end_level; level--) { for (double level = start_level; level > end_level; level--) {
_gabor_filters.push_back(cv::getGaborKernel(size, standard_deviation, (level/num_orientations) * CV_PI, wavelength, _gabor_filters.push_back(cv::getGaborKernel(size_obj, standard_deviation, (level/num_orientations) * CV_PI, wavelength,
1, 0, CV_32F)); 1, 0, CV_32F));
} }
} }