Skip to content

Commit

Permalink
keeping all evaluate_node_result in multiple_search
Browse files Browse the repository at this point in the history
  • Loading branch information
jajhall committed Jan 23, 2025
1 parent 7733559 commit 66bcd64
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,13 @@ void HighsMipSolver::run() {
// Possibly apply primal heuristics
if (considerHeuristics && mipdata_->moreHeuristicsAllowed()) {
analysis_.mipTimerStart(kMipClockEvaluateNode);
const HighsSearch::NodeResult evaluate_node_result =
parallel_search.search.evaluateNode();
parallel_search.evaluate_node_result = parallel_search.search.evaluateNode();
analysis_.mipTimerStop(kMipClockEvaluateNode);

if (evaluate_node_result == HighsSearch::NodeResult::kSubOptimal) {
if (parallel_search.evaluate_node_result == HighsSearch::NodeResult::kSubOptimal) {
printf("HighsMipSolver::run() evaluate_node_result == HighsSearch::NodeResult::kSubOptimal\n");
assert(345==678);
break;
continue;
}

if (parallel_search.search.currentNodePruned()) {
Expand Down Expand Up @@ -334,6 +334,8 @@ void HighsMipSolver::run() {
}
}
}
if (multiple_search[0].evaluate_node_result == HighsSearch::NodeResult::kSubOptimal) break;

considerHeuristics = false;

if (mipdata_->domain.infeasible()) break;
Expand Down

0 comments on commit 66bcd64

Please sign in to comment.