Added info about matrix structure time

Author: filikat

highs/ipm/hipo/factorhighs/Factorise.cpp

@@ -20,7 +20,7 @@ Factorise::Factorise(const Symbolic& S, const std::vector<Int>& rowsA,
                      const std::vector<double>& valA, const Regul& regul,
                      const Log* log, DataCollector& data,
                      std::vector<std::vector<double>>& sn_columns)
-    : S_{S}, regul_{regul}, log_{log}, data_{data}, sn_columns_{sn_columns} {
+    : S_{S}, sn_columns_{sn_columns}, regul_{regul}, log_{log}, data_{data} {
   // Input the symmetric matrix to be factorised in CSC format and the symbolic
   // factorisation coming from Analyse.
   // Only the lower triangular part of the matrix is used.

highs/ipm/hipo/ipm/FactorHiGHSSolver.cpp

@@ -33,6 +33,8 @@ Int getASstructure(const HighsSparseMatrix& A, std::vector<Int>& ptr,
   Int mA = A.num_row_;
   Int nzA = A.numNz();
 
+  if (nA + nzA + mA > kHighsIInf) return kStatusOoM;
+
   ptr.resize(nA + mA + 1);
   rows.resize(nA + nzA + mA);
 
@@ -408,8 +410,11 @@ Int FactorHiGHSSolver::analyseAS(Symbolic& S) {
   // Perform analyse phase of augmented system and return symbolic factorisation
   // in object S and the status.
 
+  Clock clock;
   std::vector<Int> ptrLower, rowsLower;
-  getASstructure(model_.A(), ptrLower, rowsLower);
+  if (Int status = getASstructure(model_.A(), ptrLower, rowsLower))
+    return status;
+  if (info_) 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);
@@ -418,7 +423,7 @@ Int FactorHiGHSSolver::analyseAS(Symbolic& S) {
 
   log_.printDevInfo("Performing AS analyse phase\n");
 
-  Clock clock;
+  clock.start();
   Int status = FH_.analyse(S, rowsLower, ptrLower, pivot_signs);
   if (info_) info_->analyse_AS_time = clock.stop();
 
@@ -437,14 +442,16 @@ Int FactorHiGHSSolver::analyseNE(Symbolic& S, int64_t nz_limit) {
 
   log_.printDevInfo("Building NE structure\n");
 
-  if (buildNEstructureDense(model_.A(), nz_limit)) return kStatusOoM;
+  Clock clock;
+  if (Int status = buildNEstructureDense(model_.A(), nz_limit)) return status;
+  if (info_) info_->matrix_structure_time = clock.stop();
 
   // create vector of signs of pivots
   std::vector<Int> pivot_signs(model_.A().num_row_, 1);
 
   log_.printDevInfo("Performing NE analyse phase\n");
 
-  Clock clock;
+  clock.start();
   Int status = FH_.analyse(S, rowsNE_, ptrNE_, pivot_signs);
   if (info_) info_->analyse_NE_time = clock.stop();
 

highs/ipm/hipo/ipm/Info.h

@@ -43,6 +43,7 @@ struct Info {
   double analyse_NE_time{};
   double analyse_AS_time{};
   double matrix_time{};
+  double matrix_structure_time{};
   double factor_time{};
   double solve_time{};
 

highs/ipm/hipo/ipm/Solver.cpp

@@ -1471,6 +1471,8 @@ void Solver::printSummary() const {
                << fix(info_.analyse_NE_time, 0, 2) << '\n';
     log_stream << textline("Matrix time:") << fix(info_.matrix_time, 0, 2)
                << '\n';
+    log_stream << textline("Matrix structure time:")
+               << fix(info_.matrix_structure_time, 0, 2) << '\n';
     log_stream << textline("Factorisation time:")
                << fix(info_.factor_time, 0, 2) << '\n';
     log_stream << textline("Solve time:") << fix(info_.solve_time, 0, 2)