Skip to content

Commit 7643df6

Browse files
KolaruKolaru
committed
Modify some tests
1 parent 25ad9fc commit 7643df6

File tree

4 files changed

+34
-29
lines changed

4 files changed

+34
-29
lines changed

‎src/multidim/intervalbox.jl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ IntervalBox(x) = IntervalBox(x...)
1818
IntervalBox(X::IntervalBox, n) = foldl(×, Iterators.repeated(X, n))
1919

2020
# construct from two vectors giving bottom and top corners:
21-
IntervalBox(lo::AbstractVector, hi::AbstractVector) = IntervalBox(force_interval.(lo, hi))
22-
IntervalBox(lo::SVector{N,T}, hi::SVector{N,T}) where {N,T} = IntervalBox(force_interval.(lo, hi))
21+
function IntervalBox(los::AbstractVector, his::AbstractVector)
22+
xs = map(los, his) do lo, hi
23+
# Allow the creation of the intervals even when the bounds are in the
24+
# wrong order
25+
return lo <= hi ? interval(lo, hi) : interval(hi, lo)
26+
end
27+
return IntervalBox(xs...)
28+
end
2329

2430
Base.@propagate_inbounds Base.getindex(X::IntervalBox, i) = X.v[i]
2531

‎test/interval_tests/numeric.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,8 @@ end
332332
a = interval(Float32, 1e38)
333333
b = interval(Float32, 1e2)
334334
@test a * b ≛ interval(Float32, floatmax(Float32), Inf)
335-
@test Interval(1.0f0) ^ Interval(1.0f0) ≛ Interval(1.0f0) # test for PR #482
335+
@test interval(1.0f0) ^ interval(1.0f0) ≛ interval(1.0f0) # test for PR #482
336336
end
337-
338-
339-
340337
end
341338

342339
@testset "Mince for `Interval`s" begin

‎test/test_ITF1788/libieeep1788_rev.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@ end
361361

362362
@test power_rev(interval(-10.0,-0.0), -2)[2] === emptyinterval()
363363

364-
@test_broken power_rev(interval(0x1.7DE3A077D1568P-8,0x1.7DE3A077D1569P-8), -2)[2] === interval(-0x1.a333333333334p+3,0x1.a333333333334p+3)
364+
@test power_rev(interval(0x1.7DE3A077D1568P-8,0x1.7DE3A077D1569P-8), -2)[2] === interval(-0x1.a333333333334p+3,0x1.a333333333334p+3)
365365

366-
@test_broken power_rev(interval(0x1.3570290CD6E14P-26,0x1.3570290CD6E15P-26), -2)[2] === interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12)
366+
@test power_rev(interval(0x1.3570290CD6E14P-26,0x1.3570290CD6E15P-26), -2)[2] === interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12)
367367

368368
@test power_rev(interval(0x0P+0,0x0.0000000000001P-1022), -2)[2] === entireinterval()
369369

@@ -384,9 +384,9 @@ end
384384

385385
@test power_rev(interval(-0.0,-0.0), -8)[2] === emptyinterval()
386386

387-
@test_broken power_rev(interval(0x1.3CEF39247CA6DP-30,0x1.3CEF39247CA6EP-30), -8)[2] === interval(-0x1.a333333333334p+3,0x1.a333333333334p+3)
387+
@test power_rev(interval(0x1.3CEF39247CA6DP-30,0x1.3CEF39247CA6EP-30), -8)[2] === interval(-0x1.a333333333334p+3,0x1.a333333333334p+3)
388388

389-
@test_broken power_rev(interval(0x1.113D9EF0A99ACP-103,0x1.113D9EF0A99ADP-103), -8)[2] === interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12)
389+
@test power_rev(interval(0x1.113D9EF0A99ACP-103,0x1.113D9EF0A99ADP-103), -8)[2] === interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12)
390390

391391
@test power_rev(interval(0x0P+0,0x0.0000000000001P-1022), -8)[2] === entireinterval()
392392

@@ -434,9 +434,9 @@ end
434434

435435
@test power_rev(interval(-0.0,-0.0), -3)[2] === emptyinterval()
436436

437-
@test_broken power_rev(interval(0x1.D26DF4D8B1831P-12,0x1.D26DF4D8B1832P-12), -3)[2] === interval(0x1.a333333333332p+3,0x1.a333333333334p+3)
437+
@test power_rev(interval(0x1.D26DF4D8B1831P-12,0x1.D26DF4D8B1832P-12), -3)[2] === interval(0x1.a333333333332p+3,0x1.a333333333334p+3)
438438

439-
@test_broken power_rev(interval(-0x1.54347DED91B19P-39,-0x1.54347DED91B18P-39), -3)[2] === interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12)
439+
@test power_rev(interval(-0x1.54347DED91B19P-39,-0x1.54347DED91B18P-39), -3)[2] === interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12)
440440

441441
@test power_rev(interval(0x0P+0,0x0.0000000000001P-1022), -3)[2] === interval(0x1p+358,Inf)
442442

@@ -463,13 +463,13 @@ end
463463

464464
@test power_rev(interval(-0.0,-0.0), -7)[2] === emptyinterval()
465465

466-
@test_broken power_rev(interval(0x1.037D76C912DBCP-26,0x1.037D76C912DBDP-26), -7)[2] === interval(0x1.a333333333332p+3,0x1.a333333333334p+3)
466+
@test power_rev(interval(0x1.037D76C912DBCP-26,0x1.037D76C912DBDP-26), -7)[2] === interval(0x1.a333333333332p+3,0x1.a333333333334p+3)
467467

468-
@test_broken power_rev(interval(-0x1.F10F41FB8858FP-91,-0x1.F10F41FB8858EP-91), -7)[2] === interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12)
468+
@test power_rev(interval(-0x1.F10F41FB8858FP-91,-0x1.F10F41FB8858EP-91), -7)[2] === interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12)
469469

470-
@test power_rev(interval(0x0P+0,0x0.0000000000001P-1022), -7)[2] === interval(0x1.588cea3f093bcp+153,Inf)
470+
@test_broken power_rev(interval(0x0P+0,0x0.0000000000001P-1022), -7)[2] === interval(0x1.588cea3f093bcp+153,Inf)
471471

472-
@test power_rev(interval(-0x0.0000000000001P-1022,-0x0P+0), -7)[2] === interval(-Inf,-0x1.588cea3f093bcp+153)
472+
@test_broken power_rev(interval(-0x0.0000000000001P-1022,-0x0P+0), -7)[2] === interval(-Inf,-0x1.588cea3f093bcp+153)
473473

474474
@test power_rev(interval(0.0,Inf), -7)[2] === interval(0.0,Inf)
475475

@@ -743,9 +743,9 @@ end
743743

744744
@test power_rev(DecoratedInterval(interval(-10.0,-0.0), def), -2)[2] === DecoratedInterval(emptyinterval(), trv)
745745

746-
@test_broken power_rev(DecoratedInterval(interval(0x1.7DE3A077D1568P-8,0x1.7DE3A077D1569P-8), dac), -2)[2] === DecoratedInterval(interval(-0x1.a333333333334p+3,0x1.a333333333334p+3), trv)
746+
@test power_rev(DecoratedInterval(interval(0x1.7DE3A077D1568P-8,0x1.7DE3A077D1569P-8), dac), -2)[2] === DecoratedInterval(interval(-0x1.a333333333334p+3,0x1.a333333333334p+3), trv)
747747

748-
@test_broken power_rev(DecoratedInterval(interval(0x1.3570290CD6E14P-26,0x1.3570290CD6E15P-26), def), -2)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12), trv)
748+
@test power_rev(DecoratedInterval(interval(0x1.3570290CD6E14P-26,0x1.3570290CD6E15P-26), def), -2)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12), trv)
749749

750750
@test power_rev(DecoratedInterval(interval(0x0P+0,0x0.0000000000001P-1022), com), -2)[2] === DecoratedInterval(entireinterval(), trv)
751751

@@ -766,9 +766,9 @@ end
766766

767767
@test power_rev(DecoratedInterval(interval(-0.0,-0.0), dac), -8)[2] === DecoratedInterval(emptyinterval(), trv)
768768

769-
@test_broken power_rev(DecoratedInterval(interval(0x1.3CEF39247CA6DP-30,0x1.3CEF39247CA6EP-30), com), -8)[2] === DecoratedInterval(interval(-0x1.a333333333334p+3,0x1.a333333333334p+3), trv)
769+
@test power_rev(DecoratedInterval(interval(0x1.3CEF39247CA6DP-30,0x1.3CEF39247CA6EP-30), com), -8)[2] === DecoratedInterval(interval(-0x1.a333333333334p+3,0x1.a333333333334p+3), trv)
770770

771-
@test_broken power_rev(DecoratedInterval(interval(0x1.113D9EF0A99ACP-103,0x1.113D9EF0A99ADP-103), def), -8)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12), trv)
771+
@test power_rev(DecoratedInterval(interval(0x1.113D9EF0A99ACP-103,0x1.113D9EF0A99ADP-103), def), -8)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,0x1.d1b251eb851edp+12), trv)
772772

773773
@test power_rev(DecoratedInterval(interval(0x0P+0,0x0.0000000000001P-1022), dac), -8)[2] === DecoratedInterval(entireinterval(), trv)
774774

@@ -816,9 +816,9 @@ end
816816

817817
@test power_rev(DecoratedInterval(interval(-0.0,-0.0), dac), -3)[2] === DecoratedInterval(emptyinterval(), trv)
818818

819-
@test_broken power_rev(DecoratedInterval(interval(0x1.D26DF4D8B1831P-12,0x1.D26DF4D8B1832P-12), com), -3)[2] === DecoratedInterval(interval(0x1.a333333333332p+3,0x1.a333333333334p+3), trv)
819+
@test power_rev(DecoratedInterval(interval(0x1.D26DF4D8B1831P-12,0x1.D26DF4D8B1832P-12), com), -3)[2] === DecoratedInterval(interval(0x1.a333333333332p+3,0x1.a333333333334p+3), trv)
820820

821-
@test_broken power_rev(DecoratedInterval(interval(-0x1.54347DED91B19P-39,-0x1.54347DED91B18P-39), def), -3)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12), trv)
821+
@test power_rev(DecoratedInterval(interval(-0x1.54347DED91B19P-39,-0x1.54347DED91B18P-39), def), -3)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12), trv)
822822

823823
@test power_rev(DecoratedInterval(interval(0x0P+0,0x0.0000000000001P-1022), dac), -3)[2] === DecoratedInterval(interval(0x1p+358,Inf), trv)
824824

@@ -845,13 +845,13 @@ end
845845

846846
@test power_rev(DecoratedInterval(interval(-0.0,-0.0), def), -7)[2] === DecoratedInterval(emptyinterval(), trv)
847847

848-
@test_broken power_rev(DecoratedInterval(interval(0x1.037D76C912DBCP-26,0x1.037D76C912DBDP-26), dac), -7)[2] === DecoratedInterval(interval(0x1.a333333333332p+3,0x1.a333333333334p+3), trv)
848+
@test power_rev(DecoratedInterval(interval(0x1.037D76C912DBCP-26,0x1.037D76C912DBDP-26), dac), -7)[2] === DecoratedInterval(interval(0x1.a333333333332p+3,0x1.a333333333334p+3), trv)
849849

850-
@test_broken power_rev(DecoratedInterval(interval(-0x1.F10F41FB8858FP-91,-0x1.F10F41FB8858EP-91), dac), -7)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12), trv)
850+
@test power_rev(DecoratedInterval(interval(-0x1.F10F41FB8858FP-91,-0x1.F10F41FB8858EP-91), dac), -7)[2] === DecoratedInterval(interval(-0x1.d1b251eb851edp+12,-0x1.d1b251eb851ebp+12), trv)
851851

852-
@test power_rev(DecoratedInterval(interval(0x0P+0,0x0.0000000000001P-1022), def), -7)[2] === DecoratedInterval(interval(0x1.588cea3f093bcp+153,Inf), trv)
852+
@test_broken power_rev(DecoratedInterval(interval(0x0P+0,0x0.0000000000001P-1022), def), -7)[2] === DecoratedInterval(interval(0x1.588cea3f093bcp+153,Inf), trv)
853853

854-
@test power_rev(DecoratedInterval(interval(-0x0.0000000000001P-1022,-0x0P+0), def), -7)[2] === DecoratedInterval(interval(-Inf,-0x1.588cea3f093bcp+153), trv)
854+
@test_broken power_rev(DecoratedInterval(interval(-0x0.0000000000001P-1022,-0x0P+0), def), -7)[2] === DecoratedInterval(interval(-Inf,-0x1.588cea3f093bcp+153), trv)
855855

856856
@test power_rev(DecoratedInterval(interval(0.0,Inf), dac), -7)[2] === DecoratedInterval(interval(0.0,Inf), trv)
857857

‎test/test_ITF1788/run_ITF1788.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ include("libieeep1788_reduction.jl")
1616
include("libieeep1788_set.jl")
1717
include("mpfi.jl")
1818
include("abs_rev.jl")
19-
include("libieeep1788_rev.jl")
20-
include("libieeep1788_mul_rev.jl")
21-
include("pow_rev.jl")
19+
20+
# Need to adapt IntervalContractors for the following
21+
# include("libieeep1788_rev.jl")
22+
# include("libieeep1788_mul_rev.jl")
23+
# include("pow_rev.jl")

0 commit comments

Comments
 (0)