Skip to content

Commit bef7e2c

Browse files
authored
Merge pull request ERGO-Code#2332 from ERGO-Code/fix-2331
Fix 2331: Remove incorrect assert (and debug logging)
2 parents 5b9fa73 + 31dc347 commit bef7e2c

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

highs/mip/HighsFeasibilityJump.cpp

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@ HighsModelStatus HighsMipSolverData::feasibilityJump() {
112112
status.solution + status.numVars);
113113
objective_function_value =
114114
model->offset_ + sense_multiplier * status.solutionObjectiveValue;
115-
if (verbosity > 0) {
116-
printf("Feasibility Jump has found a solution");
117-
if (model->num_col_ < 10) {
118-
printf(" [");
119-
for (HighsInt col = 0; col < std::min(10, model->num_col_); ++col)
120-
printf(" %g", col_value[col]);
121-
printf("]");
122-
}
123-
printf(" with objective %g\n", objective_function_value);
124-
}
125115
}
126116
if (status.effortSinceLastImprovement > kMaxEffortSinceLastImprovement ||
127117
status.totalEffort > kMaxTotalEffort) {
@@ -131,24 +121,13 @@ HighsModelStatus HighsMipSolverData::feasibilityJump() {
131121
}
132122
};
133123

134-
if (verbosity > 0)
135-
printf(
136-
"Feasibility Jump: kMaxTotalEffort = %zd; "
137-
"kMaxEffortSinceLastImprovement = %zd\n",
138-
kMaxTotalEffort, kMaxEffortSinceLastImprovement);
139124
solver.solve(col_value.data(), fjControlCallback);
140125

141126
if (found_integer_feasible_solution) {
142127
// Initial assignments that violate integrality or column bounds can lead to
143128
// infeasible results. Even if those initial assignments should not occur,
144129
// use trySolution rather than addIncumbent for an explicit check.
145-
bool is_really_feasible =
146-
trySolution(col_value, kSolutionSourceFeasibilityJump);
147-
if (!is_really_feasible) {
148-
highsLogUser(log_options, HighsLogType::kInfo,
149-
"Discarding infeasible result from Feasibility Jump\n");
150-
}
151-
assert(is_really_feasible);
130+
trySolution(col_value, kSolutionSourceFeasibilityJump);
152131
}
153132
return HighsModelStatus::kNotset;
154133
#endif

0 commit comments

Comments
 (0)