Skip to content

Commit

Permalink
Now calling ekk_instance_.computeBasisCondition(); but LP needs to be…
Browse files Browse the repository at this point in the history
… passed
  • Loading branch information
jajhall committed Sep 18, 2024
1 parent ccef75c commit 091ab68
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/lp_data/Highs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1948,7 +1948,13 @@ HighsStatus Highs::getReducedColumn(const HighsInt col, double* col_vector,
}

HighsStatus Highs::getKappa(double& kappa) {
return HighsStatus::kError;
printf("Highs::getKappa basis_.valid = %d, ekk_instance_.status_.has_invert = %d\n",
int(basis_.valid),
int(ekk_instance_.status_.has_invert));
if (!ekk_instance_.status_.has_invert)
return invertRequirementError("getBasisInverseRow");
kappa = ekk_instance_.computeBasisCondition();
return HighsStatus::kOk;
}

HighsStatus Highs::setSolution(const HighsSolution& solution) {
Expand Down
2 changes: 1 addition & 1 deletion src/simplex/HEkk.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ class HEkk {
HighsBasis getHighsBasis(HighsLp& use_lp) const;

const SimplexBasis& getSimplexBasis() { return basis_; }
double computeBasisCondition();

HighsStatus initialiseSimplexLpBasisAndFactor(
const bool only_from_known_basis = false);
Expand Down Expand Up @@ -333,7 +334,6 @@ class HEkk {
HighsStatus returnFromEkkSolve(const HighsStatus return_status);
HighsStatus returnFromSolve(const HighsStatus return_status);

double computeBasisCondition();
void initialiseAnalysis();
std::string rebuildReason(const HighsInt rebuild_reason);

Expand Down

0 comments on commit 091ab68

Please sign in to comment.