From 17e59ae5515276b5479093dfb249cf4690099601 Mon Sep 17 00:00:00 2001 From: JAJHall Date: Wed, 28 Aug 2024 21:38:10 +0100 Subject: [PATCH] Formatted --- src/lp_data/HighsIis.cpp | 11 ++++++----- src/lp_data/HighsInterface.cpp | 14 ++++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/lp_data/HighsIis.cpp b/src/lp_data/HighsIis.cpp index ac05276a4d..50fef4e969 100644 --- a/src/lp_data/HighsIis.cpp +++ b/src/lp_data/HighsIis.cpp @@ -249,7 +249,7 @@ HighsStatus HighsIis::compute(const HighsLp& lp, const HighsOptions& options, bool drop_lower = false; HighsInt num_run_call = 0; - const HighsInt check_run_call = 154;//kHighsIInf; + const HighsInt check_run_call = 154; // kHighsIInf; // Lambda for gathering data when solving an LP auto solveLp = [&]() -> HighsStatus { @@ -258,10 +258,10 @@ HighsStatus HighsIis::compute(const HighsLp& lp, const HighsOptions& options, iis_info.simplex_iterations = -info.simplex_iteration_count; bool output_flag; HighsInt log_dev_level; - HighsInt highs_analysis_level; - highs.getOptionValue("output_flag", output_flag); + HighsInt highs_analysis_level; + highs.getOptionValue("output_flag", output_flag); highs.getOptionValue("log_dev_level", log_dev_level); - highs.getOptionValue("highs_analysis_level", highs_analysis_level); + highs.getOptionValue("highs_analysis_level", highs_analysis_level); num_run_call++; if (num_run_call == check_run_call) { @@ -401,7 +401,8 @@ HighsStatus HighsIis::compute(const HighsLp& lp, const HighsOptions& options, // Record whether the upper bound has been dropped due to the lower bound // being kept if (check_type == type && check_ix == iX) { - printf("CheckType %s, index %d, will be num_run_call = %d\n", check_type.c_str(), int(check_ix), int(num_run_call+1)); + printf("CheckType %s, index %d, will be num_run_call = %d\n", + check_type.c_str(), int(check_ix), int(num_run_call + 1)); } if (lower > -kHighsInf) { // Drop the lower bound temporarily diff --git a/src/lp_data/HighsInterface.cpp b/src/lp_data/HighsInterface.cpp index a32b4e4462..3eded75ac8 100644 --- a/src/lp_data/HighsInterface.cpp +++ b/src/lp_data/HighsInterface.cpp @@ -2138,11 +2138,12 @@ HighsStatus Highs::elasticityFilter( if (lp.col_upper_[iCol] == 0) { num_enforced_col_ecol++; printf( - "Col e-col %4d (column %4d) corresponds to column %4d (%8s) with bound " + "Col e-col %4d (column %4d) corresponds to column %4d (%8s) with " + "bound " "%11.4g " "and is enforced\n", int(eCol), int(iCol), int(original_col), - has_col_names ? lp.col_names_[original_col].c_str(): "", + has_col_names ? lp.col_names_[original_col].c_str() : "", bound_of_col_of_ecol[eCol]); } } @@ -2155,15 +2156,16 @@ HighsStatus Highs::elasticityFilter( assert(original_row < original_num_row); const HighsInt iCol = row_ecol_offset + eCol; if (lp.col_upper_[iCol] == 0) { - assert(!in_infeasible_row_subset[original_row]); + assert(!in_infeasible_row_subset[original_row]); num_enforced_row_ecol++; infeasible_row_subset.push_back(original_row); if (kIisDevReportBrief) printf( - "Row e-col %4d (column %4d) corresponds to row %4d (%8s) with bound %11.4g " - "and is enforced\n", + "Row e-col %4d (column %4d) corresponds to row %4d (%8s) with " + "bound %11.4g " + "and is enforced\n", int(eCol), int(iCol), int(original_row), - has_row_names ? lp.row_names_[original_row].c_str(): "", + has_row_names ? lp.row_names_[original_row].c_str() : "", bound_of_row_of_ecol[eCol]); } }