Merge branch 'master' into gpuStates

Project.toml

@@ -1,7 +1,7 @@
 name = "RegularizedLeastSquares"
 uuid = "1e9c538a-f78c-5de5-8ffb-0b6dbe892d23"
 authors = ["Tobias Knopp <[email protected]>"]
-version = "0.15.1-DEV"
+version = "0.15.2-DEV"
 
 [deps]
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
@@ -29,12 +29,13 @@ JLArrays = "27aeb0d3-9eb9-45fb-866b-73c2ecf80fcb"
 IterativeSolvers = "0.9"
 julia = "1.9"
 StatsBase = "0.33, 0.34"
+VectorizationBase = "0.19, 0.21"
 FFTW = "1.0"
 FLoops = "0.2"
 GPUArrays = "8, 9, 10"
 VectorizationBase = "0.19, 0.21"
 JLArrays = "0.1.2"
-LinearOperatorCollection = "2.0"
+LinearOperatorCollection = "2"
 LinearOperators = "2.3.3"
 
 [targets]

src/proximalMaps/ProxLLR.jl

@@ -103,7 +103,7 @@ end
 """
     norm(reg::LLRRegularization, x, λ)
 
-returns the value of the LLR-regularization term. The norm is only implemented for 2D, non-fully overlapping blocks. 
+returns the value of the LLR-regularization term. The norm is only implemented for 2D, non-fully overlapping blocks.
 """
 function norm(reg::LLRRegularization, x::Union{AbstractArray{T}, AbstractArray{Complex{T}}}, λ::T) where {T <: Real}
     shape = reg.shape
@@ -173,7 +173,7 @@ performs the proximal map for LLR regularization using singular-value-thresholdi
 function proxLLROverlapping!(reg::LLRRegularization{TR, N, TI}, x::Union{AbstractArray{T}, AbstractArray{Complex{T}}}, λ::T) where {TR, N, TI, T}
     shape = reg.shape
     blockSize = reg.blockSize
-    
+
     x = reshape(x, tuple(shape..., length(x) ÷ prod(shape)))
 
     block_idx = CartesianIndices(blockSize)