Need to have HighsIis::getLp working for row-wise incumbent LP

Author: jajhall

check/TestCAPI.c

@@ -1991,7 +1991,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 +2000,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 +2012,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 +2105,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);
@@ -2131,6 +2131,54 @@ void testDeleteRowResolveWithBasis() {
 
 void testIis() {
   void* highs = Highs_create();
+  //  Highs_setBoolOptionValue(highs, "output_flag", dev_run);
+  HighsInt ret;
+  double inf = Highs_getInfinity(highs);
+  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, inf, 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 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);
+
+  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 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);
+  Highs_run(highs);
+
   Highs_destroy(highs);
 }
 

highs/interfaces/highs_c_api.cpp

@@ -1299,9 +1299,9 @@ HighsInt Highs_getPresolvedLp(const void* highs, const HighsInt a_format,
                               a_start, a_index, a_value, integrality);
 }
 
-HighsInt Highs_getIis(const void* highs,
-		      HighsInt iis_num_col,
-		      HighsInt iis_num_row,
+HighsInt Highs_getIis(void* highs,
+		      HighsInt* iis_num_col,
+		      HighsInt* iis_num_row,
 		      HighsInt* col_index,
 		      HighsInt* row_index,
 		      HighsInt* col_bound,
@@ -1312,25 +1312,25 @@ HighsInt Highs_getIis(const void* highs,
   HighsIis iis;
   HighsInt status = (HighsInt)((Highs*)highs)->getIis(iis);
   if (status == (HighsInt)HighsStatus::kError) return status;
-  iis_num_col = iis.col_index_.size();
-  iis_num_row = iis.row_index_.size();
+  *iis_num_col = iis.col_index_.size();
+  *iis_num_row = iis.row_index_.size();
   if (col_index != nullptr) {
-    for (size_t i = 0; i < iis_num_col; i++) {
+    for (size_t i = 0; i < *iis_num_col; i++) {
       col_index[i] = iis.col_index_[i];
     }
   }
   if (row_index != nullptr) {
-    for (size_t i = 0; i < iis_num_row; i++) {
+    for (size_t i = 0; i < *iis_num_row; i++) {
       row_index[i] = iis.row_index_[i];
     }
   }
   if (col_bound != nullptr) {
-    for (size_t i = 0; i < iis_num_col; i++) {
+    for (size_t i = 0; i < *iis_num_col; i++) {
       col_bound[i] = iis.col_bound_[i];
     }
   }
   if (row_bound != nullptr) {
-    for (size_t i = 0; i < iis_num_row; i++) {
+    for (size_t i = 0; i < *iis_num_row; i++) {
       row_bound[i] = iis.row_bound_[i];
     }
   }

highs/interfaces/highs_c_api.h

@@ -2404,14 +2404,14 @@ HighsInt Highs_feasibilityRelaxation(void* highs,
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
  */
 HighsInt Highs_getIis(void* highs,
-		      const HighsInt iis_num_col,
-		      const HighsInt iis_num_row,
-		      const HighsInt* col_index,
-		      const HighsInt* row_index,
-		      const HighsInt* col_bound,
-		      const HighsInt* row_bound,
-		      const HighsInt* col_status,
-		      const HighsInt* row_status);
+		      HighsInt* iis_num_col,
+		      HighsInt* iis_num_row,
+		      HighsInt* col_index,
+		      HighsInt* row_index,
+		      HighsInt* col_bound,
+		      HighsInt* row_bound,
+		      HighsInt* col_status,
+		      HighsInt* row_status);
 /**
  * Releases all resources held by the global scheduler instance.
  *

highs/lp_data/HighsIis.cpp

@@ -189,8 +189,8 @@ bool HighsIis::rowValueBounds(const HighsLp& lp, const HighsOptions& options) {
           upper_row_value += value * lower;
         }
       }
-      lower_value[iRow] = lower_row_value;
-      upper_value[iRow] = upper_row_value;
+      lower_value.push_back(lower_row_value);
+      upper_value.push_back(upper_row_value);
     }
   }
   bool below_lower;