Skip to content

Fix deprecations #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2018
Merged

Fix deprecations #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/DirichletTriangle.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,0},KoornwinderTriang
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,0},KoornwinderTriangle},k::Integer) = 0

subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,0},KoornwinderTriangle}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,0},KoornwinderTriangle},k::Integer) = k==1? 0 : 1
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,0},KoornwinderTriangle},k::Integer) = k==1 ? 0 : 1


subblockbandinds(::ConcreteConversion{DirichletTriangle{0,0,1},KoornwinderTriangle}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,0,1},KoornwinderTriangle},k::Integer) = k==1? 0 : 1
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,0,1},KoornwinderTriangle},k::Integer) = k==1 ? 0 : 1

function getindex(R::ConcreteConversion{DirichletTriangle{1,0,0},KoornwinderTriangle},k::Integer,j::Integer)
T=eltype(R)
Expand Down Expand Up @@ -158,22 +158,22 @@ subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,1},DirichletTriangle

blockbandinds(::ConcreteConversion{DirichletTriangle{1,1,0},DirichletTriangle{1,0,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,0},DirichletTriangle{1,0,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,0},DirichletTriangle{1,0,0}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,0},DirichletTriangle{1,0,0}},k::Integer) = k==1 ? 0 : 1

blockbandinds(::ConcreteConversion{DirichletTriangle{1,0,1},DirichletTriangle{1,0,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,1},DirichletTriangle{1,0,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,1},DirichletTriangle{1,0,0}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,0,1},DirichletTriangle{1,0,0}},k::Integer) = k==1 ? 0 : 1


blockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,0,1}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,0,1}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,0,1}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,0,1}},k::Integer) = k==1 ? 0 : 1



blockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,1,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,1,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,1,0}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{0,1,1},DirichletTriangle{0,1,0}},k::Integer) = k==1 ? 0 : 1



Expand Down Expand Up @@ -387,12 +387,12 @@ subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle

blockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,0,1}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,0,1}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,0,1}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,0,1}},k::Integer) = k==1 ? 0 : 1


blockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,1,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,1,0}}) = (0,1)
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,1,0}},k::Integer) = k==1? 0 :1
subblockbandinds(::ConcreteConversion{DirichletTriangle{1,1,1},DirichletTriangle{1,1,0}},k::Integer) = k==1 ? 0 : 1



Expand Down
2 changes: 1 addition & 1 deletion src/DiskSpace.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function Base.real{JS,DD}(f::ProductFun{JS,Laurent{DD},DiskSpace{0,0,0,JS,Lauren
cfs=f.coefficients
n=length(cfs)

ret=Array(Fun{JS,Float64},iseven(n)?n+1:n)
ret=Array(Fun{JS,Float64},iseven(n) ? n+1 : n)
ret[1]=real(cfs[1])

for k=2:2:n
Expand Down
2 changes: 1 addition & 1 deletion src/JacobiSquare.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ end


plan_itransform(S::WeightedSquare,vals::Vector)=(points(S,length(vals)),plan_itransform(S.space,vals))
itransform(S::WeightedSquare,cfs::Vector,plan)=isempty(cfs)?cfs:plan[1].^S.m.*itransform(S.space,cfs,plan[2])
itransform(S::WeightedSquare,cfs::Vector,plan)=isempty(cfs) ? cfs : plan[1].^S.m.*itransform(S.space,cfs,plan[2])

evaluate(f::AbstractVector,sp::WeightedSquare,x)=x.^sp.m.*evaluate(f,sp.space,x.^2)

Expand Down
10 changes: 5 additions & 5 deletions src/Triangle.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ isbandedblockbanded(::ConcreteConversion{KoornwinderTriangle,KoornwinderTriangle
blockbandinds(C::ConcreteConversion{KoornwinderTriangle,KoornwinderTriangle}) = (0,1)

subblockbandinds(C::ConcreteConversion{KoornwinderTriangle,KoornwinderTriangle}) = (0,1)
subblockbandinds(C::ConcreteConversion{KoornwinderTriangle,KoornwinderTriangle},k::Integer) = k==1?0:1
subblockbandinds(C::ConcreteConversion{KoornwinderTriangle,KoornwinderTriangle},k::Integer) = k==1 ? 0 : 1



Expand Down Expand Up @@ -566,8 +566,8 @@ subblockbandinds(::Lowering{2,KoornwinderTriangle}) = (-1,0)
subblockbandinds(::Lowering{3,KoornwinderTriangle}) = (-1,0)

subblockbandinds(::Lowering{1,KoornwinderTriangle},k::Integer) = 0
subblockbandinds(::Lowering{2,KoornwinderTriangle},k::Integer) = k==1? -1 : 0
subblockbandinds(::Lowering{3,KoornwinderTriangle},k::Integer) = k==1? -1 : 0
subblockbandinds(::Lowering{2,KoornwinderTriangle},k::Integer) = k==1 ? -1 : 0
subblockbandinds(::Lowering{3,KoornwinderTriangle},k::Integer) = k==1 ? -1 : 0


rangespace(R::Lowering{1,KoornwinderTriangle}) =
Expand Down Expand Up @@ -803,7 +803,7 @@ spacescompatible(A::TriangleWeight,B::TriangleWeight) = A.α ≈ B.α && A.β
function conversion_rule(A::TriangleWeight,B::TriangleWeight)
if isapproxinteger(A.α-B.α) && isapproxinteger(A.β-B.β) && isapproxinteger(A.γ-B.γ)
ct=conversion_type(A.space,B.space)
ct==NoSpace()?NoSpace():TriangleWeight(max(A.α,B.α),max(A.β,B.β),max(A.γ,B.γ),ct)
ct==NoSpace() ? NoSpace() : TriangleWeight(max(A.α,B.α),max(A.β,B.β),max(A.γ,B.γ),ct)
else
NoSpace()
end
Expand Down Expand Up @@ -980,7 +980,7 @@ blockbandinds(::ConcreteDerivative{TriangleWeight{KoornwinderTriangle}}) = (-1,0
subblockbandinds(D::ConcreteDerivative{TriangleWeight{KoornwinderTriangle}}) =
(-1,0) #TODO: subblockbandinds (-1,-1) for Dy
subblockbandinds(D::ConcreteDerivative{TriangleWeight{KoornwinderTriangle}},k::Integer) =
k==1?-1:0 #TODO: subblockbandinds (-1,-1) for Dy
k==1 ? -1 : 0 #TODO: subblockbandinds (-1,-1) for Dy


function getindex{OT,T}(D::ConcreteDerivative{TriangleWeight{KoornwinderTriangle},OT,T},k::Integer,j::Integer)::T
Expand Down