fix merge

Author: vpuri3

src/basic.jl

@@ -168,87 +168,6 @@ for op in (
     end
 end
 
-"""
-    ScalarOperator(val[; update_func])
-
-    (α::ScalarOperator)(a::Number) = α * a
-
-Represents a time-dependent scalar/scaling operator. The update function
-is called by `update_coefficients!` and is assumed to have the following
-signature:
-
-    update_func(oldval,u,p,t) -> newval
-"""
-struct ScalarOperator{T<:Number,F} <: AbstractSciMLLinearOperator{T}
-    val::T
-    update_func::F
-    ScalarOperator(val::T; update_func=DEFAULT_UPDATE_FUNC) where{T} =
-        new{T,typeof(update_func)}(val, update_func)
-end
-
-# constructors
-Base.convert(::Type{Number}, α::ScalarOperator) = α.val
-Base.convert(::Type{ScalarOperator}, α::Number) = ScalarOperator(α)
-
-ScalarOperator(α::ScalarOperator) = α
-ScalarOperator(λ::UniformScaling) = ScalarOperator(λ.λ)
-
-# traits
-Base.size(α::ScalarOperator) = ()
-function Base.adjoint(α::ScalarOperator) # TODO - test this thoroughly
-    val = α.val'
-    update_func =  (oldval,u,p,t) -> α.update_func(oldval',u,p,t)'
-    ScalarOperator(val; update_func=update_func)
-end
-Base.transpose(α::ScalarOperator) = α
-
-Base.one(::ScalarOperator{T}) where{T} = ScalarOperator(one(T))
-Base.zero(::ScalarOperator{T}) where{T} = ScalarOperator(zero(T))
-
-Base.one(::Type{<:AbstractSciMLOperator}) = ScalarOperator(true)
-Base.zero(::Type{<:AbstractSciMLOperator}) = ScalarOperator(false)
-
-getops(α::ScalarOperator) = (α.val,)
-islinear(L::ScalarOperator) = true
-issquare(L::ScalarOperator) = true
-isconstant(α::ScalarOperator) = α.update_func == DEFAULT_UPDATE_FUNC
-Base.iszero(α::ScalarOperator) = iszero(α.val)
-has_adjoint(::ScalarOperator) = true
-has_mul(::ScalarOperator) = true
-has_mul!(::ScalarOperator) = true
-has_ldiv(α::ScalarOperator) = iszero(α.val)
-has_ldiv!(α::ScalarOperator) = iszero(α.val)
-
-for op in (
-           :*, :/, :\,
-          )
-    for T in (
-              :Number,
-              :AbstractVecOrMat,
-             )
-        @eval Base.$op(α::ScalarOperator, x::$T) = $op(α.val, x)
-        @eval Base.$op(x::$T, α::ScalarOperator) = $op(x, α.val)
-    end
-    @eval Base.$op(x::ScalarOperator, y::ScalarOperator) = $op(x.val, y.val) # TODO - lazy compose instead?
-end
-
-for op in (:-, :+)
-    @eval Base.$op(α::ScalarOperator, x::Number) = $op(α.val, x)
-    @eval Base.$op(x::Number, α::ScalarOperator) = $op(x, α.val)
-    @eval Base.$op(x::ScalarOperator, y::ScalarOperator) = $op(x.val, y.val) # TODO - lazy sum instead?
-end
-
-LinearAlgebra.lmul!(α::ScalarOperator, u::AbstractVecOrMat) = lmul!(α.val, u)
-LinearAlgebra.rmul!(u::AbstractVecOrMat, α::ScalarOperator) = rmul!(u, α.val)
-LinearAlgebra.mul!(v::AbstractVecOrMat, α::ScalarOperator, u::AbstractVecOrMat) = mul!(v, α.val, u)
-LinearAlgebra.mul!(v::AbstractVecOrMat, α::ScalarOperator, u::AbstractVecOrMat, a, b) = mul!(v, α.val, u, a, b)
-LinearAlgebra.axpy!(α::ScalarOperator, x::AbstractVecOrMat, y::AbstractVecOrMat) = axpy!(α.val, x, y)
-LinearAlgebra.axpby!(α::ScalarOperator, x::AbstractVecOrMat, β::ScalarOperator, y::AbstractVecOrMat) = axpby!(α.val, x, β.val, y)
-Base.abs(α::ScalarOperator) = abs(α.val)
-
-LinearAlgebra.ldiv!(v::AbstractVecOrMat, α::ScalarOperator, u::AbstractVecOrMat) = ldiv!(v, α.val, u)
-LinearAlgebra.ldiv!(α::ScalarOperator, u::AbstractVecOrMat) = ldiv!(α.val, u)
-
 """
     ScaledOperator