fix mul! add associated test

slimgroup · May 3, 2022 · 32ee9f1 · 32ee9f1
1 parent b6ba28d
commit 32ee9f1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/TimeModeling/LinearOperators/operators.jl b/src/TimeModeling/LinearOperators/operators.jl
@@ -174,7 +174,7 @@ adjoint(L::LazyScal) = LazyScal(L.s, adjoint(L.P))
 
 mul!(out::SourceType{T}, F::judiPropagator{T, O}, q::SourceType{T}) where {T<:Number, O} = begin y = F*q; copyto!(out, y) end
 mul!(out::SourceType{T}, F::judiPropagator{T, O}, q::Vector{T}) where {T<:Number, O} = begin y = F*q; copyto!(out, y) end
-mul!(out::SourceType{T}, F::joLinearFunction{T, T}, q::SourceType{T}) where {T<:Number} = begin y = F*q; copyto!(out, y) end
+mul!(out::Union{SourceType{T1},SourceType{T2}}, F::joAbstractLinearOperator{T2, T1}, q::SourceType{T2}) where {T1<:Number, T2<:Number} = begin y = F*q; copyto!(out, y) end
 mul!(out::SourceType{T}, F::judiAbstractJacobian{T, :born, FT}, q::Vector{T}) where {T<:Number, FT} = begin y = F*q[:]; copyto!(out, y) end
 mul!(out::SourceType{T}, F::judiAbstractJacobian{T, :born, FT}, q::Array{T, N}) where {T<:Number, FT, N} = begin y = F*q[:]; copyto!(out, y) end
 mul!(out::Array{T, 2}, F::judiAbstractJacobian{T, :adjoint_born, FT}, q::SourceType{T}) where {T<:Number, FT} =  begin y = F*q; copyto!(out, y) end

diff --git a/src/TimeModeling/Types/abstract.jl b/src/TimeModeling/Types/abstract.jl
@@ -74,9 +74,8 @@ vec(x::judiMultiSourceVector) = vcat(vec.(x.data)...)
 time_sampling(ms::judiMultiSourceVector) = [1 for i=1:ms.nsrc]
 ############################################################################################################################
 # Linear algebra `*`
-(msv::judiMultiSourceVector{T})(x::Vector{T}) where {T<:AbstractFloat} = x
-(msv::judiMultiSourceVector{T})(x::judiMultiSourceVector{T}) where {T} = x
-(msv::judiMultiSourceVector{mT})(x::Vector{T}) where {mT, T<:Array} = begin y = deepcopy(msv); y.data .= x; return y end
+(msv::judiMultiSourceVector{mT})(x::AbstractVector{T}) where {mT<:Number, T<:Number} = x
+(msv::judiMultiSourceVector{mT})(x::AbstractVector{T}) where {mT, T<:Array} = begin y = deepcopy(msv); y.data .= x; return y end
 
 function *(J::Union{Matrix{vDT}, joAbstractLinearOperator}, x::judiMultiSourceVector{vDT}) where vDT
     outvec = try J.fop(x) catch; J*vec(x) end

diff --git a/test/test_linear_algebra.jl b/test/test_linear_algebra.jl
@@ -89,6 +89,19 @@
         @test isapprox(dobs_out, Md'*dobs; rtol=ftol)
 
         # Check JUDI-JOLI compat
+
+        # check JOLI operator w/ judiVector
+        mul!(dobs_out, J*D, dm)
+        mul!(dobs, J*D, dm.data)
+        dlin = J*D*dm
+        @test isapprox(dobs_out, dlin; rtol=ftol)
+        @test isapprox(dobs_out, dobs; rtol=ftol)
+        # check JOLI operator w/ judiVector
+        DFT = joDFT(n; DDT=Float32, RDT=ComplexF32)
+        mul!(dm, adjoint(J*DFT), dlin)
+        dm1 = adjoint(J*DFT) * dlin
+        @test isapprox(dm1.data, dm; rtol=ftol)
+
         dm1 = M * J' * Md * dobs
         @test length(dm1) == prod(model0.n)
         @test dm1[1] == 0