From e166b01b774b32f61831d9b13a6bee44a5876efc Mon Sep 17 00:00:00 2001 From: Tianshu Cheng Date: Tue, 8 Sep 2015 16:26:51 -0500 Subject: [PATCH] simple mask test --- fun_mPb_theta.cpp | 4 ++-- gauss_derivative_odd.cpp | 11 +++++++---- test result/0829_01_vs_gradient_theta=0.PNG | Bin 197948 -> 0 bytes test result/0829_02_vs_gradient_theta=0.PNG | Bin 389919 -> 0 bytes test result/0829_03_vs_gradient_theta=0_r=3,5,10.PNG | Bin 597470 -> 0 bytes test result/0829_03_vs_gradient_theta=90_r=3,5,10.PNG | Bin 555231 -> 0 bytes test result/0829_04_compare_colora_theta=90_r=3,5,10.PNG | Bin 572535 -> 0 bytes test result/0829_04_compare_colorb_theta=90_r=3,5,10.PNG | Bin 736291 -> 0 bytes test result/0829_04_compare_vs_gradient_theta=90_r=3,5,10.PNG | Bin 718733 -> 0 bytes test result/0831_01_compare_vs_mPb.PNG | Bin 426314 -> 0 bytes test result/0831_01_compare_vs_mPb_time.PNG | Bin 6719 -> 0 bytes 11 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 test result/0829_01_vs_gradient_theta=0.PNG delete mode 100644 test result/0829_02_vs_gradient_theta=0.PNG delete mode 100644 test result/0829_03_vs_gradient_theta=0_r=3,5,10.PNG delete mode 100644 test result/0829_03_vs_gradient_theta=90_r=3,5,10.PNG delete mode 100644 test result/0829_04_compare_colora_theta=90_r=3,5,10.PNG delete mode 100644 test result/0829_04_compare_colorb_theta=90_r=3,5,10.PNG delete mode 100644 test result/0829_04_compare_vs_gradient_theta=90_r=3,5,10.PNG delete mode 100644 test result/0831_01_compare_vs_mPb.PNG delete mode 100644 test result/0831_01_compare_vs_mPb_time.PNG diff --git a/fun_mPb_theta.cpp b/fun_mPb_theta.cpp index 8a42894..91ec90d 100644 --- a/fun_mPb_theta.cpp +++ b/fun_mPb_theta.cpp @@ -28,8 +28,8 @@ stim::image func_mPb_theta(stim::image lab, float theta, unsigned stim::image l1,l2,l3,a1,a2,a3,b1,b2,b3; - l1 = gaussian_derivative_filter_odd(pic_light, sigma, sigma_n, r1 * 2, theta, w, h); - stim::cpu2image(l1.data(), "data_output/l1_tex2.bmp", w, h, stim::cmBrewer); + l1 = gaussian_derivative_filter_odd(pic_light, sigma, sigma_n, r3 * 2, theta, w, h); + stim::cpu2image(l1.data(), "data_output/testl_tex5.bmp", w, h, stim::cmBrewer); l2 = gaussian_derivative_filter_odd(pic_light, sigma, sigma_n, r2 * 2, theta, w, h); stim::cpu2image(l2.data(), "data_output/l2_tex.bmp", w, h, stim::cmBrewer); l3 = gaussian_derivative_filter_odd(pic_light, sigma, sigma_n, r3 * 2, theta, w, h); diff --git a/gauss_derivative_odd.cpp b/gauss_derivative_odd.cpp index cbce934..1eec4f4 100644 --- a/gauss_derivative_odd.cpp +++ b/gauss_derivative_odd.cpp @@ -12,12 +12,14 @@ void array_multiply(float* lhs, float rhs, unsigned int N); // winsize = 2 * r, side of mask = winsize + 1 stim::image gaussian_derivative_filter_odd(stim::image image, float sigma, unsigned int sigma_n, unsigned int winsize, float theta, unsigned int w, unsigned int h){ - stim::image mask_x(winsize+1, winsize+1), mask_y(winsize+1, winsize+1), mask_theta(winsize+1, winsize+1), derivative_x, derivative_y, derivative_theta(w, h); + stim::image mask_x(winsize+1, winsize+1), mask_y(winsize+1, winsize+1), mask_theta(winsize+1, winsize+1), mask_test(winsize+1, winsize+1, 1), derivative_x, derivative_y, derivative_theta(w, h); //float* ptr = mask_x.data(); - //mask_x.load("101087.bmp"); - //float s[169]; - //float *ptr = s; + + memset ( mask_test.data(), 0, mask_test.size() * sizeof(float)); + mask_test.data()[winsize*(winsize+2)/2] = 1; + stim::cpu2image(mask_test.data(), "data_output/mask_test.bmp", winsize+1, winsize+1, stim::cmBrewer); + // set parameters unsigned N = w * h; @@ -51,6 +53,7 @@ stim::image gaussian_derivative_filter_odd(stim::image image, floa // 2D convolution //derivative_theta = image.convolve2(mask_theta); //stim::cpu2image(derivative_theta.data(), "data_output/derivative_theta1.bmp", w, h, stim::cmBrewer); + //conv2(image.data(), mask_test.data(), derivative_theta.data(), w, h, winsize+1); conv2(image.data(), mask_theta.data(), derivative_theta.data(), w, h, winsize+1); //stim::cpu2image(derivative_theta.data(), "data_output/derivative_theta_tex1.bmp", w, h, stim::cmBrewer); diff --git a/test result/0829_01_vs_gradient_theta=0.PNG b/test result/0829_01_vs_gradient_theta=0.PNG deleted file mode 100644 index 3e8add3..0000000 Binary files a/test result/0829_01_vs_gradient_theta=0.PNG and /dev/null differ diff --git a/test result/0829_02_vs_gradient_theta=0.PNG b/test result/0829_02_vs_gradient_theta=0.PNG deleted file mode 100644 index abfb3d9..0000000 Binary files a/test result/0829_02_vs_gradient_theta=0.PNG and /dev/null differ diff --git a/test result/0829_03_vs_gradient_theta=0_r=3,5,10.PNG b/test result/0829_03_vs_gradient_theta=0_r=3,5,10.PNG deleted file mode 100644 index b0da69a..0000000 Binary files a/test result/0829_03_vs_gradient_theta=0_r=3,5,10.PNG and /dev/null differ diff --git a/test result/0829_03_vs_gradient_theta=90_r=3,5,10.PNG b/test result/0829_03_vs_gradient_theta=90_r=3,5,10.PNG deleted file mode 100644 index b6d017d..0000000 Binary files a/test result/0829_03_vs_gradient_theta=90_r=3,5,10.PNG and /dev/null differ diff --git a/test result/0829_04_compare_colora_theta=90_r=3,5,10.PNG b/test result/0829_04_compare_colora_theta=90_r=3,5,10.PNG deleted file mode 100644 index be3605d..0000000 Binary files a/test result/0829_04_compare_colora_theta=90_r=3,5,10.PNG and /dev/null differ diff --git a/test result/0829_04_compare_colorb_theta=90_r=3,5,10.PNG b/test result/0829_04_compare_colorb_theta=90_r=3,5,10.PNG deleted file mode 100644 index ac2ed95..0000000 Binary files a/test result/0829_04_compare_colorb_theta=90_r=3,5,10.PNG and /dev/null differ diff --git a/test result/0829_04_compare_vs_gradient_theta=90_r=3,5,10.PNG b/test result/0829_04_compare_vs_gradient_theta=90_r=3,5,10.PNG deleted file mode 100644 index 013d7d1..0000000 Binary files a/test result/0829_04_compare_vs_gradient_theta=90_r=3,5,10.PNG and /dev/null differ diff --git a/test result/0831_01_compare_vs_mPb.PNG b/test result/0831_01_compare_vs_mPb.PNG deleted file mode 100644 index 7df4179..0000000 Binary files a/test result/0831_01_compare_vs_mPb.PNG and /dev/null differ diff --git a/test result/0831_01_compare_vs_mPb_time.PNG b/test result/0831_01_compare_vs_mPb_time.PNG deleted file mode 100644 index eb1cde6..0000000 Binary files a/test result/0831_01_compare_vs_mPb_time.PNG and /dev/null differ -- libgit2 0.21.4