bugfixes

Author: hakkelt

FFTWOperators/src/combination_rules.jl

@@ -139,7 +139,7 @@ end
 # FFTShift/IFFTShift with FFTShift/IFFTShift
 have_shifted_dims_even_length(T::ShiftOp) = all(iseven, size(T, 2)[collect(T.dirs)])
 are_shifted_dims_disjoint(T1::ShiftOp, T2::ShiftOp) =
-    all(d -> !(d in T1.dirs && d in T2.dirs), 1:ndims(T1))
+    all(d -> !(d in T1.dirs && d in T2.dirs), 1:ndims(T1, 2))
 does_fully_cover(T1::ShiftOp, T2::ShiftOp) = all(d -> (d in T1.dirs && d in T2.dirs), T1.dirs) # T1 fully covers T2
 function can_be_combined(T1::FFTShift, T2::FFTShift)
     return (have_shifted_dims_even_length(T1) && have_shifted_dims_even_length(T2)) || are_shifted_dims_disjoint(T1, T2)
@@ -154,11 +154,11 @@ function can_be_combined(T1::IFFTShift, T2::FFTShift)
     return (have_shifted_dims_even_length(T1) && have_shifted_dims_even_length(T2)) || does_fully_cover(T1, T2) || does_fully_cover(T2, T1)
 end
 function combine(T1::FFTShift, T2::FFTShift)
-    new_dirs = Tuple(d for d in 1:ndims(T1) if (d in T1.dirs) || (d in T2.dirs))
+    new_dirs = Tuple(d for d in 1:ndims(T1, 2) if (d in T1.dirs) || (d in T2.dirs))
     return FFTShift(domain_type(T1), size(T1, 2), new_dirs)
 end
 function combine(T1::IFFTShift, T2::IFFTShift)
-    new_dirs = Tuple(d for d in 1:ndims(T1) if (d in T1.dirs) || (d in T2.dirs))
+    new_dirs = Tuple(d for d in 1:ndims(T1, 2) if (d in T1.dirs) || (d in T2.dirs))
     return IFFTShift(domain_type(T1), size(T1, 2), new_dirs)
 end
 function combine(T1::FFTShift, T2::IFFTShift)

WaveletOperators/src/WaveletOperators.jl

@@ -117,7 +117,7 @@ AbstractOperators.is_thread_safe(::WaveletOp) = true
 has_fast_opnorm(::WaveletOp) = true
 has_fast_opnorm(::AdjointOperator{<:WaveletOp}) = true
 opnorm(::WaveletOp{T}) where {T} = one(T)
-opnorm(::AdjointOperator{<:WaveletOp}) = one(eltype(domain_type(L.A)))
+opnorm(L::AdjointOperator{<:WaveletOp}) = one(eltype(domain_type(L.A)))
 
 # Utils
 

src/combination_rules.jl

@@ -296,7 +296,7 @@ function combine(T1::AdjointOperator{<:DiagOp}, T2::MatrixOp)
     return MatrixOp(domain_type(T2), size(T2, 2), combine_matrix(conj(T1.A.d), T2.A))
 end
 function combine(T1::DiagOp, T2::AdjointOperator{<:MatrixOp})
-    return MatrixOp(domain_type(T2), size(T2, 2), combine_matrix(T1.d, T2.A'))
+    return MatrixOp(domain_type(T2), size(T2, 2), combine_matrix(T1.d, T2.A.A'))
 end
 function combine(T1::MatrixOp, T2::AdjointOperator{<:DiagOp})
     return MatrixOp(domain_type(T2), size(T2, 2), combine_matrix(T1.A, conj(T2.A.d)))

src/syntax.jl

@@ -75,7 +75,7 @@ end
 function Base.getindex(H::HCAT, idx::Union{AbstractArray, Int})
     unfolded = vcat([[i...] for i in H.idxs]...)
     if length(idx) == length(unfolded)
-        return permute(H, idx)
+        return permute(H, idx isa Int ? [idx] : idx)
     else
         new_H = ()
         for i in idx
@@ -97,7 +97,7 @@ end
 function Base.getindex(H::VCAT, idx::Union{AbstractArray, Int})
     unfolded = vcat([[i...] for i in H.idxs]...)
     if length(idx) == length(unfolded)
-        return permute(H, idx)
+        return permute(H, idx isa Int ? [idx] : idx)
     else
         new_H = ()
         for i in idx