Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Type in Aowdt #137

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Fix Type in Aowdt #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a1e3f
Fix Type in Aowdt
JeffFessler Sep 4, 2024
d03b867
To v0.19
JeffFessler Sep 4, 2024
9c517aa
To v0.18.2
JeffFessler Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "MIRT"
uuid = "7035ae7a-3787-11e9-139a-5545ed3dc201"
authors = ["fessler <fessler@umich.edu>"]
version = "0.18.1"
version = "0.18.2"

[deps]
AVSfldIO = "b6189060-daf9-4c28-845a-cc0984b81781"
Expand Down
8 changes: 4 additions & 4 deletions src/regularize/Aodwt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, # !
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading