Skip to content

Commit 00a9c2b

Browse files
odowodow
committed
Update
1 parent b018a1f commit 00a9c2b

File tree

1 file changed

+16
-50
lines changed

1 file changed

+16
-50
lines changed

‎src/Test/test_nonlinear.jl‎

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,9 +1231,7 @@ function setup_test(
12311231
model::MOIU.MockOptimizer,
12321232
config::Config{T},
12331233
) where {T}
1234-
if T != Float64
1235-
return # Skip for non-Float64 solvers
1236-
end
1234+
12371235
MOI.Utilities.set_mock_optimize!(
12381236
model,
12391237
(mock) -> begin
@@ -1287,9 +1285,7 @@ function setup_test(
12871285
model::MOIU.MockOptimizer,
12881286
config::Config{T},
12891287
) where {T}
1290-
if T != Float64
1291-
return # Skip for non-Float64 solvers
1292-
end
1288+
12931289
MOI.Utilities.set_mock_optimize!(
12941290
model,
12951291
(mock) -> begin
@@ -1351,9 +1347,7 @@ function setup_test(
13511347
model::MOIU.MockOptimizer,
13521348
config::Config{T},
13531349
) where {T}
1354-
if T != Float64
1355-
return # Skip for non-Float64 solvers
1356-
end
1350+
13571351
flag = model.eval_objective_value
13581352
model.eval_objective_value = false
13591353
MOI.Utilities.set_mock_optimize!(
@@ -1413,9 +1407,7 @@ function setup_test(
14131407
model::MOIU.MockOptimizer,
14141408
config::Config{T},
14151409
) where {T}
1416-
if T != Float64
1417-
return # Skip for non-Float64 solvers
1418-
end
1410+
14191411
flag = model.eval_objective_value
14201412
model.eval_objective_value = false
14211413
MOI.Utilities.set_mock_optimize!(
@@ -1461,9 +1453,7 @@ function setup_test(
14611453
model::MOIU.MockOptimizer,
14621454
config::Config{T},
14631455
) where {T}
1464-
if T != Float64
1465-
return # Skip for non-Float64 solvers
1466-
end
1456+
14671457
flag = model.eval_objective_value
14681458
model.eval_objective_value = false
14691459
MOI.Utilities.set_mock_optimize!(
@@ -1512,9 +1502,7 @@ function setup_test(
15121502
model::MOIU.MockOptimizer,
15131503
config::Config{T},
15141504
) where {T}
1515-
if T != Float64
1516-
return # Skip for non-Float64 solvers
1517-
end
1505+
15181506
flag = model.eval_objective_value
15191507
model.eval_objective_value = false
15201508
MOI.Utilities.set_mock_optimize!(
@@ -1557,9 +1545,7 @@ function setup_test(
15571545
model::MOIU.MockOptimizer,
15581546
config::Config{T},
15591547
) where {T}
1560-
if T != Float64
1561-
return # Skip for non-Float64 solvers
1562-
end
1548+
15631549
MOI.Utilities.set_mock_optimize!(
15641550
model,
15651551
mock -> MOI.Utilities.mock_optimize!(mock, config.optimal_status, [1]),
@@ -1600,9 +1586,7 @@ function setup_test(
16001586
model::MOIU.MockOptimizer,
16011587
config::Config{T},
16021588
) where {T}
1603-
if T != Float64
1604-
return # Skip for non-Float64 solvers
1605-
end
1589+
16061590
MOI.Utilities.set_mock_optimize!(
16071591
model,
16081592
mock -> MOI.Utilities.mock_optimize!(
@@ -1869,9 +1853,7 @@ function setup_test(
18691853
model::MOIU.MockOptimizer,
18701854
config::Config{T},
18711855
) where {T}
1872-
if T != Float64
1873-
return # Skip for non-Float64 solvers
1874-
end
1856+
18751857
MOI.Utilities.set_mock_optimize!(
18761858
model,
18771859
mock ->
@@ -1917,15 +1899,13 @@ function setup_test(
19171899
model::MOIU.MockOptimizer,
19181900
config::Config{T},
19191901
) where {T}
1920-
if T != Float64
1921-
return # Skip for non-Float64 solvers
1922-
end
1902+
19231903
MOI.Utilities.set_mock_optimize!(
19241904
model,
19251905
mock -> MOI.Utilities.mock_optimize!(
19261906
mock,
19271907
config.optimal_status,
1928-
T[2, log(2)],
1908+
T[2, log(T(2))],
19291909
),
19301910
)
19311911
return
@@ -1935,7 +1915,7 @@ function test_nonlinear_constraint_uminus(
19351915
model::MOI.ModelLike,
19361916
config::Config{T},
19371917
) where {T}
1938-
F, S = MOI.ScalarNonlinearFunction, MOI.GreaterThan{Float64}
1918+
F, S = MOI.ScalarNonlinearFunction, MOI.GreaterThan{T}
19391919
@requires MOI.supports_constraint(model, F, S)
19401920
x = MOI.add_variable(model)
19411921
MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
@@ -1954,9 +1934,7 @@ function setup_test(
19541934
model::MOIU.MockOptimizer,
19551935
config::Config{T},
19561936
) where {T}
1957-
if T != Float64
1958-
return # Skip for non-Float64 solvers
1959-
end
1937+
19601938
MOI.Utilities.set_mock_optimize!(
19611939
model,
19621940
mock -> MOI.Utilities.mock_optimize!(mock, config.optimal_status, T[2]),
@@ -1988,9 +1966,7 @@ function setup_test(
19881966
model::MOIU.MockOptimizer,
19891967
config::Config{T},
19901968
) where {T}
1991-
if T != Float64
1992-
return # Skip for non-Float64 solvers
1993-
end
1969+
19941970
MOI.Utilities.set_mock_optimize!(
19951971
model,
19961972
mock -> MOI.Utilities.mock_optimize!(
@@ -2033,9 +2009,7 @@ function setup_test(
20332009
model::MOIU.MockOptimizer,
20342010
config::Config{T},
20352011
) where {T}
2036-
if T != Float64
2037-
return # Skip for non-Float64 solvers
2038-
end
2012+
20392013
MOI.Utilities.set_mock_optimize!(
20402014
model,
20412015
mock -> MOI.Utilities.mock_optimize!(
@@ -2079,9 +2053,7 @@ function setup_test(
20792053
model::MOIU.MockOptimizer,
20802054
config::Config{T},
20812055
) where {T}
2082-
if T != Float64
2083-
return # Skip for non-Float64 solvers
2084-
end
2056+
20852057
MOI.Utilities.set_mock_optimize!(
20862058
model,
20872059
mock -> MOI.Utilities.mock_optimize!(
@@ -2125,9 +2097,6 @@ function setup_test(
21252097
model::MOIU.MockOptimizer,
21262098
config::Config{T},
21272099
) where {T}
2128-
if T != Float64
2129-
return # Skip for non-Float64 solvers
2130-
end
21312100
MOI.Utilities.set_mock_optimize!(
21322101
model,
21332102
mock -> MOI.Utilities.mock_optimize!(
@@ -2170,9 +2139,6 @@ function setup_test(
21702139
model::MOIU.MockOptimizer,
21712140
config::Config{T},
21722141
) where {T}
2173-
if T != Float64
2174-
return # Skip for non-Float64 solvers
2175-
end
21762142
MOI.Utilities.set_mock_optimize!(
21772143
model,
21782144
mock -> MOI.Utilities.mock_optimize!(

0 commit comments

Comments
 (0)