Merge branch 'latest' into pr-2461

Author: galabovaa

CMakeLists.txt

@@ -500,7 +500,10 @@ if(ZLIB AND NOT TARGET ZLIB::ZLIB)
   find_package(ZLIB 1.2.3)
 endif()
 
-include(CPack)
+if(CPack_CMake_INCLUDED EQUAL 0)
+  include(CPack)
+endif()
+
 set(CPACK_PACKAGE_VERSION_MAJOR "${HIGHS_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${HIGHS_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${HIGHS_VERSION_PATCH}")

FEATURES.md

@@ -6,6 +6,9 @@ Forcing column reduction now checks the bound on the column dual rather than whe
 
 Now handling correctly the case where an infeasible MIP has a feasible relaxation, so no ray is computed fixing [#2415](https://github.com/ERGO-Code/HiGHS/issues/2415)
 
-Fixed minor bug exposed by [#2441](https://github.com/ERGO-Code/HiGHS/issues/2441) in Highs::setSolution() for a sparse user solution when the moidel is empty, and only clearing the dual data before solving with modified objective in Highs::multiobjectiveSolve() so that user-supplied solution is not cleared.
+Fixed minor bug exposed by [#2441](https://github.com/ERGO-Code/HiGHS/issues/2441) in `Highs::setSolution()` for a sparse user solution when the moidel is empty, and only clearing the dual data before solving with modified objective in `Highs::multiobjectiveSolve()` so that user-supplied solution is not cleared.
 
+The irreducible infeasibility system (IIS) facility now detects infeasibility due to bounds on constraint activity values (implied by variable bounds) being incompatible with constraint bounds. A `kIisStrategyLight mode` for the `iis_strategy` option has been introduced so that only infeasibility due to incompatible variable/constraint bounds and constraint activity values is checked for. The LP corresponding to any known IIS is now formed and held as a data member of the `HighsIis` class. It can be obtained as a const reference using `Highs::getIisLp()`, and written to a file using `Highs::writeIisModel(const std::string& filename = "")`
+
+Prompted by [#2463](https://github.com/ERGO-Code/HiGHS/issues/2463), the HiGHS solution and basis files now match data to any column and row names in the model, only assuming that the data are aligned with column and row indices if there are no names in the model. This requires a new version (v2) of the HiGHS basis file. Basis files from v1 are still read, but deprecated. Now, when writing out a model, basis or solution, column and row names are added to the model - previously they were created temporarily and inconsistentyly on the fly. If the model has existing names, then distinctive names are created to replace any blank names, but names with spaces or duplicate names yield an error status return.
 

check/TestBasis.cpp

@@ -56,8 +56,16 @@ TEST_CASE("Basis-file", "[highs_basis_file]") {
   f << "HiGHS v1" << std::endl;
   f << "None" << std::endl;
   f.close();
-  return_status = highs.readBasis(invalid_basis_file);
-  REQUIRE(return_status == HighsStatus::kOk);
+  // HiGHS v1 basis file is deprecated, but read, so warning is
+  // returned
+  REQUIRE(highs.readBasis(invalid_basis_file) == HighsStatus::kWarning);
+
+  // Write and read a file for an invalid basis
+  f.open(invalid_basis_file, std::ios::out);
+  f << "HiGHS_basis_file v2" << std::endl;
+  f << "None" << std::endl;
+  f.close();
+  REQUIRE(highs.readBasis(invalid_basis_file) == HighsStatus::kOk);
 
   // Write and read a file for incompatible number of columns
   f.open(invalid_basis_file, std::ios::out);

check/TestCAPI.c

@@ -617,7 +617,6 @@ void fullApi() {
 
   // Define all column names to be different
   for (HighsInt iCol = 0; iCol < num_col; iCol++) {
-    const char suffix = iCol + '0';
     char name[5];  // 3 chars prefix, 1 char iCol, 1 char 0-terminator
     sprintf(name, "%s%" HIGHSINT_FORMAT "", col_prefix, iCol);
     const char* name_p = name;
@@ -650,7 +649,6 @@ void fullApi() {
 
   // Define all row names to be different
   for (HighsInt iRow = 0; iRow < num_row; iRow++) {
-    const char suffix = iRow + '0';
     char name[5];  // 3 chars prefix, 1 char iCol, 1 char 0-terminator
     sprintf(name, "%s%" HIGHSINT_FORMAT "", row_prefix, iRow);
     const char* name_p = name;
@@ -1991,7 +1989,7 @@ void testDualRayTwice() {
   void* highs = Highs_create();
   Highs_setBoolOptionValue(highs, "output_flag", dev_run);
   int ret;
-  double INF = Highs_getInfinity(highs);
+  double inf = Highs_getInfinity(highs);
   ret = Highs_changeObjectiveOffset(highs, 0.0);
   assert(ret == 0);
   ret = Highs_setStringOptionValue(highs, "presolve", "off");
@@ -2000,9 +1998,9 @@ void testDualRayTwice() {
   assert(ret == 0);
   ret = Highs_addCol(highs, 0.0, 0.0, 0.0, 0, NULL, NULL);
   assert(ret == 0);
-  ret = Highs_addCol(highs, -1.0, 0.0, INF, 0, NULL, NULL);
+  ret = Highs_addCol(highs, -1.0, 0.0, inf, 0, NULL, NULL);
   assert(ret == 0);
-  ret = Highs_addCol(highs, -1.0, 0.0, INF, 0, NULL, NULL);
+  ret = Highs_addCol(highs, -1.0, 0.0, inf, 0, NULL, NULL);
   assert(ret == 0);
   HighsInt index[2] = {2, 3};
   double value[2] = {1.0, -1.0};
@@ -2012,19 +2010,19 @@ void testDualRayTwice() {
   index[1] = 3;
   value[0] = 1.0;
   value[1] = 1.0;
-  ret = Highs_addRow(highs, 1.0, INF, 2, index, value);
+  ret = Highs_addRow(highs, 1.0, inf, 2, index, value);
   assert(ret == 0);
   index[0] = 0;
   index[1] = 2;
   value[0] = -2.0;
   value[1] = 1.0;
-  ret = Highs_addRow(highs, -INF, 0.0, 2, index, value);
+  ret = Highs_addRow(highs, -inf, 0.0, 2, index, value);
   assert(ret == 0);
   index[0] = 1;
   index[1] = 3;
   value[0] = -3.0;
   value[1] = 1.0;
-  ret = Highs_addRow(highs, -INF, 0.0, 2, index, value);
+  ret = Highs_addRow(highs, -inf, 0.0, 2, index, value);
   assert(ret == 0);
   ret = Highs_run(highs);
   assert(ret == 0);
@@ -2105,16 +2103,16 @@ void testDeleteRowResolveWithBasis() {
   void* highs = Highs_create();
   Highs_setBoolOptionValue(highs, "output_flag", dev_run);
   HighsInt ret;
-  double INF = Highs_getInfinity(highs);
+  double inf = Highs_getInfinity(highs);
   ret = Highs_addCol(highs, 0.0, 2.0, 2.0, 0, NULL, NULL);
-  ret = Highs_addCol(highs, 0.0, -INF, INF, 0, NULL, NULL);
-  ret = Highs_addCol(highs, 0.0, -INF, INF, 0, NULL, NULL);
+  ret = Highs_addCol(highs, 0.0, -inf, inf, 0, NULL, NULL);
+  ret = Highs_addCol(highs, 0.0, -inf, inf, 0, NULL, NULL);
   HighsInt index_1[2] = {0, 2};
   double value_1[2] = {2.0, -1.0};
   ret = Highs_addRow(highs, 0.0, 0.0, 2, index_1, value_1);
   HighsInt index_2[1] = {1};
   double value_2[1] = {6.0};
-  ret = Highs_addRow(highs, 10.0, INF, 1, index_2, value_2);
+  ret = Highs_addRow(highs, 10.0, inf, 1, index_2, value_2);
   Highs_run(highs);
   double col_value[3] = {0.0, 0.0, 0.0};
   Highs_getSolution(highs, col_value, NULL, NULL, NULL);
@@ -2129,30 +2127,145 @@ void testDeleteRowResolveWithBasis() {
   Highs_destroy(highs);
 }
 
+void testIis() {
+  void* highs = Highs_create();
+  Highs_setBoolOptionValue(highs, "output_flag", dev_run);
+  HighsInt ret;
+  double inf = Highs_getInfinity(highs);
+  // For the constraints
+  //
+  // x + y - z = 2
+  //
+  // x + y + z <= 5
+  //
+  // x + 2y + z <= 1
+  //
+  // with variables in [0, 1], constraints 0 and 2 form an IIS with
+  // 
+  // x free (so should be removed?); 0 <= y; 0 <= z
+  //
+  // x + y - z >= 2; x + 2y + z <= 1
+  //
+  ret = Highs_addCol(highs, 0.0, 0.0, 1.0, 0, NULL, NULL);
+  assert(ret == 0);
+  ret = Highs_addCol(highs, 0.0, 0.0, 1.0, 0, NULL, NULL);
+  assert(ret == 0);
+  ret = Highs_addCol(highs, 0.0, 0.0, 1.0, 0, NULL, NULL);
+  assert(ret == 0);
+  HighsInt index[3] = {0, 1, 2};
+  double value_1[3] = {1, 1, -1};
+  double value_2[3] = {1, 1, 1};
+  double value_3[3] = {1, 2, 1};
+  ret = Highs_addRow(highs,  2.0, 2.0, 3, index, value_1);
+  assert(ret == 0);
+  ret = Highs_addRow(highs, -inf, 5.0, 3, index, value_2);
+  assert(ret == 0);
+  ret = Highs_addRow(highs, -inf, 1.0, 3, index, value_3);
+  assert(ret == 0);
+
+  HighsInt num_col;
+  HighsInt num_row;
+  HighsInt num_nz;
+  HighsInt sense;
+  double offset;
+  ret = Highs_getLp(highs, kHighsMatrixFormatRowwise,
+		    &num_col, &num_row, &num_nz,
+		    &sense, &offset,
+		    NULL, NULL, NULL, 
+		    NULL, NULL,
+		    NULL, NULL, NULL,
+		    NULL);
+
+  for (int k = 0 ; k < 2; k++) {
+    HighsInt iis_num_col;
+    HighsInt iis_num_row;
+    ret = Highs_getIis(highs,
+		       &iis_num_col, &iis_num_row,
+		       NULL, NULL,
+		       NULL, NULL,
+		       NULL, NULL);
+    assert(ret == 0);
+
+    if (k == 0) {
+      // No IIS from kHighsIisStrategyLight
+      assert(iis_num_col == 0);
+      assert(iis_num_row == 0);
+      Highs_setIntOptionValue(highs, "iis_strategy",
+			      kHighsIisStrategyFromLpRowPriority);
+    } else {
+      assert(iis_num_col == 3);
+      assert(iis_num_row == 2);
+      HighsInt* col_index = (HighsInt*)malloc(sizeof(HighsInt) * iis_num_col);
+      HighsInt* row_index = (HighsInt*)malloc(sizeof(HighsInt) * iis_num_row);
+      HighsInt* col_bound = (HighsInt*)malloc(sizeof(HighsInt) * iis_num_col);
+      HighsInt* row_bound = (HighsInt*)malloc(sizeof(HighsInt) * iis_num_row);
+      HighsInt* col_status = (HighsInt*)malloc(sizeof(HighsInt) * num_col);
+      HighsInt* row_status = (HighsInt*)malloc(sizeof(HighsInt) * num_row);
+      ret = Highs_getIis(highs,
+			 &iis_num_col, &iis_num_row,
+			 col_index, row_index,
+			 col_bound, row_bound,
+			 col_status, row_status);
+      assert(ret == 0);
+      
+      assert(col_index[0] == 0);
+      assert(col_index[1] == 1);
+      assert(col_index[2] == 2);
+
+      assert(row_index[0] == 0);
+      assert(row_index[1] == 2);
+
+      assert(col_bound[0] == kHighsIisBoundFree);
+      assert(col_bound[1] == kHighsIisBoundLower);
+      assert(col_bound[2] == kHighsIisBoundLower);
+
+      assert(row_bound[0] == kHighsIisBoundLower);
+      assert(row_bound[1] == kHighsIisBoundUpper);
+
+      assert(col_status[0] == kHighsIisStatusInConflict);
+      assert(col_status[1] == kHighsIisStatusInConflict);
+      assert(col_status[2] == kHighsIisStatusInConflict);
+      
+      assert(row_status[0] == kHighsIisStatusInConflict);
+      assert(row_status[1] == kHighsIisStatusNotInConflict);
+      assert(row_status[2] == kHighsIisStatusInConflict);
+      
+      free(col_index);
+      free(row_index);
+      free(col_bound);
+      free(row_bound);
+      free(col_status);
+      free(row_status);
+    }
+  }
+
+  Highs_destroy(highs);
+}
+
 int main() {
-  minimalApiIllegalLp();
-  testCallback();
-  versionApi();
-  fullApi();
-  minimalApiLp();
-  minimalApiMip();
-  minimalApiQp();
-  fullApiOptions();
-  fullApiLp();
-  fullApiMip();
-  fullApiQp();
-  passPresolveGetLp();
-  options();
-  testGetColsByRange();
-  testPassHessian();
-  testRanging();
-  testFeasibilityRelaxation();
-  testGetModel();
-  testMultiObjective();
-  testQpIndefiniteFailure();
-  testDualRayTwice();
-
-  testDeleteRowResolveWithBasis();
+    minimalApiIllegalLp();
+    testCallback();
+    versionApi();
+    fullApi();
+    minimalApiLp();
+    minimalApiMip();
+    minimalApiQp();
+    fullApiOptions();
+    fullApiLp();
+    fullApiMip();
+    fullApiQp();
+    passPresolveGetLp();
+    options();
+    testGetColsByRange();
+    testPassHessian();
+    testRanging();
+    testFeasibilityRelaxation();
+    testGetModel();
+    testMultiObjective();
+    testQpIndefiniteFailure();
+    testDualRayTwice();
+    testDeleteRowResolveWithBasis();
+  testIis();
   return 0;
 }
 //  testSetSolution();