Skip to content

Commit

Permalink
Formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
jajhall committed Sep 25, 2024
1 parent 2fc4a98 commit a26eb24
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/io/HMpsFF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,11 @@ bool HMpsFF::getMpsLine(std::istream& file, std::string& strline, bool& skip) {
// Remove any trailing comment
const size_t p = strline.find_first_of(mps_comment_chars);
if (p <= strline.length()) {
// A comment character has been found, so erase from it to the end
// of the line and check whether the line is now empty
strline.erase(p);
skip = is_empty(strline);
if (skip) return true;
// A comment character has been found, so erase from it to the end
// of the line and check whether the line is now empty
strline.erase(p);
skip = is_empty(strline);
if (skip) return true;
}
}
strline = trim(strline);
Expand Down
2 changes: 1 addition & 1 deletion src/lp_data/HighsOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ struct HighsOptionsStruct {
#endif
mip_improving_solution_save(false),
mip_improving_solution_report_sparse(false),
mip_improving_solution_file("") {};
mip_improving_solution_file(""){};
};

// For now, but later change so HiGHS properties are string based so that new
Expand Down
1 change: 0 additions & 1 deletion src/mip/HighsMipSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ HighsMipSolver::HighsMipSolver(HighsCallback& callback,
pscostinit(nullptr),
clqtableinit(nullptr),
implicinit(nullptr) {

if (solution.value_valid) {
// MIP solver doesn't check row residuals, but they should be OK
// so validate using assert
Expand Down
2 changes: 1 addition & 1 deletion src/util/HFactor.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class HFactor {
build_timer_(nullptr),
nwork(0),
u_merit_x(0),
u_total_x(0) {};
u_total_x(0){};

/**
* @brief Copy problem size and pointers of constraint matrix, and set
Expand Down

0 comments on commit a26eb24

Please sign in to comment.