merge hipo-dev

Author: galabovaa

highs/ipm/hipo/factorhighs/Factorise.cpp

@@ -168,11 +168,34 @@ void Factorise::permute(const std::vector<Int>& iperm) {
   valA_ = std::move(new_val);
 }
 
+class TaskGroupSpecial : public highs::parallel::TaskGroup {
+  // Using TaskGroup may throw an exception when tasks are cancelled. Not sure
+  // exactly why this happens, but for now this fix seems to work.
+
+ public:
+  ~TaskGroupSpecial() {
+    // No virtual destructor in TaskGroup. Do not call this class via pointer to
+    // the base!
+
+    cancel();
+
+    // re-call taskWait if it throws, until it succeeds
+    while (true) {
+      try {
+        taskWait();
+        break;
+      } catch (HighsTask::Interrupt) {
+        continue;
+      }
+    }
+  }
+};
+
 void Factorise::processSupernode(Int sn) {
   // Assemble frontal matrix for supernode sn, perform partial factorisation and
   // store the result.
 
-  highs::parallel::TaskGroup tg;
+  TaskGroupSpecial tg;
 
   if (flag_stop_) return;
 
@@ -358,7 +381,7 @@ bool Factorise::run(Numeric& num) {
   Clock clock;
 #endif
 
-  highs::parallel::TaskGroup tg;
+  TaskGroupSpecial tg;
 
   total_reg_.assign(n_, 0.0);
 

highs/ipm/hipo/factorhighs/HybridHybridFormatHandler.cpp

@@ -154,6 +154,7 @@ void HybridHybridFormatHandler::assembleClique(const std::vector<double>& child,
 }
 
 void HybridHybridFormatHandler::extremeEntries() {
+#ifdef HIPO_COLLECT_EXPENSIVE_DATA
   double minD = 1e100;
   double maxD = 0.0;
   double minoffD = 1e100;
@@ -199,6 +200,7 @@ void HybridHybridFormatHandler::extremeEntries() {
   }
 
   data_.setExtremeEntries(minD, maxD, minoffD, maxoffD);
+#endif
 }
 
 }  // namespace hipo

highs/ipm/hipo/ipm/Solver.cpp

@@ -395,7 +395,7 @@ double Solver::stepToBoundary(const std::vector<double>& x,
   // Use lo=1 for xl and zl, lo=0 for xu and zu.
   // Return the blocking index in block.
 
-  const double damp = 1.0 - std::numeric_limits<double>::epsilon();
+  const double damp = 1.0 - 100.0 * std::numeric_limits<double>::epsilon();
 
   double alpha = 1.0;
   Int bl = -1;