Merge branch 'master' of https://github.com/lostanlen/scattering.m

lostanlen · Sep 16, 2019 · 3e59f04 · 3e59f04
2 parents 3e42e4a + ae917f8
commit 3e59f04
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/lib/architecture/fill_bank_spec.m b/lib/architecture/fill_bank_spec.m
@@ -10,7 +10,7 @@
         strcmp(func2str(opt.wavelet_handle), 'finitediff_1d')
     spec.J = opt.J;
 else
-    spec.J = enforce(opt, 'J', log2(spec.T));
+    spec.J = enforce(opt, 'J', round(log2(spec.T)));
 end
 spec.max_Q = default(opt, 'max_Q', default(opt, 'nFilters_per_octave', 1));
 spec.max_scale = default(opt, 'max_scale', spec.T);

diff --git a/lib/operators/firstborn_blur.m b/lib/operators/firstborn_blur.m
@@ -86,6 +86,14 @@
     %% S. Spiraled
     data = subsasgn(zeros(output_size),subsasgn_structure, ...
         ifft_multiply(data_ft,phi,log2_resampling,colons,subscripts));
+
+        totalScale = spiraled_size(2)*spiraled_size(3);
+        if ~(size(data,2)==totalScale)
+            diffScale = size(data,2) - totalScale;
+            data(:,1:diffScale/2)=[];
+            data(:,end-diffScale/2+1:end)=[];
+        end
+
     data = reshape(data,spiraled_size);
 end
 end
diff --git a/lib/operators/firstborn_scatter.m b/lib/operators/firstborn_scatter.m
@@ -138,6 +138,14 @@
                 ifft_multiply(data_ft,psi, ...
                 log2_resampling,colons,subscripts));
         end
+
+        totalScale = spiraled_sizes{gamma_index}(2)*spiraled_sizes{gamma_index}(3);
+        if ~(size(y,2)==totalScale)
+            diffScale = size(y,2) - totalScale;
+            y(:,1:diffScale/2,:)=[];
+            y(:,end-diffScale/2+1:end,:)=[];
+        end
+
         data{gamma_index} = reshape(y,spiraled_sizes{gamma_index});
     end
     return