Skip to content
Merged
Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions check/TestCAPI.c
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ void versionApi() {
printf("HiGHS version minor %" HIGHSINT_FORMAT "\n", Highs_versionMinor());
printf("HiGHS version patch %" HIGHSINT_FORMAT "\n", Highs_versionPatch());
printf("HiGHS githash: %s\n", Highs_githash());
// Compilation date is deprecated.
// printf("HiGHS compilation date %s\n", Highs_compilationDate());
}
}

Expand Down Expand Up @@ -564,8 +562,10 @@ void testNames() {

HighsInt return_status;

HighsInt num_col = Highs_getNumCols(highs);
HighsInt num_row = Highs_getNumRows(highs);
const HighsInt num_col = 2;
const HighsInt num_row = 3;
assert(num_col == Highs_getNumCols(highs));
assert(num_row == Highs_getNumRows(highs));

char* col_prefix = "Col";
char* row_prefix = "Row";
Expand Down Expand Up @@ -621,7 +621,7 @@ void testNames() {

// Define all row names to be different
for (HighsInt iRow = 0; iRow < num_row; iRow++) {
sprintf(name, "%s%" HIGHSINT_FORMAT "", row_prefix, iRow);
sprintf(name, "%s%" HIGHSINT_FORMAT, row_prefix, iRow);
return_status = Highs_passRowName(highs, iRow, name);
assert(return_status == kHighsStatusOk);
}
Expand Down
2 changes: 1 addition & 1 deletion highs/interfaces/highs_c_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@ HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in) {
// * Deprecated methods*
// *********************

const char* Highs_compilationDate(void) { return "Deprecated"; }
static const char* Highs_compilationDate(void) { return "Deprecated"; }

HighsInt Highs_call(const HighsInt num_col, const HighsInt num_row,
const HighsInt num_nz, const double* col_cost,
Expand Down
2 changes: 1 addition & 1 deletion highs/interfaces/highs_c_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -2563,7 +2563,7 @@ HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in);
/**
* Return the HiGHS compilation date.
*
* @returns Thse HiGHS compilation date.
* @returns The HiGHS compilation date.
*/
static const char* Highs_compilationDate(void);

Expand Down
6 changes: 0 additions & 6 deletions highs/lp_data/HighsIis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,6 @@ HighsStatus HighsIis::compute(const HighsLp& lp, const HighsOptions& options,
return HighsStatus::kOk;
}

bool indexStatusOkReturn(const bool return_value) { return return_value; }

bool HighsIis::indexStatusOk(const HighsLp& lp) const {
HighsInt num_col = lp.num_col_;
HighsInt num_row = lp.num_row_;
Expand Down Expand Up @@ -888,8 +886,6 @@ bool HighsIis::indexStatusOk(const HighsLp& lp) const {
return indexStatusOkReturn(true);
}

bool lpDataOkReturn(const bool return_value) { return return_value; }

bool HighsIis::lpDataOk(const HighsLp& lp, const HighsOptions& options) const {
const HighsLp& iis_lp = this->model_.lp_;
HighsInt iis_num_col = this->col_index_.size();
Expand Down Expand Up @@ -1047,8 +1043,6 @@ bool HighsIis::lpDataOk(const HighsLp& lp, const HighsOptions& options) const {
return lpDataOkReturn(true);
}

bool lpOkReturn(const bool return_value) { return return_value; }

bool HighsIis::lpOk(const HighsOptions& options) const {
// Check that the IIS LP is OK (infeasible and optimal if
// any bound is relaxed)
Expand Down
6 changes: 6 additions & 0 deletions highs/lp_data/HighsIis.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ class HighsIis {
bool trivial(const HighsLp& lp, const HighsOptions& options);
bool rowValueBounds(const HighsLp& lp, const HighsOptions& options);

bool indexStatusOkReturn(const bool return_value) const {
return return_value;
}
bool lpDataOkReturn(const bool return_value) const { return return_value; }
bool lpOkReturn(const bool return_value) const { return return_value; }

bool indexStatusOk(const HighsLp& lp) const;
bool lpDataOk(const HighsLp& lp, const HighsOptions& options) const;
bool lpOk(const HighsOptions& options) const;
Expand Down
Loading