Operator constructor instead of convert

Author: jishnub

src/Operators/Operator.jl

@@ -900,3 +900,5 @@ diagindrow(S::SubOperator) = diagindrow(S,parentindices(S)[1],parentindices(S)[2
 
 # Conversion between operator types
 convert(::Type{O}, c::Operator) where {O<:Operator} = c isa O ? c : O(c)::O
+convert(::Type{Operator{T}}, c::Operator{S}) where {S,T} = c isa Operator{T} ? c : Operator{T}(c)::Operator{T}
+Operator(A::Operator) = A

src/Operators/SubOperator.jl

@@ -78,8 +78,16 @@ SubOperator(A,inds,dims) = SubOperator(A,inds,dims,(dims[1]-1,dims[2]-1))
 SubOperator(A,inds) = SubOperator(A,inds,map(length,inds))
 
 
-convert(::Type{Operator{T}},SO::SubOperator) where {T} =
+Operator{T}(SO::SubOperator) where {T} =
     SubOperator(Operator{T}(SO.parent),SO.indexes,SO.dims,SO.bandwidths)::Operator{T}
+function SubOperator{T,B,I,DI,BI}(S::SubOperator) where {T,B,I,DI,BI}
+    SubOperator{T,B,I,DI,BI}(
+        strictconvert(B, S.parent),
+        strictconvert(I, S.indexes),
+        strictconvert(DI, S.dims),
+        strictconvert(BI, S.bandwidths),
+        )
+end
 
 function view(A::Operator,kr::InfRanges,jr::InfRanges)
     @assert isinf(size(A,1)) && isinf(size(A,2))

src/Operators/almostbanded/LowRankOperator.jl

@@ -39,9 +39,12 @@ LowRankOperator(B::AbstractVector,S...) = LowRankOperator(strictconvert(Vector{O
 LowRankOperator(A::Fun,B::Operator) = LowRankOperator([A],[B])
 
 
-convert(::Type{Operator{T}},L::LowRankOperator{S}) where {S,T} =
+function LowRankOperator{S,T}(L::LowRankOperator) where {S,T}
     LowRankOperator{S,T}(strictconvert(Vector{VFun{S,T}},L.U),
                          strictconvert(Vector{Operator{T}},L.V))
+end
+
+Operator{T}(L::LowRankOperator{S}) where {S,T} = LowRankOperator{S,T}(S)
 
 
 datasize(L::LowRankOperator,k) =

src/Operators/almostbanded/LowRankPertOperator.jl

@@ -20,9 +20,12 @@ function LowRankPertOperator(Bin::Operator,Lin::LowRankOperator)
 end
 
 
-
-convert(::Type{Operator{T}},L::LowRankPertOperator) where {T} =
-    LowRankPertOperator(Operator{T}(L.op),Operator{T}(L.pert))::Operator{T}
+function LowRankPertOperator{OO,LR,T}(L::LowRankPertOperator) where {OO,LR,T}
+    LowRankPertOperator{OO,LR,T}(strictconvert(OO, L.op), strictconvert(LR, L.pert))
+end
+function Operator{T}(L::LowRankPertOperator) where {T}
+    LowRankPertOperator(Operator{T}(L.op),Operator{T}(L.pert))
+end
 convert(::Type{Operator},V::AbstractVector{OT}) where {OT<:Operator}=LowRankPertOperator(V)
 
 

src/Operators/banded/CalculusOperator.jl

@@ -58,26 +58,18 @@ macro calculus_operator(Op)
         $Op(x...) = $DefaultOp(x...)
         $ConcOp(S::Space) = $ConcOp(S,1)
 
-        function Base.convert(::Type{Operator{T}},D::$ConcOp) where T
-            if T==eltype(D)
-                D
-            else
-                $ConcOp{typeof(D.space),typeof(D.order),T}(D.space, D.order)
-            end
+        function Operator{T}(D::$ConcOp) where {T}
+            $ConcOp{typeof(D.space),typeof(D.order),T}(D.space, D.order)
         end
 
         $WrappOp(op::Operator, order = 1, d = domainspace(op), r = rangespace(op)) =
             $WrappOp{typeof(op),typeof(d),typeof(r),typeof(order),eltype(op)}(op,order,d,r)
 
-        function Base.convert(::Type{Operator{T}},D::$WrappOp) where T
-            if T==eltype(D)
-                D
-            else
-                op=ApproxFunBase.strictconvert(Operator{T},D.op)
-                S = domainspace(D)
-                R = rangespace(D)
-                $WrappOp(op,D.order,S,R)::Operator{T}
-            end
+        function Operator{T}(D::$WrappOp) where {T}
+            op=ApproxFunBase.strictconvert(Operator{T},D.op)
+            S = domainspace(D)
+            R = rangespace(D)
+            $WrappOp(op,D.order,S,R)::Operator{T}
         end
 
         ## Routines

src/Operators/banded/ConstantOperator.jl

@@ -1,6 +1,6 @@
 export ConstantOperator, IdentityOperator, BasisFunctional
 
-struct ConstantOperator{T,DS} <: Operator{T}
+struct ConstantOperator{T,DS<:Space} <: Operator{T}
     λ::T
     space::DS
     ConstantOperator{T,DS}(c::Number,sp::DS) where {T,DS} = new{T,DS}(strictconvert(T,c),sp)
@@ -36,12 +36,11 @@ getindex(C::ConstantOperator,k::Integer,j::Integer) =
 
 ==(C1::ConstantOperator, C2::ConstantOperator) = C1.λ==C2.λ
 
-function convert(::Type{Operator{T}}, C::ConstantOperator) where T
-    if T == eltype(C)
-        C
-    else
-        ConstantOperator{T,typeof(C.space)}(C.λ,C.space)
-    end
+function ConstantOperator{T,DS}(C::ConstantOperator) where {T,DS}
+    ConstantOperator{T,DS}(strictconvert(T, C.λ), strictconvert(DS, C.space))
+end
+function Operator{T}(C::ConstantOperator) where T
+    ConstantOperator{T,typeof(C.space)}(C.λ,C.space)
 end
 
 # zero needs to be different since it can take a space to

src/Operators/banded/Conversion.jl

@@ -16,12 +16,12 @@ function ConcreteConversion(a::Space,b::Space)
     ConcreteConversion(T, a, b)
 end
 
-function convert(::Type{Operator{T}}, C::ConcreteConversion) where {T}
-    if T==eltype(C)
-        C
-    else
-        ConcreteConversion(T, C.domainspace,C.rangespace)::Operator{T}
-    end
+function ConcreteConversion{D,R,T}(C::ConcreteConversion) where {D<:Space,R<:Space,T}
+    ConcreteConversion{D,R,T}(strictconvert(D,C.domainspace), strictconvert(R, C.rangetype))
+end
+
+function Operator{T}(C::ConcreteConversion) where {T}
+    ConcreteConversion(T, C.domainspace,C.rangespace)::Operator{T}
 end
 
 domainspace(C::ConcreteConversion)=C.domainspace
@@ -126,15 +126,14 @@ Conversion(A::Space,B::Space,C::Space,D::Space...) =
 
 ==(A::ConversionWrapper,B::ConversionWrapper) = A.op==B.op
 
-
-function convert(::Type{Operator{T}},D::ConversionWrapper) where T
-    if T==eltype(D)
-        D
-    else
-        BO=strictconvert(Operator{T},D.op)
-        d, r = domainspace(D), rangespace(D)
-        ConversionWrapper(d, r, BO)::Operator{T}
-    end
+function ConversionWrapper{D,R,T,O}(C::ConcreteConversion) where {D<:Space,R<:Space,T,O<:Operator{T}}
+    ConversionWrapper{D,R,T,O}(strictconvert(D,C.domainspace), strictconvert(R,C.rangespace),
+        strictconvert(O, C.op))
+end
+function Operator{T}(D::ConversionWrapper) where T
+    BO=strictconvert(Operator{T},D.op)
+    d, r = domainspace(D), rangespace(D)
+    ConversionWrapper(d, r, BO)::Operator{T}
 end
 
 convert(::Type{T}, C::ConversionWrapper) where {T<:Number} = strictconvert(T, C.op)

src/Operators/banded/Multiplication.jl

@@ -51,13 +51,11 @@ Multiplication(c::Number) = Multiplication(Fun(c) )
 # This covers right multiplication unless otherwise specified.
 Multiplication(S::Space,f::Fun) = Multiplication(f,S)
 
-
-function convert(::Type{Operator{T}},C::ConcreteMultiplication{S,V}) where {S,V,T}
-    if T==eltype(C)
-        C
-    else
-        ConcreteMultiplication{S,V,T}(Fun{S,T}(C.f),C.space)
-    end
+function ConcreteMultiplication{D,S,T}(C::ConcreteMultiplication) where {D<:Space,S<:Space,T}
+    ConcreteMultiplication{D,S,T}(strictconvert(VFun{D,T}, C.f), strictconvert(S, C.space))
+end
+function Operator{T}(C::ConcreteMultiplication{S,V}) where {S,V,T}
+    ConcreteMultiplication{S,V,T}(Fun{S,T}(C.f),C.space)
 end
 
 domainspace(M::ConcreteMultiplication{D,S,T}) where {D,S,T} = M.space
@@ -113,12 +111,11 @@ domainspace(M::MultiplicationWrapper) = M.space
 
 @wrapper MultiplicationWrapper false
 
-function convert(::Type{Operator{TT}},C::MultiplicationWrapper{S,V,O,T}) where {TT,S,V,O,T}
-    if TT==T
-        C
-    else
-        MultiplicationWrapper(Fun{S,TT}(C.f),Operator{TT}(C.op), C.space)::Operator{TT}
-    end
+function MultiplicationWrapper{D,S,T,O}(M::MultiplicationWrapper) where {D<:Space,S<:Space,T,O<:Operator{T}}
+    MultiplicationWrapper{D,S,T,O}(strictconvert(VFun{D,T}, M.f), strictconvert(O, M.op), strictconvert(S, M.space))
+end
+function Operator{TT}(C::MultiplicationWrapper{S}) where {TT,S}
+    MultiplicationWrapper(Fun{S,TT}(C.f),Operator{TT}(C.op), C.space)::Operator{TT}
 end
 
 

src/Operators/banded/PermutationOperator.jl

@@ -1,6 +1,6 @@
 # Creates a operator that permutes rows, in blocks of size
 # length(perm)
-struct PermutationOperator{T,DS,RS} <: Operator{T}
+struct PermutationOperator{T,DS<:Space,RS<:Space} <: Operator{T}
     perm::Vector{Int}
     domainspace::DS
     rangespace::RS
@@ -13,8 +13,10 @@ PermutationOperator(prm) = PermutationOperator(prm, ℓ⁰, ℓ⁰)
 domainspace(P::PermutationOperator) = P.domainspace
 rangespace(P::PermutationOperator) = P.rangespace
 
-
-convert(::Type{Operator{T}},P::PermutationOperator) where {T} =
+function PermutationOperator{T,DS,RS}(P::PermutationOperator) where {T,DS<:Space,RS<:Space}
+    PermutationOperator{T,DS,RS}(P.perm, strictconvert(DS, V.domainspace), strictconvert(RS, V.rangespace))
+end
+Operator{T}(P::PermutationOperator) where {T} =
     PermutationOperator{T}(P.perm, P.domainspace, P.rangespace)
 
 function bandwidths(P::PermutationOperator)
@@ -39,7 +41,7 @@ perm(a::Vector,b::Vector) = multiplyperm(invperm(sortperm(b)),sortperm(a))
 perm(a::Tuple,b::Tuple) = perm(collect(a),collect(b))
 
 
-struct NegateEven{T,DS,RS} <: Operator{T}
+struct NegateEven{T,DS<:Space,RS<:Space} <: Operator{T}
     domainspace::DS
     rangespace::RS
 end
@@ -52,7 +54,10 @@ NegateEven() = NegateEven(ℓ⁰,ℓ⁰)
 domainspace(P::NegateEven) = P.domainspace
 rangespace(P::NegateEven) = P.rangespace
 
-convert(::Type{Operator{T}},P::NegateEven) where {T} =
+function NegateEven{T,DS,RS}(N::NegateEven) where {T,DS<:Space,RS<:Space}
+    NegateEven{T,DS,RS}(strictconvert(DS, N.domainspace), strictconvert(RS, N.rangespace))
+end
+Operator{T}(P::NegateEven) where {T} =
     NegateEven{T}(P.domainspace, P.rangespace)
 
 bandwidths(P::NegateEven) = (0,0)

src/Operators/banded/Reverse.jl

@@ -10,8 +10,10 @@ for TYP in (:ReverseOrientation,:Reverse)
         end
 
         $WRAP(op::Operator) = $WRAP{typeof(op),eltype(op)}(op)
-        convert(::Type{Operator{T}},op::$TYP) where {T} = $TYP{T}()
-        convert(::Type{Operator{T}},op::$WRAP) where {T} = $WRAP(Operator{T}(op.op))::Operator{T}
+        $TYP{T}(op::$TYP) where {T} = $TYP{T}()
+        Operator{T}(op::$TYP) where {T} = $TYP{T}()
+        $WRAP{OS,T}(op::$WRAP) where {OS,T} = $WRAP{OS,T}(strictconvert(OS,op))
+        Operator{T}(op::$WRAP) where {T} = $WRAP(Operator{T}(op.op))::Operator{T}
 
         @wrapper $WRAP
     end