Homogenize use of Base functions (#445)

Author: jishnub

src/ApproxFunBase.jl

@@ -25,7 +25,7 @@ import Base: values, convert, getindex, setindex!, *, +, -, ==, <, <=, >, |, !,
               setdiff, isless, union, angle, join, isnan, isapprox, isempty,
               sort, merge, minimum, maximum, extrema, argmax,
               argmin, findmax, findmin, isfinite,
-              zeros, zero, one, promote_rule, repeat, length, resize!, isinf,
+              zeros, zero, one, promote_rule, repeat, length, resize!, reshape, isinf,
               getproperty, findfirst, unsafe_getindex, fld, div,
               eachindex, firstindex, lastindex, isreal,
               OneTo, Array, Vector, Matrix, view, ones, @propagate_inbounds,

src/Multivariate/ProductFun.jl

@@ -41,9 +41,9 @@ ProductFun(cfs::Vector{VFun{S,T}},sp::AbstractProductSpace{Tuple{W,V},DD}) where
          W<:UnivariateSpace,T<:Number,DD} =
    ProductFun{W,V,typeof(sp),T}(VFun{W,T}[Fun(cfs[k],columnspace(sp,k)) for k=1:length(cfs)],sp)
 
-Base.size(f::ProductFun,k::Integer) =
+size(f::ProductFun,k::Integer) =
     k==1 ? mapreduce(ncoefficients,max,f.coefficients) : length(f.coefficients)
-Base.size(f::ProductFun) = (size(f,1),size(f,2))
+size(f::ProductFun) = (size(f,1),size(f,2))
 
 ## Construction in an AbstractProductSpace via a Matrix of coefficients
 

src/Multivariate/TensorSpace.jl

@@ -382,10 +382,10 @@ components(sp::TensorSpace{Tuple{S1,S2}}) where {S1<:Space{D,R},S2} where {D,R<:
 components(sp::TensorSpace{Tuple{S1,S2}}) where {S1,S2<:Space{D,R}} where {D,R<:AbstractArray} =
     [sp.spaces[1] ⊗ s for s in components(sp.spaces[2])]
 
-Base.size(sp::TensorSpace{Tuple{S1,S2}}) where {S1<:Space{D,R},S2} where {D,R<:AbstractArray} =
+size(sp::TensorSpace{Tuple{S1,S2}}) where {S1<:Space{D,R},S2} where {D,R<:AbstractArray} =
     size(sp.spaces[1])
 
-Base.size(sp::TensorSpace{Tuple{S1,S2}}) where {S1,S2<:Space{D,R}} where {D,R<:AbstractArray} =
+size(sp::TensorSpace{Tuple{S1,S2}}) where {S1,S2<:Space{D,R}} where {D,R<:AbstractArray} =
     size(sp.spaces[2])
 
 # TODO: Generalize to higher dimensions

src/Operators/Operator.jl

@@ -110,9 +110,9 @@ blocksize(A::Operator,k) = k==1 ? length(blocklengths(rangespace(A))) : length(b
 blocksize(A::Operator) = (blocksize(A,1),blocksize(A,2))
 
 
-Base.size(A::Operator) = (size(A,1),size(A,2))
-Base.size(A::Operator,k::Integer) = k==1 ? dimension(rangespace(A)) : dimension(domainspace(A))
-Base.length(A::Operator) = size(A,1) * size(A,2)
+size(A::Operator) = (size(A,1),size(A,2))
+size(A::Operator,k::Integer) = k==1 ? dimension(rangespace(A)) : dimension(domainspace(A))
+length(A::Operator) = size(A,1) * size(A,2)
 
 
 # used to compute "end" for last index

src/Operators/almostbanded/LowRankOperator.jl

@@ -51,7 +51,7 @@ rangespace(L::LowRankOperator) = space(first(L.U))
 promoterangespace(L::LowRankOperator,sp::Space) = LowRankOperator(map(u->Fun(u,sp),L.U),L.V)
 promotedomainspace(L::LowRankOperator,sp::Space) = LowRankOperator(L.U,map(v->promotedomainspace(v,sp),L.V))
 
-function Base.getindex(L::LowRankOperator, k::Integer,j::Integer)
+function getindex(L::LowRankOperator, k::Integer,j::Integer)
     ret=zero(eltype(L))
     for (p, LUp) in enumerate(L.U)
         if k ≤ ncoefficients(LUp)

src/Operators/banded/ConstantOperator.jl

@@ -94,8 +94,8 @@ domainspace(B::BasisFunctional) = B.space
 
 convert(::Type{Operator{T}},B::BasisFunctional) where {T} = BasisFunctional{T,typeof(B.space)}(B.k,B.space)
 
-Base.getindex(op::BasisFunctional{T},k::Integer) where {T} = (k==op.k) ? one(T) : zero(T)
-Base.getindex(op::BasisFunctional{T},k::AbstractRange) where {T} = strictconvert(Vector{T},k.==op.k)
+getindex(op::BasisFunctional{T},k::Integer) where {T} = (k==op.k) ? one(T) : zero(T)
+getindex(op::BasisFunctional{T},k::AbstractRange) where {T} = strictconvert(Vector{T},k.==op.k)
 
 struct FillFunctional{T} <: Operator{T}
     λ::T
@@ -105,8 +105,8 @@ end
 
 domainspace(B::FillFunctional) = ℓ⁰
 
-Base.getindex(op::FillFunctional,k::Integer)=op.λ
-Base.getindex(op::FillFunctional,k::AbstractRange)=fill(op.λ,length(k))
+getindex(op::FillFunctional,k::Integer)=op.λ
+getindex(op::FillFunctional,k::AbstractRange)=fill(op.λ,length(k))
 
 ## Zero is a special operator: it makes sense on all spaces, and between all spaces
 

src/Operators/banded/ToeplitzOperator.jl

@@ -75,7 +75,7 @@ bandwidths(T::ToeplitzOperator)=(length(T.negative),length(T.nonnegative)-1)
 
 # slice of a ToeplitzOPerator is a ToeplitzOperator
 
-function Base.getindex(T::ToeplitzOperator,kr::InfRanges,jr::InfRanges)
+function getindex(T::ToeplitzOperator,kr::InfRanges,jr::InfRanges)
     sh=first(jr)-first(kr)
     st=step(jr)
     @assert st==step(kr)

src/Operators/general/CachedOperator.jl

@@ -73,7 +73,7 @@ blockbandwidths(C::CachedOperator{T,BM,M}) where {T<:Number,BM<:BandedMatrix,M<:
 @wrapperstructure CachedOperator
 
 
-@propagate_inbounds function Base.getindex(B::CachedOperator,k::Integer,j::Integer)
+@propagate_inbounds function getindex(B::CachedOperator,k::Integer,j::Integer)
     resizedata!(B,k,j)
     if k ≤ size(B.data,1) && j ≤ size(B.data,2)
         B.data[k,j]
@@ -82,7 +82,7 @@ blockbandwidths(C::CachedOperator{T,BM,M}) where {T<:Number,BM<:BandedMatrix,M<:
     end
 end
 
-function Base.getindex(B::CachedOperator,k::AbstractRange,j::AbstractRange)
+function getindex(B::CachedOperator,k::AbstractRange,j::AbstractRange)
     if !isempty(k) && !isempty(j)
         resizedata!(B,maximum(k),maximum(j))
         B.data[k,j]
@@ -91,7 +91,7 @@ function Base.getindex(B::CachedOperator,k::AbstractRange,j::AbstractRange)
     end
 end
 
-function Base.getindex(B::CachedOperator,k::Integer)
+function getindex(B::CachedOperator,k::Integer)
     if size(B,1)==1
         B[1,k]
     elseif size(B,2)==1
@@ -101,12 +101,12 @@ function Base.getindex(B::CachedOperator,k::Integer)
     end
 end
 
-@propagate_inbounds function Base.setindex!(B::CachedOperator,v,k,j)
+@propagate_inbounds function setindex!(B::CachedOperator,v,k,j)
     resizedata!(B,k,j)
     B.data[k,j] = v
 end
 
-@propagate_inbounds function Base.setindex!(B::CachedOperator,v,k::Integer)
+@propagate_inbounds function setindex!(B::CachedOperator,v,k::Integer)
     if size(B,1)==1
         B[1,k] = v
     elseif size(B,2)==1

src/PDE/KroneckerOperator.jl

@@ -425,18 +425,18 @@ function mul_coefficients(A::SubOperator{T,KKO,NTuple{2,UnitRange{Int}}}, b) whe
     M*pad(b, size(M,2))
 end
 
-Base.getindex(A::KroneckerOperator, B::MultivariateFun) = A[Fun(B)]
-function Base.getindex(K::KroneckerOperator, f::LowRankFun)
+getindex(A::KroneckerOperator, B::MultivariateFun) = A[Fun(B)]
+function getindex(K::KroneckerOperator, f::LowRankFun)
     op1, op2 = K.ops
     sum(zip(f.A, f.B)) do (A,B)
         op1[A] ⊗ op2[B]
     end
 end
-Base.getindex(K::KroneckerOperator, B::ProductFun) = K[LowRankFun(B)]
+getindex(K::KroneckerOperator, B::ProductFun) = K[LowRankFun(B)]
 
 for F in [:MultivariateFun, :ProductFun, :LowRankFun]
     for O in WrapperList
-        @eval Base.getindex(K::$O{<:KroneckerOperator}, f::$F) = K.op[f]
+        @eval getindex(K::$O{<:KroneckerOperator}, f::$F) = K.op[f]
         @eval (*)(A::$O{<:KroneckerOperator}, B::$F) = A.op * B
         @eval (*)(A::$F, B::$O{<:KroneckerOperator}) = A * B.op
     end

src/Spaces/ArraySpace.jl

@@ -58,7 +58,7 @@ getindex(f::ArraySpace,k...) = Space(component(f,k...))
 iterate(f::Fun{<:ArraySpace}) = iterate(components(f))
 
 
-Base.reshape(AS::ArraySpace,k...) = ArraySpace(reshape(AS.spaces,k...))
+reshape(AS::ArraySpace,k...) = ArraySpace(reshape(AS.spaces,k...))
 dimension(AS::ArraySpace) = mapreduce(dimension,+,AS.spaces,init=0)
 
 # TODO: union domain
@@ -112,14 +112,14 @@ repeat(A::ArraySpace,n,m) = ArraySpace(repeat(A.spaces,n,m))
 
 component(A::MatrixSpace,k::Integer,j::Integer) = A.spaces[k,j]
 
-Base.getindex(f::Fun{DSS},k::Integer) where {DSS<:ArraySpace} = component(f,k)
+getindex(f::Fun{DSS},k::Integer) where {DSS<:ArraySpace} = component(f,k)
 
 
-Base.getindex(f::Fun{<:MatrixSpace},k::Integer,j::Integer) =
+getindex(f::Fun{<:MatrixSpace},k::Integer,j::Integer) =
     f[k+stride(f,2)*(j-1)]
 
-Base.getindex(f::Fun{DSS},kj::CartesianIndex{1}) where {DSS<:ArraySpace} = f[kj[1]]
-Base.getindex(f::Fun{DSS},kj::CartesianIndex{2}) where {DSS<:ArraySpace} = f[kj[1],kj[2]]
+getindex(f::Fun{DSS},kj::CartesianIndex{1}) where {DSS<:ArraySpace} = f[kj[1]]
+getindex(f::Fun{DSS},kj::CartesianIndex{2}) where {DSS<:ArraySpace} = f[kj[1],kj[2]]
 
 
 function Fun(A::AbstractMatrix{<:Fun{<:VectorSpace{S},V,VV}}) where {S,V,VV}
@@ -189,7 +189,7 @@ function choosedomainspace(A::VectorInterlaceOperator, sp::ArraySpace)
 end
 
 
-Base.reshape(f::Fun{AS},k...) where {AS<:ArraySpace} = Fun(reshape(space(f),k...),f.coefficients)
+reshape(f::Fun{AS},k...) where {AS<:ArraySpace} = Fun(reshape(space(f),k...),f.coefficients)
 
 Base.diff(f::Fun{AS,T},n...) where {AS<:ArraySpace,T} = Fun(diff(Array(f),n...))