debug

Author: filikat

highs/ipm/hipo/factorhighs/DenseFactHybrid.cpp

@@ -76,19 +76,9 @@ Int denseFactFH(char format, Int n, Int k, Int nb, double* A, double* B,
     // number of rows left below block j
     const Int M = n - nb * j - jb;
 
-    // block of columns below diagonal block j
-    const Int64 R_pos = diag_start[j] + this_diag_size;
-    double* R = &A[R_pos];
-
     // ===========================================================================
     // FACTORISE DIAGONAL BLOCK
     // ===========================================================================
-    double max_in_R = -1.0;
-    if (jb == 1) {
-      for (Int64 i = 0; i < M * jb; ++i)
-        max_in_R = std::max(max_in_R, std::abs(R[i]));
-    }
-
     double* regul_current = &totalreg[j * nb];
     std::vector<Int> pivot_sign_current(&pivot_sign[j * nb],
                                         &pivot_sign[j * nb] + jb);
@@ -100,14 +90,19 @@ Int denseFactFH(char format, Int n, Int k, Int nb, double* A, double* B,
     if (info != 0) return info;
 
 #ifdef HIPO_PIVOTING
-    // swap columns in R
-    applySwaps(swaps_current, M, jb, R, data);
-
     // unswap regularisation, to keep it with original ordering
     permuteWithSwaps(regul_current, swaps_current, jb, true);
 #endif
 
     if (M > 0) {
+      // block of columns below diagonal block j
+      const Int64 R_pos = diag_start[j] + this_diag_size;
+      double* R = &A[R_pos];
+
+#ifdef HIPO_PIVOTING
+      // swap columns in R
+      applySwaps(swaps_current, M, jb, R, data);
+#endif
       // ===========================================================================
       // SOLVE COLUMNS
       // ===========================================================================

highs/ipm/hipo/factorhighs/FormatHandler.h

@@ -88,7 +88,7 @@ class FormatHandler {
   virtual void extremeEntries() {}
 };
 
-const Int64 extra_space_frontal = 1;
+const Int64 extra_space_frontal = 0;
 
 }  // namespace hipo