From 44f090d26b617ae6ab7339541231a183ceb7cefb Mon Sep 17 00:00:00 2001 From: Jeff Fessler Date: Wed, 4 Sep 2024 17:21:21 -0400 Subject: [PATCH] Fix Type in Aowdt (#137) * Fix Type in Aowdt * To v0.19 * To v0.18.2 --- Project.toml | 2 +- src/regularize/Aodwt.jl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Project.toml b/Project.toml index b273512..fd60dcb 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MIRT" uuid = "7035ae7a-3787-11e9-139a-5545ed3dc201" authors = ["fessler "] -version = "0.18.1" +version = "0.18.2" [deps] AVSfldIO = "b6189060-daf9-4c28-845a-cc0984b81781" diff --git a/src/regularize/Aodwt.jl b/src/regularize/Aodwt.jl index 5a7b6da..db51826 100644 --- a/src/regularize/Aodwt.jl +++ b/src/regularize/Aodwt.jl @@ -33,7 +33,7 @@ which is useful when imposing scale-dependent regularization """ function Aodwt( dims::Dims ; - T::Type{<:Complex{<:AbstractFloat}} = ComplexF32, + T::Type{<:Union{AbstractFloat,Complex{<:AbstractFloat}}} = Float32, level::Int = 3, wt = wavelet(WT.haar), operator::Bool = true, # ! @@ -52,7 +52,7 @@ function Aodwt( mfun = (A, x) -> A * x return mfun, LinearMapAA(forw!, back!, (prod(dims), prod(dims)) ; - prop = (wt=wt, level=lev), T=T, + prop = (wt, level=lev), T, operator = true, idim=dims, odim=dims, ) else @@ -63,7 +63,7 @@ function Aodwt( # x -> vec(dwt(reshape(x, dims), wt, level)), # y -> vec(idwt(reshape(y, dims), wt, level)), (prod(dims), prod(dims)) ; - prop = (wt=wt, level=lev), T=T, + prop = (wt, level=lev), T, ) end end @@ -72,7 +72,7 @@ function Aodwt( scales = zeros(dims) for il in 1:level - _,Al = mfunA(il) + _, Al = mfunA(il) tmp = mfun(Al, ones(dims)) .== 0 scales += il * (tmp .& (scales .== 0)) end