Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cpp/src/mip/diversity/diversity_manager.cu
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,8 @@ void diversity_manager_t<i_t, f_t>::main_loop()
auto best_sol = population.is_feasible() ? population.best_feasible() : population.best();
ls.run_fj_until_timer(best_sol, population.weights, timer);
population.add_solution(std::move(best_sol));
CUOPT_LOG_WARN("Enough solutions couldn't be generated,exiting heuristics!");
CUOPT_LOG_INFO(
"Crossovers cannot continue. Running local search on best solution until time limit.");
break;
}
if (timer.check_time_limit()) { break; }
Expand Down
7 changes: 4 additions & 3 deletions cpp/src/mip/solve.cu
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ mip_solution_t<i_t, f_t> run_mip(detail::problem_t<i_t, f_t>& problem,
solution.compute_objective(); // just to ensure h_user_obj is set
auto stats = solver_stats_t<i_t, f_t>{};
stats.solution_bound = solution.get_user_objective();
return solution.get_solution(true, stats, false);
return solution.get_solution(true, stats, settings.presolve);
}
// problem contains unpreprocessed data
detail::problem_t<i_t, f_t> scaled_problem(problem);
Expand Down Expand Up @@ -144,8 +144,9 @@ mip_solution_t<i_t, f_t> run_mip(detail::problem_t<i_t, f_t>& problem,
"please provide a more numerically stable problem.");
}

auto sol = scaled_sol.get_solution(
is_feasible_before_scaling || is_feasible_after_unscaling, solver.get_solver_stats(), false);
auto sol = scaled_sol.get_solution(is_feasible_before_scaling || is_feasible_after_unscaling,
solver.get_solver_stats(),
settings.presolve);
detail::print_solution(scaled_problem.handle_ptr, sol.get_solution());
return sol;
}
Expand Down
Loading