Skip to content

Commit

Permalink
Remove pre-0.6 stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
dpsanders committed Jun 18, 2017
1 parent 75b6665 commit 9994e97
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 33 deletions.
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ makedocs(
deploydocs(
repo = "github.com/JuliaIntervals/IntervalArithmetic.jl.git",
target = "build",
julia = "0.5",
julia = "0.6",
osname = "linux",
deps = nothing,
make = nothing
Expand Down
7 changes: 2 additions & 5 deletions src/intervals/arithmetic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,13 @@ end

//(a::Interval, b::Interval) = a / b # to deal with rationals

if VERSION >= v"0.6.0-dev.1024"
const filter = Iterators.filter
end

function min_ignore_nans(args...)
min(filter(x->!isnan(x), args)...)
min(Iterators.filter(x->!isnan(x), args)...)
end

function max_ignore_nans(args...)
max(filter(x->!isnan(x), args)...)
max(Iterators.filter(x->!isnan(x), args)...)
end


Expand Down
25 changes: 6 additions & 19 deletions src/multidim/intervalbox.jl
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
# This file is part of the IntervalArithmetic.jl package; MIT licensed

if VERSION >= v"0.6.0-dev"

doc"""An `IntervalBox` is an $N$-dimensional rectangular box, given
by a Cartesian product of $N$ `Interval`s.
"""
struct IntervalBox{N,T} <: StaticVector{N, Interval{T}}
data::NTuple{N,Interval{T}}
end

else
doc"""An `IntervalBox` is an $N$-dimensional rectangular box, given
by a Cartesian product of $N$ `Interval`s.
"""
struct IntervalBox{N,T} <: StaticVector{Interval{T}}
data::NTuple{N,Interval{T}}
end

doc"""An `IntervalBox` is an $N$-dimensional rectangular box, given
by a Cartesian product of $N$ `Interval`s.
"""
struct IntervalBox{N,T} <: StaticVector{N, Interval{T}}
data::NTuple{N,Interval{T}}
end

# IntervalBox{N,T}(x::NTuple{N,Interval{T}}) = IntervalBox{N,T}(x)

StaticArrays.Size{N,T}(::Type{IntervalBox{N,T}}) = StaticArrays.Size(N) # @pure not needed, I think...
# StaticArrays.Size{N,T}(::Type{IntervalBox{N,T}}) = StaticArrays.Size(N) # @pure not needed, I think...
Base.getindex(a::IntervalBox, i::Int) = a.data[i]


Expand Down
6 changes: 2 additions & 4 deletions test/interval_tests/intervals.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ include("hyperbolic.jl")
include("non_BigFloat.jl")
include("linear_algebra.jl")
include("loops.jl")
# include("complex.jl")
include("parsing.jl")
include("rounding_macros.jl")
include("rounding.jl")

if VERSION >= v"0.6.0-dev.1671" # PR https://github.com/JuliaLang/julia/pull/17057 fixing issue #265
include("rounding.jl")
end
# include("complex.jl")
4 changes: 0 additions & 4 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@ include("display_tests/display.jl")
include("ITF1788_tests/ITF1788_tests.jl")

include("multidim_tests/multidim.jl")

if VERSION >= v"0.6.0-dev.1671" # PR https://github.com/JuliaLang/julia/pull/17057 fixing issue #265
include("interval_tests/rounding.jl")
end

0 comments on commit 9994e97

Please sign in to comment.