Simplify

Author: filikat

highs/ipm/hipo/ipm/FactorHiGHSSolver.cpp

@@ -9,8 +9,8 @@
 namespace hipo {
 
 FactorHiGHSSolver::FactorHiGHSSolver(Options& options, const Model& model,
-                                     const Regularisation& regul, Info* info,
-                                     IpmData* record, const LogHighs& log)
+                                     const Regularisation& regul, Info& info,
+                                     IpmData& record, const LogHighs& log)
     : FH_(&log, options.block_size),
       S_{},
       regul_{regul},
@@ -256,7 +256,7 @@ Int FactorHiGHSSolver::factorAS(const HighsSparseMatrix& A,
     valLower[next++] = 0.0;
     ptrLower[nA + i + 1] = ptrLower[nA + i] + 1;
   }
-  if (info_) info_->matrix_time += clock.stop();
+  info_.matrix_time += clock.stop();
 
   // set static regularisation, since it may have changed
   FH_.setRegularisation(regul_.primal, regul_.dual);
@@ -265,10 +265,8 @@ Int FactorHiGHSSolver::factorAS(const HighsSparseMatrix& A,
   clock.start();
   if (FH_.factorise(S_, rowsLower, ptrLower, valLower))
     return kStatusErrorFactorise;
-  if (info_) {
-    info_->factor_time += clock.stop();
-    info_->factor_number++;
-  }
+  info_.factor_time += clock.stop();
+  info_.factor_number++;
 
   this->valid_ = true;
   return kStatusOk;
@@ -287,7 +285,7 @@ Int FactorHiGHSSolver::factorNE(const HighsSparseMatrix& A,
 
   // build matrix
   Int status = buildNEvalues(A, scaling);
-  if (info_) info_->matrix_time += clock.stop();
+  info_.matrix_time += clock.stop();
 
   // set static regularisation, since it may have changed
   FH_.setRegularisation(regul_.primal, regul_.dual);
@@ -299,10 +297,9 @@ Int FactorHiGHSSolver::factorNE(const HighsSparseMatrix& A,
   std::vector<Int> ptrNE(ptrNE_);
   std::vector<Int> rowsNE(rowsNE_);
   if (FH_.factorise(S_, rowsNE, ptrNE, valNE_)) return kStatusErrorFactorise;
-  if (info_) {
-    info_->factor_time += clock.stop();
-    info_->factor_number++;
-  }
+
+  info_.factor_time += clock.stop();
+  info_.factor_number++;
 
   this->valid_ = true;
   return kStatusOk;
@@ -318,13 +315,11 @@ Int FactorHiGHSSolver::solveNE(const std::vector<double>& rhs,
 
   Clock clock;
   if (FH_.solve(lhs)) return kStatusErrorSolve;
-  if (info_) {
-    info_->solve_time += clock.stop();
-    info_->solve_number++;
-  }
-  if (data_) {
-    data_->back().num_solves++;
-  }
+
+  info_.solve_time += clock.stop();
+  info_.solve_number++;
+
+  data_.back().num_solves++;
 
   return kStatusOk;
 }
@@ -345,13 +340,11 @@ Int FactorHiGHSSolver::solveAS(const std::vector<double>& rhs_x,
 
   Clock clock;
   if (FH_.solve(rhs)) return kStatusErrorSolve;
-  if (info_) {
-    info_->solve_time += clock.stop();
-    info_->solve_number++;
-  }
-  if (data_) {
-    data_->back().num_solves++;
-  }
+
+  info_.solve_time += clock.stop();
+  info_.solve_number++;
+
+  data_.back().num_solves++;
 
   // split lhs
   lhs_x = std::vector<double>(rhs.begin(), rhs.begin() + n);
@@ -377,7 +370,7 @@ Int FactorHiGHSSolver::analyseAS(Symbolic& S) {
   std::vector<Int> ptrLower, rowsLower;
   if (Int status = getASstructure(model_.A(), ptrLower, rowsLower))
     return status;
-  if (info_) info_->matrix_structure_time = clock.stop();
+  info_.matrix_structure_time = clock.stop();
 
   // create vector of signs of pivots
   std::vector<Int> pivot_signs(model_.A().num_col_ + model_.A().num_row_, -1);
@@ -388,7 +381,7 @@ Int FactorHiGHSSolver::analyseAS(Symbolic& S) {
 
   clock.start();
   Int status = FH_.analyse(S, rowsLower, ptrLower, pivot_signs);
-  if (info_) info_->analyse_AS_time = clock.stop();
+  info_.analyse_AS_time = clock.stop();
 
   if (status && log_.debug(2)) {
     log_.print("Failed augmented system:");
@@ -418,7 +411,7 @@ Int FactorHiGHSSolver::analyseNE(Symbolic& S, int64_t nz_limit) {
 
   Clock clock;
   if (Int status = buildNEstructure(model_.A(), nz_limit)) return status;
-  if (info_) info_->matrix_structure_time = clock.stop();
+  info_.matrix_structure_time = clock.stop();
 
   // create vector of signs of pivots
   std::vector<Int> pivot_signs(model_.A().num_row_, 1);
@@ -427,7 +420,7 @@ Int FactorHiGHSSolver::analyseNE(Symbolic& S, int64_t nz_limit) {
 
   clock.start();
   Int status = FH_.analyse(S, rowsNE_, ptrNE_, pivot_signs);
-  if (info_) info_->analyse_NE_time = clock.stop();
+  info_.analyse_NE_time = clock.stop();
 
   if (status && log_.debug(2)) {
     log_.print("Failed normal equations:");

highs/ipm/hipo/ipm/FactorHiGHSSolver.h

@@ -27,8 +27,8 @@ class FactorHiGHSSolver : public LinearSolver {
 
   const Regularisation& regul_;
 
-  Info* info_ = nullptr;
-  IpmData* data_ = nullptr;
+  Info& info_;
+  IpmData& data_;
   const LogHighs& log_;
 
   const Model& model_;
@@ -49,7 +49,7 @@ class FactorHiGHSSolver : public LinearSolver {
 
  public:
   FactorHiGHSSolver(Options& options, const Model& model,
-                    const Regularisation& regul, Info* info, IpmData* record,
+                    const Regularisation& regul, Info& info, IpmData& record,
                     const LogHighs& log);
 
   // Override functions

highs/ipm/hipo/ipm/IpmData.cpp

@@ -4,5 +4,6 @@ namespace hipo {
 
 void IpmData::append() { record.push_back({}); }
 IpmIterData& IpmData::back() { return record.back(); }
+const IpmIterData& IpmData::readBack() const { return record.back(); }
 
 }  // namespace hipo

highs/ipm/hipo/ipm/IpmData.h

@@ -30,6 +30,7 @@ struct IpmData {
   std::vector<IpmIterData> record;
   void append();
   IpmIterData& back();
+  const IpmIterData& readBack() const;
 };
 
 }  // namespace hipo