From ce2da3868e5f6e90001ecf497d7a95cd6ae40f5f Mon Sep 17 00:00:00 2001 From: JAJHall Date: Wed, 31 Jul 2024 00:30:17 +0100 Subject: [PATCH] Highs::reportModel now uses const HighsModel& model argument so it can report the presolved LP --- src/Highs.h | 2 +- src/lp_data/Highs.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Highs.h b/src/Highs.h index f104d72f1d..6a87f6e5e6 100644 --- a/src/Highs.h +++ b/src/Highs.h @@ -1374,7 +1374,7 @@ class Highs { HighsStatus openWriteFile(const string filename, const string method_name, FILE*& file, HighsFileType& file_type) const; - void reportModel(); + void reportModel(const HighsModel& model); void newHighsBasis(); void forceHighsSolutionBasisSize(); // diff --git a/src/lp_data/Highs.cpp b/src/lp_data/Highs.cpp index acf2780b39..82f068171a 100644 --- a/src/lp_data/Highs.cpp +++ b/src/lp_data/Highs.cpp @@ -710,7 +710,7 @@ HighsStatus Highs::writeLocalModel(HighsModel& model, } if (filename == "") { // Empty file name: report model on logging stream - reportModel(); + reportModel(model); return_status = HighsStatus::kOk; } else { Filereader* writer = @@ -4019,13 +4019,13 @@ void Highs::logHeader() { return; } -void Highs::reportModel() { - reportLp(options_.log_options, model_.lp_, HighsLogType::kVerbose); - if (model_.hessian_.dim_) { - const HighsInt dim = model_.hessian_.dim_; - reportHessian(options_.log_options, dim, model_.hessian_.start_[dim], - model_.hessian_.start_.data(), model_.hessian_.index_.data(), - model_.hessian_.value_.data()); +void Highs::reportModel(const HighsModel& model) { + reportLp(options_.log_options, model.lp_, HighsLogType::kVerbose); + if (model.hessian_.dim_) { + const HighsInt dim = model.hessian_.dim_; + reportHessian(options_.log_options, dim, model.hessian_.start_[dim], + model.hessian_.start_.data(), model.hessian_.index_.data(), + model.hessian_.value_.data()); } }