Skip to content
Merged
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
20 changes: 12 additions & 8 deletions cpp/src/dual_simplex/presolve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,23 @@ i_t remove_empty_cols(lp_problem_t<i_t, f_t>& problem,
std::vector<i_t> col_marker(problem.num_cols);
i_t new_cols = 0;
for (i_t j = 0; j < problem.num_cols; ++j) {
bool remove_var = false;
if ((problem.A.col_start[j + 1] - problem.A.col_start[j]) == 0) {
col_marker[j] = 1;
presolve_info.removed_variables.push_back(j);
presolve_info.removed_reduced_costs.push_back(problem.objective[j]);
if (problem.objective[j] >= 0) {
if (problem.objective[j] >= 0 && problem.lower[j] > -inf) {
presolve_info.removed_values.push_back(problem.lower[j]);
problem.obj_constant += problem.objective[j] * problem.lower[j];
assert(problem.lower[j] > -inf);
} else {
remove_var = true;
} else if (problem.objective[j] <= 0 && problem.upper[j] < inf) {
presolve_info.removed_values.push_back(problem.upper[j]);
problem.obj_constant += problem.objective[j] * problem.upper[j];
assert(problem.upper[j] < inf);
remove_var = true;
}
}

if (remove_var) {
col_marker[j] = 1;
presolve_info.removed_variables.push_back(j);
presolve_info.removed_reduced_costs.push_back(problem.objective[j]);
} else {
col_marker[j] = 0;
new_cols++;
Expand Down Expand Up @@ -751,7 +755,7 @@ i_t presolve(const lp_problem_t<i_t, f_t>& original,
}
}
if (num_empty_cols > 0) {
settings.log.printf("Presolve removing %d empty cols\n", num_empty_cols);
settings.log.printf("Presolve attempt to remove %d empty cols\n", num_empty_cols);
remove_empty_cols(problem, num_empty_cols, presolve_info);
}

Expand Down