Separate functions to set options, timer, callback

Author: filikat

highs/ipm/IpxWrapper.cpp

@@ -460,6 +460,8 @@ HighsStatus solveLpHipo(const HighsOptions& options, HighsTimer& timer,
   if (!options.output_flag | !options.log_to_console)
     hipo_options.display = false;
 
+  hipo_options.log_options = &options.log_options;
+
   // Debug option is already considered through log_options.log_dev_level in
   // hipo::LogHighs::debug
 
@@ -539,7 +541,9 @@ HighsStatus solveLpHipo(const HighsOptions& options, HighsTimer& timer,
   // block size option
   hipo_options.block_size = options.hipo_block_size;
 
-  hipo.set(hipo_options, options.log_options, callback, timer);
+  hipo.setOptions(hipo_options);
+  hipo.setTimer(timer);
+  hipo.setCallback(callback);
 
   // Transform problem to correct formulation
   hipo::Int num_col, num_row;

highs/ipm/hipo/ipm/LogHighs.cpp

@@ -2,8 +2,8 @@
 
 namespace hipo {
 
-void LogHighs::setOptions(const HighsLogOptions& log_options) {
-  log_options_ = &log_options;
+void LogHighs::setOptions(const HighsLogOptions* log_options) {
+  log_options_ = log_options;
 }
 
 bool LogHighs::debug(Int level) const {

highs/ipm/hipo/ipm/LogHighs.h

@@ -12,7 +12,7 @@ class LogHighs : public Log {
   const HighsLogOptions* log_options_;
 
  public:
-  void setOptions(const HighsLogOptions& log_options);
+  void setOptions(const HighsLogOptions* log_options);
   bool debug(Int level) const override;
 
   void print(std::stringstream& ss) const override;

highs/ipm/hipo/ipm/Options.h

@@ -54,6 +54,7 @@ struct Options {
   bool display = true;
   bool display_ipx = false;
   bool timeless_log = false;
+  const HighsLogOptions* log_options = nullptr;
 };
 
 }  // namespace hipo

highs/ipm/hipo/ipm/Solver.cpp

@@ -29,14 +29,14 @@ Int Solver::load(const Int num_var, const Int num_con, const double* obj,
   return 0;
 }
 
-void Solver::set(const Options& options, const HighsLogOptions& log_options,
-                 HighsCallback& callback, const HighsTimer& timer) {
+void Solver::setOptions(const Options& options) {
   options_ = options;
-  if (options_.display) logH_.setOptions(log_options);
+  if (options_.display) logH_.setOptions(options_.log_options);
+}
+void Solver::setCallback(HighsCallback& callback) {
   control_.setCallback(callback);
-  control_.setTimer(timer);
-  control_.setOptions(options);
 }
+void Solver::setTimer(const HighsTimer& timer) { control_.setTimer(timer); }
 
 void Solver::solve() {
   if (!model_.ready()) {

highs/ipm/hipo/ipm/Solver.h

@@ -93,8 +93,9 @@ class Solver {
   // ===================================================================================
   // Specify options, callback and timer.
   // ===================================================================================
-  void set(const Options& options, const HighsLogOptions& log_options,
-           HighsCallback& callback, const HighsTimer& timer);
+  void setOptions(const Options& options);
+  void setCallback(HighsCallback& callback);
+  void setTimer(const HighsTimer& timer);
 
   // ===================================================================================
   // Solve the LP