diff --git a/Project.toml b/Project.toml index 20821a2..3a1bae5 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "LinearOperatorCollection" uuid = "a4a2c56f-fead-462a-a3ab-85921a5f2575" authors = ["Tobias Knopp and contributors"] -version = "1.1.0" +version = "1.1.1" [deps] LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -26,7 +26,7 @@ julia = "1.9" FFTW = "1.0" LinearOperators = "2.3.3" Reexport = "1.0" -Wavelets = "0.9" +Wavelets = "0.9, 0.10" NFFT = "0.13" [extras] diff --git a/ext/LinearOperatorFFTWExt/FFTOp.jl b/ext/LinearOperatorFFTWExt/FFTOp.jl index 2b279fe..5ea0d8c 100644 --- a/ext/LinearOperatorFFTWExt/FFTOp.jl +++ b/ext/LinearOperatorFFTWExt/FFTOp.jl @@ -1,5 +1,4 @@ export FFTOpImpl -import Base.copy mutable struct FFTOpImpl{T} <: FFTOp{T} nrow :: Int @@ -92,5 +91,5 @@ end function Base.copy(S::FFTOpImpl) - return FFTOpImpl(eltype(S), size(S.plan), S.shift, unitary=S.unitary) + return FFTOp(eltype(S); shape=size(S.plan), shift=S.shift, unitary=S.unitary) end diff --git a/ext/LinearOperatorNFFTExt/NFFTOp.jl b/ext/LinearOperatorNFFTExt/NFFTOp.jl index d8ae052..495ea99 100644 --- a/ext/LinearOperatorNFFTExt/NFFTOp.jl +++ b/ext/LinearOperatorNFFTExt/NFFTOp.jl @@ -1,4 +1,3 @@ -import Base.adjoint function LinearOperatorCollection.NFFTOp(::Type{T}; shape::Tuple, nodes::AbstractMatrix{U}, toeplitz=false, oversamplingFactor=1.25, diff --git a/src/LinearOperatorCollection.jl b/src/LinearOperatorCollection.jl index 376dcee..c41d11e 100644 --- a/src/LinearOperatorCollection.jl +++ b/src/LinearOperatorCollection.jl @@ -1,15 +1,13 @@ module LinearOperatorCollection -import Base: length, iterate, \ using LinearAlgebra -import LinearAlgebra.BLAS: gemv, gemv! -import LinearAlgebra: BlasFloat, normalize!, norm, rmul!, lmul! +using LinearAlgebra.BLAS: gemv, gemv! +using LinearAlgebra: BlasFloat, normalize!, norm, rmul!, lmul! using SparseArrays using Random using InteractiveUtils using Reexport -@reexport using Reexport @reexport using LinearOperators LinearOperators.use_prod5!(op::opEye) = false diff --git a/src/WeightingOp.jl b/src/WeightingOp.jl index fb4bffb..479df0f 100644 --- a/src/WeightingOp.jl +++ b/src/WeightingOp.jl @@ -1,5 +1,5 @@ """ - WeightingOp(weights::Vector{T}, rep::Int=1) where T + WeightingOp(::Type{T}; weights::Vector{T}, rep::Int=1) where T generates a `LinearOperator` which multiplies an input vector index-wise with `weights`