From 78b9982f3dadaf4b5351c0283133ec1658490897 Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Mon, 8 Jun 2020 15:41:30 -0500 Subject: [PATCH] Fix julia tests --- src/julia/src/jump_solver.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/julia/src/jump_solver.jl b/src/julia/src/jump_solver.jl index 025e3a5..4cbcc29 100644 --- a/src/julia/src/jump_solver.jl +++ b/src/julia/src/jump_solver.jl @@ -91,28 +91,28 @@ end @timeit "solve" begin instance, model = self.data.instance, self.data.model wallclock_time = 0 - found_violations = [] - + found_lazy = [] while true @timeit "optimize!" begin JuMP.optimize!(model) end wallclock_time += JuMP.solve_time(model) - @timeit "find_violations" begin - violations = instance.find_violations(model) + @timeit "find_violated_lazy_constraints" begin + violations = instance.find_violated_lazy_constraints(model) end @info "$(length(violations)) violations found" if length(violations) == 0 break end - append!(found_violations, violations) + append!(found_lazy, violations) for v in violations instance.build_lazy_constraint(self.data.model, v) end end @timeit "update solution" begin self._update_solution() - self.data.instance.found_violations = found_violations + instance.found_violated_lazy_constraints = found_lazy + instance.found_violated_user_cuts = [] end primal_bound = JuMP.objective_value(model) dual_bound = JuMP.objective_bound(model)