Skip to content

Commit

Permalink
Fix nlp-mi/006-010 (#46)
Browse files Browse the repository at this point in the history
  • Loading branch information
odow authored Dec 3, 2023
1 parent e7f4d11 commit 91c60ee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
8 changes: 2 additions & 6 deletions src/nlp-mi-expr/006_010.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ function nlp_mi_expr_006_010(
optimize!(model)

check_status(model, FEASIBLE_PROBLEM, termination_target, primal_target)
check_objective(model, 1.8813786425753092, tol = objective_tol)
return check_solution(
[x, y],
[0.7546057578960682, 1.1267728846792409],
tol = primal_tol,
)
check_objective(model, 1 + log(2), tol = objective_tol)
return check_solution([x, y], [log(2), 1.0], tol = primal_tol)
end
8 changes: 2 additions & 6 deletions src/nlp-mi/006_010.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ function nlp_mi_006_010(
optimize!(model)

check_status(model, FEASIBLE_PROBLEM, termination_target, primal_target)
check_objective(model, 1.8813786425753092, tol = objective_tol)
return check_solution(
[x, y],
[0.7546057578960682, 1.1267728846792409],
tol = primal_tol,
)
check_objective(model, 1 + log(2), tol = objective_tol)
return check_solution([x, y], [log(2), 1.0], tol = primal_tol)
end
2 changes: 0 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,9 @@ const MIPOLY_SOLVERS = [JUNIPER]
@testset "$(solver): nlp_mi" for solver in MINLP_SOLVERS
MINLPTests.test_nlp_mi(solver, exclude = [
"005_011", # Uses the function `\`
"006_010", # Bug in Juniper - handling of user-defined functions.
])
MINLPTests.test_nlp_mi_expr(solver, exclude = [
"005_011", # Uses the function `\`
"006_010", # Bug in Juniper - handling of user-defined functions.
])
MINLPTests.test_nlp_mi_cvx(solver)
end
Expand Down

0 comments on commit 91c60ee

Please sign in to comment.