Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #138 from JuliaDiffEq/fbot/deps
Browse files Browse the repository at this point in the history
Fix deprecations
  • Loading branch information
ChrisRackauckas authored Aug 8, 2017
2 parents ec52c94 + be93a52 commit 45509da
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/runge_kutta.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
###########################################

immutable TableauRKExplicit{Name, S, T} <: Tableau{Name, S, T}
order::(@compat(Tuple{Vararg{Int}})) # the order of the methods
order::(Tuple{Vararg{Int}}) # the order of the methods
a::Matrix{T}
# one or several row vectors. First row is used for the step,
# second for error calc.
Expand All @@ -29,11 +29,11 @@ immutable TableauRKExplicit{Name, S, T} <: Tableau{Name, S, T}
new{Name, S, T}(order,a,b,c)
end
end
function TableauRKExplicit{T}(name::Symbol, order::(@compat(Tuple{Vararg{Int}})),
function TableauRKExplicit{T}(name::Symbol, order::(Tuple{Vararg{Int}}),
a::Matrix{T}, b::Matrix{T}, c::Vector{T})
TableauRKExplicit{name,length(c),T}(order, a, b, c)
end
function TableauRKExplicit(name::Symbol, order::(@compat(Tuple{Vararg{Int}})), T::Type,
function TableauRKExplicit(name::Symbol, order::(Tuple{Vararg{Int}}), T::Type,
a::Matrix, b::Matrix, c::Vector)
TableauRKExplicit{name,length(c),T}(order, convert(Matrix{T},a),
convert(Matrix{T},b), convert(Vector{T},c) )
Expand Down
9 changes: 1 addition & 8 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,7 @@ solvers = [
# adaptive
ODE.ode23s]

# Because of https://github.com/JuliaLang/julia/issues/16667
# which was fixed for BigFloat in https://github.com/JuliaLang/julia/pull/16999
# but not back-ported to Julia 0.4
if VERSION<=v"0.5-"
dtypes = [Float32, Float64]
else
dtypes = [Float32, Float64, BigFloat]
end
dtypes = [Float32, Float64, BigFloat]
for solver in solvers
println("using $solver")
for (tol,T) in zip(tols, dtypes)
Expand Down

0 comments on commit 45509da

Please sign in to comment.