Small bugs

Author: filikat

highs/ipm/hipo/factorhighs/Analyse.cpp

@@ -111,12 +111,12 @@ Int Analyse::getPermutation() {
   // fix seed of rng inside Metis, to make it deterministic (?)
   options[METIS_OPTION_SEED] = 42;
 
-  if (log_) log_->printDevInfo("Metis...");
+  if (log_) log_->printDevInfo("Metis...\n");
 
   Int status = METIS_NodeND(&n_, temp_ptr.data(), temp_rows.data(), NULL,
                             options, perm_.data(), iperm_.data());
 
-  if (log_) log_->printDevInfo("done\n");
+  if (log_) log_->printDevInfo("...done\n");
   if (status != METIS_OK) {
     if (log_) log_->printDevInfo("Error with Metis\n");
     return kRetMetisError;

highs/ipm/hipo/factorhighs/Symbolic.cpp

@@ -87,7 +87,8 @@ void Symbolic::print(const Log& log, bool verbose) const {
     log_stream << textline("Sn size <= 10:") << integer(sn_size_10_, 0) << '\n';
     log_stream << textline("Sn size <= 100:") << integer(sn_size_100_, 0)
                << '\n';
-    log_stream << textline("Sn avg size:") << sci(n_, 0, 1) << '\n';
+    log_stream << textline("Sn avg size:") << sci((double)n_ / sn_, 0, 1)
+               << '\n';
   }
 
   log_stream << '\n';

highs/ipm/hipo/ipm/FactorHiGHSSolver.cpp

@@ -480,8 +480,9 @@ Int FactorHiGHSSolver::chooseNla() {
   } else {
     // If NE has more nonzeros than the factor of AS, then it's likely that AS
     // will be preferred, so stop computation of NE.
-    const int64_t NE_nz_limit = failure_AS ? std::numeric_limits<Int>::max()
-                                           : symb_AS.nz() * kSymbNzMult;
+    int64_t NE_nz_limit = symb_AS.nz() * kSymbNzMult;
+    if (failure_AS || NE_nz_limit > std::numeric_limits<Int>::max())
+      NE_nz_limit = std::numeric_limits<Int>::max();
 
     Int NE_status = analyseNE(symb_NE, NE_nz_limit);
     if (NE_status) failure_NE = true;