diff --git a/Project.toml b/Project.toml index b4982780..78c34f3a 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "RegularizedLeastSquares" uuid = "1e9c538a-f78c-5de5-8ffb-0b6dbe892d23" authors = ["Tobias Knopp "] -version = "0.5" +version = "0.5.1" [deps] IterativeSolvers = "42fd0dbc-a981-5370-80f2-aaf504508153" @@ -13,7 +13,7 @@ SparsityOperators = "a5ff1dd3-4e0a-50db-9022-6d011c1d5846" [compat] julia = "1.0" -SparsityOperators = "0.1.4" +SparsityOperators = "0.1.5" ProgressMeter = "1.2" IterativeSolvers = "0.8" diff --git a/src/Utils.jl b/src/Utils.jl index 0b67c3cb..64c84b7a 100644 --- a/src/Utils.jl +++ b/src/Utils.jl @@ -221,7 +221,7 @@ function applyConstraints(x, sparseTrafo, enforceReal, enforcePositive, constrai enforceReal && enfReal!(x, mask) enforcePositive && enfPos!(x, mask) if sparseTrafo != nothing - x[:] = sparseTrafo' * x + x[:] = adjoint(sparseTrafo)*x end end diff --git a/src/proximalMaps/ProxL1.jl b/src/proximalMaps/ProxL1.jl index e1a84a33..592a8eda 100644 --- a/src/proximalMaps/ProxL1.jl +++ b/src/proximalMaps/ProxL1.jl @@ -20,7 +20,7 @@ function proxL1!(x::Array{T}, λ::Float64; sparseTrafo::Trafo=nothing, kargs...) z[:] = [i*max( (abs(i)-λ)/abs(i),0 ) for i in z] end if sparseTrafo != nothing - x[:] = sparseTrafo\z + x[:] = adjoint(sparseTrafo)*z else x[:] = z end diff --git a/src/proximalMaps/ProxL21.jl b/src/proximalMaps/ProxL21.jl index 2d8b9292..6feb4409 100644 --- a/src/proximalMaps/ProxL21.jl +++ b/src/proximalMaps/ProxL21.jl @@ -22,7 +22,7 @@ function proxL21!(x::Vector{T},λ::Float64; sparseTrafo::Trafo=nothing, slices:: proxL21!(z, λ, slices) end if sparseTrafo != nothing - x[:] = sparseTrafo\z + x[:] = adjoint(sparseTrafo)*z else x[:] = z end @@ -37,7 +37,7 @@ end """ normL21(x::Vector{T}, λ::Float64; sparseTrafo::Trafo=nothing, slices::Int64=1, kargs...) where T - + return the value of the L21-regularization term. Arguments are the same as in `proxL21!` """