Merge pull request #242 from fabinsch/more-debug-info

More information in debug mode

Author: jcarpent

include/proxsuite/proxqp/dense/model.hpp

@@ -100,40 +100,45 @@ struct Model
 
   bool is_valid(const bool box_constraints)
   {
-#define PROXSUITE_CHECK_SIZE(size, expected_size)                              \
-  if (size != 0) {                                                             \
-    if (!(size == expected_size))                                              \
-      return false;                                                            \
-  }
-
     // check that all matrices and vectors of qpmodel have the correct size
     // and that H and C have expected properties
-    PROXSUITE_CHECK_SIZE(g.size(), dim);
-    PROXSUITE_CHECK_SIZE(b.size(), n_eq);
-    PROXSUITE_CHECK_SIZE(u.size(), n_in);
-    PROXSUITE_CHECK_SIZE(l.size(), n_in);
+    PROXSUITE_CHECK_ARGUMENT_SIZE(g.size(), dim, "g has not the expected size.")
+    PROXSUITE_CHECK_ARGUMENT_SIZE(
+      b.size(), n_eq, "b has not the expected size.")
+    PROXSUITE_CHECK_ARGUMENT_SIZE(
+      l.size(), n_in, "l has not the expected size.")
+    PROXSUITE_CHECK_ARGUMENT_SIZE(
+      u.size(), n_in, "u has not the expected size.")
     if (box_constraints) {
-      PROXSUITE_CHECK_SIZE(u_box.size(), dim);
-      PROXSUITE_CHECK_SIZE(l_box.size(), dim);
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        u_box.size(), dim, "u_box has not the expected size");
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        l_box.size(), dim, "l_box has not the expected size");
     }
     if (H.size()) {
-      PROXSUITE_CHECK_SIZE(H.rows(), dim);
-      PROXSUITE_CHECK_SIZE(H.cols(), dim);
-      if (!H.isApprox(H.transpose(), 0.0))
-        return false;
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        H.rows(), dim, "H has not the expected number of rows.");
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        H.cols(), dim, "H has not the expected number of cols.");
+      PROXSUITE_THROW_PRETTY((!H.isApprox(H.transpose(), 0.0)),
+                             std::invalid_argument,
+                             "H is not symmetric.");
     }
     if (A.size()) {
-      PROXSUITE_CHECK_SIZE(A.rows(), n_eq);
-      PROXSUITE_CHECK_SIZE(A.cols(), dim);
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        A.rows(), n_eq, "A has not the expected number of rows.");
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        A.cols(), dim, "A has not the expected number of cols.");
     }
     if (C.size()) {
-      PROXSUITE_CHECK_SIZE(C.rows(), n_in);
-      PROXSUITE_CHECK_SIZE(C.cols(), dim);
-      if (C.isZero())
-        return false;
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        C.rows(), n_in, "C has not the expected number of rows.");
+      PROXSUITE_CHECK_ARGUMENT_SIZE(
+        C.cols(), dim, "C has not the expected number of cols.");
+      PROXSUITE_THROW_PRETTY(
+        C.isZero(), std::invalid_argument, "C is zero, while n_in != 0.");
     }
     return true;
-#undef PROXSUITE_CHECK_SIZE
   }
 };
 

include/proxsuite/proxqp/dense/solver.hpp

@@ -259,6 +259,11 @@ iterative_residual(const Model<T>& qpmodel,
       qpwork.err.head(qpmodel.dim).noalias() -= Hdx;
       break;
     case HessianType::Diagonal:
+#ifndef NDEBUG
+      PROXSUITE_THROW_PRETTY(!qpwork.H_scaled.isDiagonal(),
+                             std::invalid_argument,
+                             "H is not diagonal.");
+#endif
       Hdx.array() = qpwork.H_scaled.diagonal().array() *
                     qpwork.dw_aug.head(qpmodel.dim).array();
       qpwork.err.head(qpmodel.dim).noalias() -= Hdx;