Highs::qFormatOk now allows square Hessian

Author: jajhall

check/TestCAPI.c

@@ -501,7 +501,7 @@ void minimalApiQp() {
   HighsInt a_index[2] = {0, 0};
   double a_value[2] = {1.0, 1.0};
 
-  // Start with triuangular Hessian, then 
+  // Start with triangular Hessian, then 
   HighsInt q_format = kHighsHessianFormatTriangular;
   HighsInt q_num_nz = 4;
   HighsInt q_start[3] = {0, 2, 3};
@@ -1546,9 +1546,9 @@ void testPassHessian() {
   for (HighsInt k = 0; k < 2; k++) {
     HighsInt q_format = -1;
     if (k == 0) {
-      q_format = 1;
+      q_format = kHighsHessianFormatTriangular;
     } else {
-      q_format = 2;
+      q_format = kHighsHessianFormatSquare;
     }
     return_status = Highs_passHessian(highs, 1, 1, q_format, start, index, value);
     assertIntValuesEqual("Return of passHessian", return_status, kHighsStatusOk);

check/TestQpSolver.cpp

@@ -1358,7 +1358,7 @@ TEST_CASE("pass-square-hessian", "[qpsolver]") {
   REQUIRE(h.run() == HighsStatus::kOk);
   REQUIRE(okValueDifference(info.objective_function_value,
                             optimal_objective_value));
-  
+
   h.resetGlobalScheduler(true);
 }
 

highs/lp_data/Highs.cpp

@@ -491,7 +491,7 @@ HighsStatus Highs::passModel(
     assert(q_value != NULL);
     HighsHessian& hessian = model.hessian_;
     hessian.dim_ = num_col;
-    hessian.format_ = HessianFormat::kTriangular;
+    hessian.format_ = static_cast<HessianFormat>(q_format);
     hessian.start_.assign(q_start, q_start + num_col);
     hessian.start_.resize(num_col + 1);
     hessian.start_[num_col] = q_num_nz;
@@ -556,7 +556,7 @@ HighsStatus Highs::passHessian(const HighsInt dim, const HighsInt num_nz,
   HighsInt num_col = model_.lp_.num_col_;
   if (dim != num_col) return HighsStatus::kError;
   hessian.dim_ = num_col;
-  hessian.format_ = HessianFormat::kTriangular;
+  hessian.format_ = static_cast<HessianFormat>(format);
   if (dim > 0) {
     assert(start != NULL);
     hessian.start_.assign(start, start + num_col);

highs/lp_data/HighsInterface.cpp

@@ -2865,25 +2865,24 @@ bool Highs::aFormatOk(const HighsInt num_nz, const HighsInt format) {
   if (!num_nz) return true;
   const bool ok_format = format == (HighsInt)MatrixFormat::kColwise ||
                          format == (HighsInt)MatrixFormat::kRowwise;
-  assert(ok_format);
   if (!ok_format)
-    highsLogUser(
-        options_.log_options, HighsLogType::kError,
-        "Non-empty Constraint matrix has illegal format = %" HIGHSINT_FORMAT
-        "\n",
-        format);
+    highsLogUser(options_.log_options, HighsLogType::kError,
+                 "Non-empty Constraint matrix has illegal format = %d\n",
+                 int(format));
+  assert(ok_format);
   return ok_format;
 }
 
 bool Highs::qFormatOk(const HighsInt num_nz, const HighsInt format) {
   if (!num_nz) return true;
-  const bool ok_format = format == (HighsInt)HessianFormat::kTriangular;
-  assert(ok_format);
+  const bool ok_format =
+      format == static_cast<HighsInt>(HessianFormat::kTriangular) ||
+      static_cast<HighsInt>(HessianFormat::kSquare);
   if (!ok_format)
-    highsLogUser(
-        options_.log_options, HighsLogType::kError,
-        "Non-empty Hessian matrix has illegal format = %" HIGHSINT_FORMAT "\n",
-        format);
+    highsLogUser(options_.log_options, HighsLogType::kError,
+                 "Non-empty Hessian matrix has illegal format = %d\n",
+                 int(format));
+  assert(ok_format);
   return ok_format;
 }