Skip to content

Commit 26420dc

Browse files
committed
address Benoit's comments
1 parent ff0c3aa commit 26420dc

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

test/instances.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const MACMPEC_SOLUTIONS = Dict{Symbol,Float64}(
1212
:ralph_2_model => 0.0,
1313
:scale_1_model => 1.0,
1414
:scholtes4_model => 0.0, # Here, we found a different solution than in MacMPEC (3.07336e-7)
15-
:water_net_model => 934.8621, # Solution reported is slightly worse than in MacMPEC (929.169)
15+
:water_net_model => 930.6687, # Solution reported is slightly worse than in MacMPEC (929.169)
1616
)
1717

1818
# Ex. (2.2) from "Local convergence of SQP methods for MPECs".
@@ -375,8 +375,8 @@ function water_net_model()
375375
model = Model()
376376

377377
# N.B. : solution found is highly sensitive to the initial values of (qp, qn)
378-
@variable(model, 0 <= qp[arcs], start=10.0)
379-
@variable(model, 0 <= qn[arcs], start=10.0)
378+
@variable(model, 0 <= qp[arcs])
379+
@variable(model, 0 <= qn[arcs])
380380
@variable(model, dmin <= d[arcs] <= dmax, start=davg)
381381
@variable(model, h[i in nodes], start=hl[i] + 5.0, lower_bound=hl[i], upper_bound=100)
382382
@variable(model, 0 <= s[i in reservoirs] <= supply[i], start=rr*supply[i])

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function test_model(model_func)
5252
JuMP.set_optimizer_attribute(model, "bound_relax_factor", 0.0)
5353
JuMP.set_optimizer_attribute(model, "mu_strategy", "adaptive")
5454
JuMP.set_optimizer_attribute(model, "bound_push", 1e-1)
55-
# JuMP.set_silent(model)
55+
JuMP.set_silent(model)
5656
JuMP.optimize!(model)
5757
name = Symbol(model_func)
5858
@test JuMP.is_solved_and_feasible(model)

0 commit comments

Comments
 (0)