Skip to content

Commit 9183f39

Browse files
committed
Simplifying local identifier names in assessExcessiveBoundCost
1 parent c601007 commit 9183f39

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

highs/lp_data/HighsSolve.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,6 @@ void assessExcessiveBoundCost(const HighsOptions options,
357357
double max_finite_col_cost = -kHighsInf;
358358
double min_finite_col_bound = kHighsInf;
359359
double max_finite_col_bound = -kHighsInf;
360-
double min_finite_row_bound = kHighsInf;
361-
double max_finite_row_bound = -kHighsInf;
362360
double min_matrix_value = kHighsInf;
363361
double max_matrix_value = -kHighsInf;
364362
for (HighsInt iCol = 0; iCol < lp.num_col_; iCol++) {
@@ -369,10 +367,25 @@ void assessExcessiveBoundCost(const HighsOptions options,
369367
assessFiniteNonzero(lp.col_upper_[iCol], min_finite_col_bound,
370368
max_finite_col_bound);
371369
}
370+
/*
371+
double min_finite_col_cost = kHighsInf;
372+
double max_finite_col_cost = -kHighsInf;
373+
double min_finite_col_bound = kHighsInf;
374+
double max_finite_col_bound = -kHighsInf;
375+
double min_matrix_value = kHighsInf;
376+
double max_matrix_value = -kHighsInf;
377+
*/
372378
if (min_finite_col_cost == kHighsInf) min_finite_col_cost = 0;
373379
if (max_finite_col_cost == -kHighsInf) max_finite_col_cost = 0;
374380
if (min_finite_col_bound == kHighsInf) min_finite_col_bound = 0;
375381
if (max_finite_col_bound == -kHighsInf) max_finite_col_bound = 0;
382+
HighsInt num_nz = lp.a_matrix_.numNz();
383+
for (HighsInt iEl = 0; iEl < num_nz; iEl++)
384+
assessFiniteNonzero(lp.a_matrix_.value_[iEl], min_matrix_value,
385+
max_matrix_value);
386+
387+
double min_finite_row_bound = kHighsInf;
388+
double max_finite_row_bound = -kHighsInf;
376389
for (HighsInt iRow = 0; iRow < lp.num_row_; iRow++) {
377390
assessFiniteNonzero(lp.row_lower_[iRow], min_finite_row_bound,
378391
max_finite_row_bound);
@@ -381,10 +394,6 @@ void assessExcessiveBoundCost(const HighsOptions options,
381394
}
382395
if (min_finite_row_bound == kHighsInf) min_finite_row_bound = 0;
383396
if (max_finite_row_bound == -kHighsInf) max_finite_row_bound = 0;
384-
HighsInt num_nz = lp.a_matrix_.numNz();
385-
for (HighsInt iEl = 0; iEl < num_nz; iEl++)
386-
assessFiniteNonzero(lp.a_matrix_.value_[iEl], min_matrix_value,
387-
max_matrix_value);
388397

389398
highsLogUser(log_options, HighsLogType::kInfo, "Coefficient ranges:\n");
390399
if (num_nz)

0 commit comments

Comments
 (0)