Skip to content

Commit cb8aa23

Browse files
jajhalljajhall
committed
Formatted
1 parent 5f99912 commit cb8aa23

File tree

10 files changed

+25
-21
lines changed

10 files changed

+25
-21
lines changed

‎highs/io/HMPSIO.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@ bool load_mpsLine(std::istream& file, HighsVarType& integerVar, HighsInt lmax,
549549
}
550550

551551
HighsStatus writeModelAsMps(const HighsOptions& options,
552-
const std::string& filename, const HighsModel& model,
553-
const bool free_format) {
552+
const std::string& filename,
553+
const HighsModel& model, const bool free_format) {
554554
bool warning_found = false;
555555
const HighsLp& lp = model.lp_;
556556

‎highs/io/HMPSIO.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool load_mpsLine(std::istream& file, HighsVarType& integerVar, HighsInt lmax,
7272
char* line, char* flag, double* data);
7373

7474
HighsStatus writeModelAsMps(const HighsOptions& options,
75-
const std::string& filename, const HighsModel& model,
76-
const bool free = true);
75+
const std::string& filename,
76+
const HighsModel& model, const bool free = true);
7777

7878
#endif /* IO_HMPSIO_H_ */

‎highs/ipm/IpxWrapper.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,8 @@ HighsStatus reportIpxIpmCrossoverStatus(const HighsOptions& options,
10141014
}
10151015

10161016
bool ipxStatusError(const bool status_error, const HighsOptions& options,
1017-
const std::string& solver, const std::string& message, const int value) {
1017+
const std::string& solver, const std::string& message,
1018+
const int value) {
10181019
if (status_error) {
10191020
if (value < 0) {
10201021
highsLogUser(options.log_options, HighsLogType::kError, "%s: %s\n",

‎highs/lp_data/Highs.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,7 @@ HighsStatus Highs::readModel(const std::string& filename) {
664664
reader->readModelFromFile(options_, filename, model);
665665
delete reader;
666666
if (call_code != FilereaderRetcode::kOk) {
667-
interpretFilereaderRetcode(options_.log_options, filename,
668-
call_code);
667+
interpretFilereaderRetcode(options_.log_options, filename, call_code);
669668
const HighsStatus call_status = call_code == FilereaderRetcode::kWarning
670669
? HighsStatus::kWarning
671670
: HighsStatus::kError;

‎highs/lp_data/HighsLpUtils.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2089,10 +2089,10 @@ void reportLpColMatrix(const HighsLogOptions& log_options, const HighsLp& lp) {
20892089
}
20902090
}
20912091

2092-
void reportMatrix(const HighsLogOptions& log_options, const std::string& message,
2093-
const HighsInt num_col, const HighsInt num_nz,
2094-
const HighsInt* start, const HighsInt* index,
2095-
const double* value) {
2092+
void reportMatrix(const HighsLogOptions& log_options,
2093+
const std::string& message, const HighsInt num_col,
2094+
const HighsInt num_nz, const HighsInt* start,
2095+
const HighsInt* index, const double* value) {
20962096
if (num_col <= 0) return;
20972097
highsLogUser(log_options, HighsLogType::kInfo,
20982098
"%-7s Index Value\n", message.c_str());

‎highs/lp_data/HighsLpUtils.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ void reportLpColMatrix(const HighsLogOptions& log_options,
195195
const HighsLp& lp //!< LP whose data are to be reported
196196
);
197197

198-
void reportMatrix(const HighsLogOptions& log_options, const std::string& message,
199-
const HighsInt num_col, const HighsInt num_nz,
200-
const HighsInt* start, const HighsInt* index,
201-
const double* value);
198+
void reportMatrix(const HighsLogOptions& log_options,
199+
const std::string& message, const HighsInt num_col,
200+
const HighsInt num_nz, const HighsInt* start,
201+
const HighsInt* index, const double* value);
202202

203203
// Get the number of integer-valued columns in the LP
204204
HighsInt getNumInt(const HighsLp& lp);

‎highs/lp_data/HighsModelUtils.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,8 @@ void writeSolutionFile(FILE* file, const HighsOptions& options,
493493

494494
void writeGlpsolCostRow(FILE* file, const HighsLogOptions& log_options,
495495
const bool raw, const bool is_mip,
496-
const HighsInt row_id, const std::string& objective_name,
496+
const HighsInt row_id,
497+
const std::string& objective_name,
497498
const double objective_function_value) {
498499
std::stringstream ss;
499500
ss.str(std::string());

‎highs/lp_data/HighsModelUtils.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ void writeSolutionFile(FILE* file, const HighsOptions& options,
7676

7777
void writeGlpsolCostRow(FILE* file, const HighsLogOptions& log_options,
7878
const bool raw, const bool is_mip,
79-
const HighsInt row_id, const std::string& objective_name,
79+
const HighsInt row_id,
80+
const std::string& objective_name,
8081
const double objective_function_value);
8182

8283
void writeGlpsolSolution(FILE* file, const HighsOptions& options,

‎highs/util/HighsUtils.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,8 @@ bool computeScatterDataRegressionError(HighsScatterData& scatter_data,
11531153
return true;
11541154
}
11551155

1156-
bool printScatterData(const std::string& name, const HighsScatterData& scatter_data) {
1156+
bool printScatterData(const std::string& name,
1157+
const HighsScatterData& scatter_data) {
11571158
if (!scatter_data.num_point_) return true;
11581159
double x;
11591160
double y;

‎highs/util/HighsUtils.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ double highsRelativeDifference(const double v0, const double v1);
136136
*/
137137
void analyseVectorValues(
138138
const HighsLogOptions* log_options,
139-
const std::string& message, //!< Message to be printed
139+
const std::string& message, //!< Message to be printed
140140
HighsInt vecDim, //!< Dimension of vector
141141
const std::vector<double>& vec, //!< Vector of values
142142
bool analyseValueList = false, //!< Possibly analyse the distribution of
@@ -148,7 +148,7 @@ void analyseVectorValues(
148148

149149
void analyseVectorValues(
150150
const HighsLogOptions* log_options,
151-
const std::string& message, //!< Message to be printed
151+
const std::string& message, //!< Message to be printed
152152
HighsInt vecDim, //!< Dimension of vector
153153
const std::vector<HighsInt>& vec, //!< Vector of values
154154
const std::string& model_name =
@@ -189,7 +189,8 @@ bool regressScatterData(HighsScatterData& scatter_data);
189189
bool predictFromScatterData(const HighsScatterData& scatter_data,
190190
const double value0, double& predicted_value1,
191191
const bool log_regression = false);
192-
bool printScatterData(const std::string& name, const HighsScatterData& scatter_data);
192+
bool printScatterData(const std::string& name,
193+
const HighsScatterData& scatter_data);
193194
void printScatterDataRegressionComparison(const std::string& name,
194195
const HighsScatterData& scatter_data);
195196
bool computeScatterDataRegressionError(HighsScatterData& scatter_data,

0 commit comments

Comments
 (0)