Merge pull request #2830 from ERGO-Code/fix-2489

Fix 2489

Author: jajhall

check/TestQpSolver.cpp

@@ -1138,3 +1138,39 @@ TEST_CASE("rowless-qp", "[qpsolver]") {
 
   highs.resetGlobalScheduler(true);
 }
+
+TEST_CASE("2489", "[qpsolver]") {
+  // This QP is
+  //
+  // Min, x^2/2 + x
+  //
+  // 0*x + 0*y <= 1
+  //
+  // -10 <= (x, y) <= 10
+  //
+  // Hence it has a constraint, but its coefficients are zero
+  Highs h;
+  h.setOptionValue("output_flag", dev_run);
+  REQUIRE(h.setOptionValue("log_dev_level", 3) == HighsStatus::kOk);
+  REQUIRE(h.setOptionValue("time_limit", 3) == HighsStatus::kOk);
+  REQUIRE(h.setOptionValue("qp_iteration_limit", 10) == HighsStatus::kOk);
+  REQUIRE(h.addCol(1.0, -10.0, 10.0, 0, NULL, NULL) == HighsStatus::kOk);
+  REQUIRE(h.addCol(0.0, -10.0, 10.0, 0, NULL, NULL) == HighsStatus::kOk);
+  REQUIRE(h.addRow(0.0, 0.0, 0, NULL, NULL) == HighsStatus::kOk);
+  HighsHessian hessian;
+  hessian.dim_ = 1;
+  hessian.format_ = HessianFormat::kTriangular;
+  hessian.start_ = {0, 1};
+  hessian.index_ = {0};
+  hessian.value_ = {1.0};
+  REQUIRE(h.passHessian(hessian) == HighsStatus::kOk);
+  HighsStatus run_status = h.run();
+  if (dev_run)
+    printf("Test 2489: run_status = %s\n",
+           run_status == HighsStatus::kError     ? "Error"
+           : run_status == HighsStatus::kWarning ? "Warning"
+                                                 : "OK");
+  REQUIRE(run_status == HighsStatus::kWarning);
+
+  h.resetGlobalScheduler(true);
+}

highs/lp_data/Highs.cpp

@@ -4010,7 +4010,11 @@ HighsStatus Highs::callSolveQp() {
   Statistics stats;
 
   settings.reportingfequency = 100;
-
+  if (options_.qp_iteration_limit <= 10) {
+    settings.reportingfequency = 1;
+  } else if (options_.qp_iteration_limit <= 100) {
+    settings.reportingfequency = 10;
+  }
   // Setting qp_update_limit = 10 leads to error with lpHighs3
   const HighsInt qp_update_limit = 1000;  // 1000; // default
   if (qp_update_limit != settings.reinvertfrequency) {

highs/model/HighsHessianUtils.cpp

@@ -126,10 +126,11 @@ void completeHessianDiagonal(const HighsOptions& options,
       num_missing_diagonal_entries++;
     }
   }
-  highsLogDev(options.log_options, HighsLogType::kInfo,
-              "Hessian has dimension %d and %d nonzeros: inserting %d zeros "
-              "onto the diagonal\n",
-              (int)dim, (int)num_nz, (int)num_missing_diagonal_entries);
+  if (num_missing_diagonal_entries > 0)
+    highsLogDev(options.log_options, HighsLogType::kInfo,
+                "Hessian has dimension %d and %d nonzeros: inserting %d zeros "
+                "onto the diagonal\n",
+                int(dim), int(num_nz), int(num_missing_diagonal_entries));
   assert(num_missing_diagonal_entries >= dim - num_nz);
   if (!num_missing_diagonal_entries) return;
   // There are missing diagonal entries to be inserted as explicit zeros

highs/qpsolver/basis.cpp

@@ -64,16 +64,6 @@ void Basis::build() {
     baseindex[counter++] = i;
   }
 
-  const bool empty_matrix = (int)Atran.index.size() == 0;
-  if (empty_matrix) {
-    // The index/value vectors have size zero if the matrix has no
-    // columns. However, in the Windows build, referring to index 0 of a
-    // vector of size zero causes a failure, so resize to 1 to prevent
-    // this.
-    assert(Atran.num_col == 0);
-    Atran.index.resize(1);
-    Atran.value.resize(1);
-  }
   basisfactor.setup(Atran.num_col, Atran.num_row, Atran.start.data(),
                     Atran.index.data(), Atran.value.data(), baseindex.data());
   basisfactor.build();