Skip to content

Commit b5b2785

Browse files
committed
Move logger entirely within PDLPSolver
1 parent b3c63e2 commit b5b2785

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

highs/pdlp/HiPdlpWrapper.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
3030
// Indicate that no imprecise solution has (yet) been found
3131
resetModelStatusAndHighsInfo(model_status, highs_info);
3232

33-
Logger logger;
34-
logger.setLevel(options.log_dev_level);
35-
logger.passHighsLogOptions(options.log_options);
36-
logger.print_header();
37-
3833
/*** Order of operations
3934
* Preprocess with HiPdlp
4035
* Scale with HiPdlp
@@ -43,7 +38,7 @@ HighsStatus solveLpHiPdlp(const HighsOptions& options, HighsTimer& timer,
4338
* Postprocess with HiPDLP
4439
* ***/
4540
// 2. Preprocess with HiPdlp
46-
PDLPSolver pdlp(logger);
41+
PDLPSolver pdlp;
4742
pdlp.setParams(options, timer);
4843
HighsLp preprocessed_lp;
4944
pdlp.passLp(&lp);

highs/pdlp/hipdlp/pdhg.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ void PDLPSolver::postprocess(HighsSolution& solution) {
268268
logger_.info("Post-solve complete.");
269269
}
270270

271-
PDLPSolver::PDLPSolver(Logger& logger) : logger_(logger) {}
272-
273271
void PDLPSolver::solve(std::vector<double>& x, std::vector<double>& y) {
274272
Timer solver_timer;
275273

@@ -887,6 +885,10 @@ HighsStatus PDLPSolver::PowerMethod(double& op_norm_sq) {
887885
}
888886

889887
void PDLPSolver::setParams(const HighsOptions& options, HighsTimer& timer) {
888+
logger_.setLevel(options.log_dev_level);
889+
logger_.passHighsLogOptions(options.log_options);
890+
logger_.print_header();
891+
890892
params_.initialise();
891893
// params.eta = 0; Not set in parse_options_file
892894
// params.omega = 0; Not set in parse_options_file

highs/pdlp/hipdlp/pdhg.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
// --- Classes ---
3636
class PDLPSolver {
3737
public:
38-
PDLPSolver(Logger& logger);
3938
void setParams(const HighsOptions& options, HighsTimer& timer);
4039
void preprocessLp();
4140
void scaleProblem();
@@ -57,7 +56,7 @@ class PDLPSolver {
5756
HighsLp lp_; // The problem to solve
5857
const HighsLp* original_lp_; // The original problem (for postsolve)
5958
PrimalDualParams params_;
60-
Logger& logger_;
59+
Logger logger_;
6160

6261
int final_iter_count_ = 0;
6362
int original_num_col_;

0 commit comments

Comments
 (0)