Merge branch 'fix-2643' of https://github.com/ERGO-Code/HiGHS into fix-2643

Author: jajhall

THIRD_PARTY_NOTICES.md

@@ -0,0 +1,77 @@
+# Third Party Licenses and Acknowledgements
+
+The majority of the HiGHS source code is available under the [MIT license](https://opensource.org/license/MIT).
+
+Code in the `/extern` directory was originally developed by third-parties and is
+licensed under additional licenses.
+
+## amd
+
+The source code in `/extern/amd` is distributed under the [BSD-3 license](https://opensource.org/license/bsd-3-clause)
+at `/extern/amd/License.txt`.
+
+It was originally developed by Timothy Davis.
+
+The upstream source code is available at:
+
+ * https://github.com/DrTimothyAldenDavis/SuiteSparse
+
+To avoid compiling this code into HiGHS, use `-DHIPO=OFF`.
+
+## filereaderlp
+
+The source code in `/extern/filereaderlp` is distributed under the [MIT license](https://opensource.org/license/MIT)
+at `/extern/filereaderlp/LICENSE`.
+
+It was originally developed by Michael Feldmeier.
+
+The upstream source code is available at:
+
+ * https://github.com/feldmeier/FilereaderLP
+
+## metis
+
+The source code in `/extern/metis` is distributed under the [Apache 2.0 license](https://opensource.org/license/apache-2-0)
+at `/extern/metis/LICENSE.txt`.
+
+It was originally developed by George Karypis.
+
+The upstream source code is available at:
+
+ * https://github.com/KarypisLab/METIS
+ * https://github.com/KarypisLab/GKlib
+
+To avoid compiling this code into HiGHS, use `-DHIPO=OFF`.
+
+## pdqsort
+
+The source code in `/extern/pdqsort` is distributed under the [zlib license](https://opensource.org/license/zlib)
+at `/extern/pdqsort/license.txt`.
+
+It was originally developed by Orson Peters.
+
+The upstream source code is available at:
+
+ * https://github.com/orlp/pdqsort
+
+## rcm
+
+The source code in `/extern/rcm` is distributed under the [MIT license](https://opensource.org/license/MIT)
+at `/extern/rcm/LICENSE`.
+
+It was originally developed by Alan George, Joseph Liu, and John Burkardt.
+
+The upstream source code is available at:
+
+ * https://people.sc.fsu.edu/~jburkardt/cpp_src/rcm/rcm.html
+
+## zstr
+
+The source code in `/extern/zstr` is distributed under the [MIT license](https://opensource.org/license/MIT)
+at `/extern/zstr/LICENSE`.
+
+It was originally developed by Matei David.
+
+The upstream source code is available at:
+
+ * https://github.com/mateidavid/zstr

check/TestCAPI.c

@@ -238,6 +238,31 @@ void assertLogical(const char* name, const HighsInt is) {
   }
 }
 
+void createBlendingLp(void* highs) {
+  // Special variant of the blending LP, with redundant constraint so
+  // that LP is reduced by presolve - but not to empty!
+  const double inf = Highs_getInfinity(highs);
+
+  HighsInt num_col = 2;
+  HighsInt num_row = 3;
+  HighsInt num_nz = 6;
+  HighsInt sense = -1;
+  double col_cost[2] = {8, 10};
+  double col_lower[2] = {0, 0};
+  double col_upper[2] = {inf, inf};
+  double row_lower[3] = {-inf, -inf, -inf};
+  double row_upper[3] = {500, 120, 210};
+  HighsInt a_index[6] = {0, 1, 0, 1, 0, 1};
+  double a_value[6] = {0.5, 0.5, 0.3, 0.5, 0.7, 0.5};
+  HighsInt a_start[3] = {0, 2, 4};
+  Highs_addVars(highs, num_col, col_lower, col_upper);
+  Highs_changeColsCostByRange(highs, 0, num_col - 1, col_cost);
+  Highs_addRows(highs, num_row, row_lower, row_upper, num_nz, a_start, a_index,
+                a_value);
+  Highs_changeObjectiveSense(highs, sense);
+}
+
+// Test methods
 void versionApi() {
   if (dev_run) {
     printf("HiGHS version %s\n", Highs_version());
@@ -530,80 +555,28 @@ void minimalApiIllegalLp() {
   assert(model_status == kHighsModelStatusNotset);
 }
 
-void fullApi() {
+void testNames() {
   void* highs = Highs_create();
 
   if (!dev_run) Highs_setBoolOptionValue(highs, "output_flag", 0);
 
-  HighsInt num_col = 2;
-  HighsInt num_row = 2;
-  HighsInt num_nz = 4;
-  HighsInt a_format = kHighsMatrixFormatRowwise;
-  HighsInt sense = kHighsObjSenseMinimize;
-  double offset = 0;
-  double cc[2] = {1.0, -2.0};
-  double cl[2] = {0.0, 0.0};
-  double cu[2] = {10.0, 10.0};
-  double rl[2] = {0.0, 0.0};
-  double ru[2] = {2.0, 1.0};
-  HighsInt a_start[3] = {0, 2, 4};
-  HighsInt a_index[4] = {0, 1, 0, 1};
-  double a_value[4] = {1.0, 2.0, 1.0, 3.0};
-
-  assert(Highs_addCols(highs, 2, cc, cl, cu, 0, NULL, NULL, NULL) == 0);
-  assert(Highs_addRows(highs, 2, rl, ru, 4, a_start, a_index, a_value) == 0);
+  createBlendingLp(highs);
 
-  assert(Highs_getNumCols(highs) == num_col);
-  assert(Highs_getNumRows(highs) == num_row);
-  assert(Highs_getNumNz(highs) == num_nz);
-  assert(Highs_getHessianNumNz(highs) == 0);
-
-  HighsInt ck_num_col;
-  HighsInt ck_num_row;
-  HighsInt ck_num_nz;
-  HighsInt ck_sense;
-  double ck_offset;
-  double ck_cc[2];
-  double ck_cl[2];
-  double ck_cu[2];
-  double ck_rl[2];
-  double ck_ru[2];
-  HighsInt ck_a_start[3];
-  HighsInt ck_a_index[4];
-  double ck_a_value[4];
   HighsInt return_status;
-  return_status = Highs_getModel(
-      highs, a_format, 0, &ck_num_col, &ck_num_row, &ck_num_nz, NULL, &ck_sense,
-      &ck_offset, ck_cc, ck_cl, ck_cu, ck_rl, ck_ru, ck_a_start, ck_a_index,
-      ck_a_value, NULL, NULL, NULL, NULL);
-  assert(return_status == kHighsStatusOk);
 
-  assert(ck_num_col == num_col);
-  assert(ck_num_row == num_row);
-  assert(ck_num_nz == num_nz);
-  assert(ck_sense == sense);
-  assert(ck_offset == offset);
-  assert(doubleArraysEqual(num_col, ck_cc, cc));
-  assert(doubleArraysEqual(num_col, ck_cl, cl));
-  assert(doubleArraysEqual(num_col, ck_cu, cu));
-  assert(doubleArraysEqual(num_row, ck_rl, rl));
-  assert(doubleArraysEqual(num_row, ck_ru, ru));
-  assert(highsIntArraysEqual(num_col, ck_a_start, a_start));
-  assert(highsIntArraysEqual(num_nz, ck_a_index, a_index));
-  assert(doubleArraysEqual(num_nz, ck_a_value, a_value));
-
-  return_status = Highs_run(highs);
-  assert(return_status == kHighsStatusOk);
+  HighsInt num_col = Highs_getNumCols(highs);
+  HighsInt num_row = Highs_getNumRows(highs);
 
   char* col_prefix = "Col";
   char* row_prefix = "Row";
   // Check index out of bounds
+
   return_status = Highs_passColName(highs, -1, col_prefix);
   assert(return_status == kHighsStatusError);
-  return_status = Highs_passColName(highs, num_col, col_prefix);
-  assert(return_status == kHighsStatusError);
   return_status = Highs_passRowName(highs, -1, row_prefix);
   assert(return_status == kHighsStatusError);
+  return_status = Highs_passColName(highs, num_col, col_prefix);
+  assert(return_status == kHighsStatusError);
   return_status = Highs_passRowName(highs, num_row, row_prefix);
   assert(return_status == kHighsStatusError);
 
@@ -615,12 +588,12 @@ void fullApi() {
   return_status = Highs_writeModel(highs, "");
   assert(return_status == kHighsStatusError);
 
+  char name[5];  // 3 chars prefix, 1 char iCol, 1 char 0-terminator
+
   // Define all column names to be different
   for (HighsInt iCol = 0; iCol < num_col; iCol++) {
-    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;
-    return_status = Highs_passColName(highs, iCol, name_p);
+    return_status = Highs_passColName(highs, iCol, name);
     assert(return_status == kHighsStatusOk);
   }
   return_status = Highs_writeModel(highs, "");
@@ -629,7 +602,6 @@ void fullApi() {
   // Check that the columns can be found by name
   HighsInt ck_iCol;
   for (HighsInt iCol = 0; iCol < num_col; iCol++) {
-    char name[5];
     return_status = Highs_getColName(highs, iCol, name);
     assert(return_status == kHighsStatusOk);
     return_status = Highs_getColByName(highs, name, &ck_iCol);
@@ -649,10 +621,8 @@ void fullApi() {
 
   // Define all row names to be different
   for (HighsInt iRow = 0; iRow < num_row; iRow++) {
-    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;
-    return_status = Highs_passRowName(highs, iRow, name_p);
+    return_status = Highs_passRowName(highs, iRow, name);
     assert(return_status == kHighsStatusOk);
   }
   return_status = Highs_writeModel(highs, "");
@@ -672,21 +642,52 @@ void fullApi() {
   assert(return_status == kHighsStatusError);
 
   for (HighsInt iCol = 0; iCol < num_col; iCol++) {
-    char name[5];
-    char* name_p = name;
-    return_status = Highs_getColName(highs, iCol, name_p);
+    return_status = Highs_getColName(highs, iCol, name);
     assert(return_status == kHighsStatusOk);
     if (dev_run)
-      printf("Column %" HIGHSINT_FORMAT " has name %s\n", iCol, name_p);
+      printf("Column %" HIGHSINT_FORMAT " has name %s\n", iCol, name);
   }
 
   for (HighsInt iRow = 0; iRow < num_row; iRow++) {
-    char name[5];
-    char* name_p = name;
-    return_status = Highs_getRowName(highs, iRow, name_p);
+    return_status = Highs_getRowName(highs, iRow, name);
     assert(return_status == kHighsStatusOk);
     if (dev_run)
-      printf("Row    %" HIGHSINT_FORMAT " has name %s\n", iRow, name_p);
+      printf("Row    %" HIGHSINT_FORMAT " has name %s\n", iRow, name);
+  }
+
+  // Check extraction of names for the presolved LP, in which the
+  // first row is removed
+  Highs_presolve(highs);
+  if (dev_run) Highs_writePresolvedModel(highs, "");
+
+  HighsInt presolved_num_col = Highs_getPresolvedNumCol(highs);
+  HighsInt presolved_num_row = Highs_getPresolvedNumRow(highs);
+  assert(presolved_num_col == num_col);
+  assert(presolved_num_row == num_row-1);
+
+  char presolved_name[5];
+
+  return_status = Highs_getPresolvedColName(highs, -1, presolved_name);
+  assert(return_status == kHighsStatusError);
+  return_status = Highs_getPresolvedRowName(highs, -1, presolved_name);
+  assert(return_status == kHighsStatusError);
+  return_status = Highs_getPresolvedColName(highs, presolved_num_col, presolved_name);
+  assert(return_status == kHighsStatusError);
+  return_status = Highs_getPresolvedRowName(highs, presolved_num_row, presolved_name);
+  assert(return_status == kHighsStatusError);
+  
+  for (HighsInt iCol = 0; iCol < presolved_num_col; iCol++) {
+    return_status = Highs_getPresolvedColName(highs, iCol, presolved_name);
+    assert(return_status == kHighsStatusOk);
+    if (dev_run)
+      printf("Presolved column %" HIGHSINT_FORMAT " has name %s\n", iCol, presolved_name);
+  }
+
+  for (HighsInt iRow = 0; iRow < presolved_num_row; iRow++) {
+    return_status = Highs_getPresolvedRowName(highs, iRow, presolved_name);
+    assert(return_status == kHighsStatusOk);
+    if (dev_run)
+      printf("Presolved row    %" HIGHSINT_FORMAT " has name %s\n", iRow, presolved_name);
   }
 
   Highs_destroy(highs);
@@ -1799,18 +1800,25 @@ void testGetModel() {
   Highs_addRows(highs, num_row, row_lower, row_upper, num_nz, a_start, a_index,
                 a_value);
   Highs_changeObjectiveSense(highs, sense);
-  Highs_run(highs);
+
+  assert(Highs_getNumCols(highs) == num_col);
+  assert(Highs_getNumRows(highs) == num_row);
+  assert(Highs_getNumNz(highs) == num_nz);
+  assert(Highs_getHessianNumNz(highs) == 0);
 
   HighsInt ck_num_col;
   HighsInt ck_num_row;
   HighsInt ck_num_nz;
   HighsInt ck_sense;
   double ck_offset;
+  HighsInt a_format = kHighsMatrixFormatRowwise;
 
   // Get the model dimensions by passing array pointers as NULL
-  Highs_getLp(highs, kHighsMatrixFormatRowwise, &ck_num_col, &ck_num_row,
+  HighsInt return_status;
+  return_status = Highs_getLp(highs, a_format, &ck_num_col, &ck_num_row,
               &ck_num_nz, &ck_sense, &ck_offset, NULL, NULL, NULL, NULL, NULL,
               NULL, NULL, NULL, NULL);
+  assert(return_status == kHighsStatusOk);
 
   assert(ck_num_col == num_col);
   assert(ck_num_row == num_row);
@@ -1829,11 +1837,32 @@ void testGetModel() {
   double* ck_a_value = (double*)malloc(sizeof(double) * num_nz);
 
   // Get the arrays
-  Highs_getLp(highs, kHighsMatrixFormatRowwise, &ck_num_col, &ck_num_row,
+  return_status = Highs_getLp(highs, a_format, &ck_num_col, &ck_num_row,
               &ck_num_nz, &ck_sense, &ck_offset, ck_col_cost, ck_col_lower,
               ck_col_upper, ck_row_lower, ck_row_upper, ck_a_start, ck_a_index,
               ck_a_value, NULL);
+  assert(return_status == kHighsStatusOk);
+
+  assert(doubleArraysEqual(num_col, ck_col_cost, col_cost));
+  assert(doubleArraysEqual(num_col, ck_col_lower, col_lower));
+  assert(doubleArraysEqual(num_col, ck_col_upper, col_upper));
+  assert(doubleArraysEqual(num_row, ck_row_lower, row_lower));
+  assert(doubleArraysEqual(num_row, ck_row_upper, row_upper));
+  assert(highsIntArraysEqual(num_col, ck_a_start, a_start));
+  assert(highsIntArraysEqual(num_nz, ck_a_index, a_index));
+  assert(doubleArraysEqual(num_nz, ck_a_value, a_value));
 
+  return_status = Highs_getModel(
+      highs, a_format, 0, &ck_num_col, &ck_num_row, &ck_num_nz, NULL, &ck_sense,
+      &ck_offset, ck_col_cost, ck_col_lower,
+      ck_col_upper, ck_row_lower, ck_row_upper, ck_a_start, ck_a_index,
+      ck_a_value, NULL, NULL, NULL, NULL);
+  assert(return_status == kHighsStatusOk);
+
+  assert(ck_num_col == num_col);
+  assert(ck_num_row == num_row);
+  assert(ck_num_nz == num_nz);
+  assert(ck_sense == sense);
   assert(doubleArraysEqual(num_col, ck_col_cost, col_cost));
   assert(doubleArraysEqual(num_col, ck_col_lower, col_lower));
   assert(doubleArraysEqual(num_col, ck_col_upper, col_upper));
@@ -2458,7 +2487,6 @@ int main() {
   minimalApiIllegalLp();
   testCallback();
   versionApi();
-  fullApi();
   minimalApiLp();
   minimalApiMip();
   minimalApiQp();
@@ -2472,6 +2500,7 @@ int main() {
   testPassHessian();
   testRanging();
   testFeasibilityRelaxation();
+  testNames();
   testGetModel();
   testMultiObjective();
   testQpIndefiniteFailure();