Skip to content

Commit

Permalink
Get rid of warnings in the tests
Browse files Browse the repository at this point in the history 
... by using anonymous functions
  • Loading branch information
@lbenet
lbenet committed Apr 30, 2021
1 parent f2f6597 commit b4e9e16
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
10 changes: 5 additions & 5 deletions test/TM1.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ end
@testset "Tests for linear dominated bounder" begin
order = 3

f(x) = 1 + x^5 - x^4
f = x -> 1 + x^5 - x^4
D = 0.9375 .. 1
x0 = mid(D)
tm = TaylorModel1(order, x0, D)
Expand All @@ -482,7 +482,7 @@ end
@test diam(bound_ldb) <= diam(bound_interval)
@test bound_ldb ⊆ bound_naive_tm

f(x) = x^2 * sin(x)
f = x -> x^2 * sin(x)
D = -1.875 .. -1.25
x0 = mid(D)
tm = TaylorModel1(order, x0, D)
Expand All @@ -507,7 +507,7 @@ end
@testset "Tests for quadratic fast bounder" begin
order = 3

f(x) = 1 + x^5 - x^4
f = x -> 1 + x^5 - x^4
D = 0.75 .. 0.8125
x0 = mid(D)
tm = TaylorModel1(order, x0, D)
Expand All @@ -518,7 +518,7 @@ end
@test bound_qfb ⊆ bound_naive_tm
# @test diam(bound_qfb) <= diam(bound_ldb)

f(x) = x^2 * sin(x)
f = x -> x^2 * sin(x)
D = -2.5 .. -1.875
x0 = mid(D)
tm = TaylorModel1(order, x0, D)
Expand All @@ -529,7 +529,7 @@ end
@test bound_qfb ⊆ bound_naive_tm
@test diam(bound_qfb) <= diam(bound_ldb)

f(x) = x^3 * cos(x) + x
f = x -> x^3 * cos(x) + x
D = 3.75 .. 4.375
x0 = mid(D)
tm = TaylorModel1(order, x0, D)
Expand Down
34 changes: 17 additions & 17 deletions test/TMN.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
xm = TaylorModelN(1, _order, b0, ib0)
ym = TaylorModelN(2, _order, b0, ib0)

f(x, y) = cos(x)
∫fdx(x, y) = sin(x)
∫fdy(x, y) = cos(x) * y
f = (x, y) -> cos(x)
∫fdx = (x, y) -> sin(x)
∫fdy = (x, y) -> cos(x) * y
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)
∫fTdy = integrate(fT, :y)
Expand All @@ -274,9 +274,9 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
@test (∫fdy(xtest...) - ∫fdy(cy...)) ∈ ∫fTdy(aux)
end

f(x, y) = sin(x) * cos(y)
∫fdx(x, y) = -cos(x) * cos(y)
∫fdy(x, y) = sin(x) * sin(y)
f = (x, y) -> sin(x) * cos(y)
∫fdx = (x, y) -> -cos(x) * cos(y)
∫fdy = (x, y) -> sin(x) * sin(y)
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)
∫fTdy = integrate(fT, :y)
Expand All @@ -290,9 +290,9 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
@test (∫fdy(xtest...) - ∫fdy(cy...)) ∈ ∫fTdy(aux)
end

f(x, y) = exp(x)
∫fdx(x, y) = exp(x)
∫fdy(x, y) = exp(x) * y
f = (x, y) -> exp(x)
∫fdx = (x, y) -> exp(x)
∫fdy = (x, y) -> exp(x) * y
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)
∫fTdy = integrate(fT, :y)
Expand All @@ -306,9 +306,9 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
@test (∫fdy(xtest...) - ∫fdy(cy...)) ∈ ∫fTdy(aux)
end

f(x, y) = log(x) * x^2 + cos(x * y) + sin(x * y)
∫fdx(x, y) = (x^3 * y * (3log(x) - 1) + 9sin(x * y) - 9cos(x * y)) / 9y
∫fdy(x, y) = (x^3 * y * log(x) + sin(x * y) - cos(x * y)) / x
f = (x, y) -> log(x) * x^2 + cos(x * y) + sin(x * y)
∫fdx = (x, y) -> (x^3 * y * (3log(x) - 1) + 9sin(x * y) - 9cos(x * y)) / 9y
∫fdy = (x, y) -> (x^3 * y * log(x) + sin(x * y) - cos(x * y)) / x
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)
∫fTdy = integrate(fT, :y)
Expand All @@ -322,8 +322,8 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
@test (∫fdy(xtest...) - ∫fdy(cy...)) ∈ ∫fTdy(aux)
end

f(x, y) = exp(-0.5 * (x^2 + y^2)) * x
∫fdx(x, y) = -exp(-0.5 * (x^2 + y^2))
f = (x, y) -> exp(-0.5 * (x^2 + y^2)) * x
∫fdx = (x, y) -> -exp(-0.5 * (x^2 + y^2))
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)

Expand All @@ -334,9 +334,9 @@ set_variables(Interval{Float64}, [:x, :y], order=_order_max)
@test (∫fdx(xtest...) - ∫fdx(cx...)) ∈ ∫fTdx(aux)
end

f(x, y) = x * cos(y) * exp(x + y)
∫fdx(x, y) = (x - 1) * exp(x + y) * cos(y)
∫fdy(x, y) = 0.5 * x * exp(x + y) * (sin(y) + cos(y))
f = (x, y) -> x * cos(y) * exp(x + y)
∫fdx = (x, y) -> (x - 1) * exp(x + y) * cos(y)
∫fdy = (x, y) -> 0.5 * x * exp(x + y) * (sin(y) + cos(y))
fT = f(xm, ym)
∫fTdx = integrate(fT, :x)
∫fTdy = integrate(fT, :y)
Expand Down

0 comments on commit b4e9e16

Please sign in to comment.