Browse Source

Merge branch 'release/v0.4.7'

Jérôme BUISINE 9 months ago
parent
commit
57b643ed5b
5 changed files with 1663 additions and 54 deletions
  1. 688 0
      analysis/custom_diff_filter_svd.ipynb
  2. 858 0
      analysis/custom_filters_analysis.ipynb
  3. 113 50
      analysis/plane_filter.ipynb
  4. 3 3
      data_attributes.py
  5. 1 1
      modules

File diff suppressed because it is too large
+ 688 - 0
analysis/custom_diff_filter_svd.ipynb


File diff suppressed because it is too large
+ 858 - 0
analysis/custom_filters_analysis.ipynb


File diff suppressed because it is too large
+ 113 - 50
analysis/plane_filter.ipynb


+ 3 - 3
data_attributes.py

@@ -524,7 +524,7 @@ def get_image_features(data_type, block):
             normed_l_img = utils.normalize_2D_arr(l_img)
 
             # bilateral with window of size (3, 3)
-            normed_diff = convolution.convolution2D(normed_l_img, kernels.bilateral_diff, (3, 3))
+            normed_diff = convolution.convolution2D(normed_l_img, kernels.min_bilateral_diff, (3, 3))
             std_diff = np.std(normed_diff)
             mean_diff = np.mean(normed_diff)
 
@@ -532,7 +532,7 @@ def get_image_features(data_type, block):
             diff_mean_list_3.append(mean_diff)
 
             # bilateral with window of size (5, 5)
-            normed_diff = convolution.convolution2D(normed_l_img, kernels.bilateral_diff, (5, 5))
+            normed_diff = convolution.convolution2D(normed_l_img, kernels.min_bilateral_diff, (5, 5))
             std_diff = np.std(normed_diff)
             mean_diff = np.mean(normed_diff)
 
@@ -665,7 +665,7 @@ def get_image_features(data_type, block):
         normed_l_img = utils.normalize_2D_arr(l_img)
 
         # bilateral with window of size (5, 5)
-        normed_diff = convolution.convolution2D(normed_l_img, kernels.bilateral_diff, (5, 5))
+        normed_diff = convolution.convolution2D(normed_l_img, kernels.min_bilateral_diff, (5, 5))
 
         # getting sigma vector from SVD compression
         s = compression.get_SVD_s(normed_diff)

+ 1 - 1
modules

@@ -1 +1 @@
-Subproject commit 139aa3c2312e9449b32d1d6fa506d741e7790c98
+Subproject commit c500a84bebabfbebc53041bf8a00f0120cd417c3