Merge branch 'latest' into data-races-10

Author: galabovaa

.github/workflows/valgrind.yml

@@ -32,7 +32,25 @@ jobs:
       - name: Test
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ./bin/unit_tests 
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ./bin/unit_tests \
+          2>&1 | tee logfile
+
+      - name: Check log for Errors
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cat logfile
+          OUTPUT='ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)'
+          if grep -q "$OUTPUT" logfile; then
+            exit 0
+          fi
+          exit 1
 
   instance_tests:
     runs-on: ${{ matrix.os }}
@@ -63,4 +81,24 @@ jobs:
       - name: Test
         working-directory: ${{runner.workspace}}/build
         shell: bash
-        run: valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s ctest -E unit.* --timeout 1000 --output-on-failure 
+        run: |
+          valgrind \
+          --leak-check=full \
+          --show-leak-kinds=all \
+          --track-origins=yes \
+          -s \
+          ctest -E unit.* \
+          --timeout 1000 \
+          --output-on-failure \
+          2>&1 | tee logfile2
+
+      - name: Check log for Errors
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          cat logfile2
+          OUTPUT='ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)'
+          if grep -q "$OUTPUT" logfile2; then
+            exit 0
+          fi
+          exit 1

FEATURES.md

@@ -16,3 +16,5 @@ As part of [#2286](https://github.com/ERGO-Code/HiGHS/pull/2286)), the root of t
 
 ZI rounding and shifting MIP primal heuristics have been added (see [#2287](https://github.com/ERGO-Code/HiGHS/pull/2287)). They are off by default, but can be activated by setting the options `mip_heuristic_run_zi_round` and `mip_heuristic_run_shifting` to be true. Options `mip_heuristic_run_rins`, `mip_heuristic_run_rens` and `mip_heuristic_run_root_reduced_cost` to run the RINS, RENS and rootReducedCost heuristics have been added. These are true by default, but setting them to be false can accelerate the MIP solver on easy problems.
 
+Added `Highs_changeRowsBoundsByRange` to C API, fixing [#2296](https://github.com/ERGO-Code/HiGHS/issues/2296))
+

check/TestCallbacks.cpp

@@ -295,7 +295,7 @@ TEST_CASE("highs-callback-logging", "[highs_callback]") {
   highs.startCallback(kCallbackLogging);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -312,7 +312,7 @@ TEST_CASE("highs-callback-solution-basis-logging", "[highs_callback]") {
   highs.startCallback(kCallbackLogging);
   if (dev_run) highs.writeSolution("", kSolutionStylePretty);
   if (dev_run) highs.writeBasis("");
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -329,7 +329,7 @@ TEST_CASE("highs-callback-simplex-interrupt", "[highs_callback]") {
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().simplex_iteration_count >
           adlittle_simplex_iteration_limit);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -346,7 +346,7 @@ TEST_CASE("highs-callback-ipm-interrupt", "[highs_callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().ipm_iteration_count > adlittle_ipm_iteration_limit);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -362,7 +362,7 @@ TEST_CASE("highs-callback-mip-interrupt", "[highs_callback]") {
   REQUIRE(status == HighsStatus::kWarning);
   REQUIRE(highs.getModelStatus() == HighsModelStatus::kInterrupt);
   REQUIRE(highs.getInfo().objective_function_value > egout_optimal_objective);
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -377,7 +377,7 @@ TEST_CASE("highs-callback-mip-improving", "[highs_callback]") {
   highs.startCallback(kCallbackMipImprovingSolution);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -391,7 +391,7 @@ TEST_CASE("highs-callback-mip-data", "[highs_callback]") {
   highs.startCallback(kCallbackMipLogging);
   highs.readModel(filename);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -413,7 +413,7 @@ TEST_CASE("highs-callback-mip-solution", "[highs_callback]") {
   highs.setCallback(userMipSolutionCallback, p_user_callback_data);
   highs.startCallback(kCallbackMipSolution);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -425,7 +425,7 @@ TEST_CASE("highs-callback-mip-cut-pool", "[highs_callback]") {
   highs.setCallback(userMipCutPoolCallback);
   highs.startCallback(kCallbackMipGetCutPool);
   highs.run();
-  
+
   highs.resetGlobalScheduler(true);
 }
 
@@ -469,6 +469,6 @@ TEST_CASE("highs-callback-mip-user-solution", "[highs_callback]") {
         std::max(1.0, std::fabs(objective_function_value0));
     REQUIRE(objective_diff < 1e-12);
   }
-  
+
   highs.resetGlobalScheduler(true);
 }

highs/interfaces/highs_c_api.cpp

@@ -928,6 +928,14 @@ HighsInt Highs_changeRowBounds(void* highs, const HighsInt row,
   return (HighsInt)((Highs*)highs)->changeRowBounds(row, lower, upper);
 }
 
+HighsInt Highs_changeRowsBoundsByRange(void* highs, const HighsInt from_row,
+                                       const HighsInt to_row,
+                                       const double* lower,
+                                       const double* upper) {
+  return (HighsInt)((Highs*)highs)
+      ->changeRowsBounds(from_row, to_row, lower, upper);
+}
+
 HighsInt Highs_changeRowsBoundsBySet(void* highs,
                                      const HighsInt num_set_entries,
                                      const HighsInt* set, const double* lower,

highs/interfaces/highs_c_api.h

@@ -1671,6 +1671,24 @@ HighsInt Highs_changeColsBoundsByMask(void* highs, const HighsInt* mask,
 HighsInt Highs_changeRowBounds(void* highs, const HighsInt row,
                                const double lower, const double upper);
 
+/**
+ * Change the variable bounds of multiple adjacent rows.
+ *
+ * @param highs     A pointer to the Highs instance.
+ * @param from_row  The index of the first row whose bound changes.
+ * @param to_row    The index of the last row whose bound changes.
+ * @param lower     An array of length [to_row - from_row + 1] with the new
+ *                  lower bounds.
+ * @param upper     An array of length [to_row - from_row + 1] with the new
+ *                  upper bounds.
+ *
+ * @returns A `kHighsStatus` constant indicating whether the call succeeded.
+ */
+HighsInt Highs_changeRowsBoundsByRange(void* highs, const HighsInt from_row,
+                                       const HighsInt to_row,
+                                       const double* lower,
+                                       const double* upper);
+
 /**
  * Change the bounds of multiple rows given by an array of indices.
  *

highs/interfaces/highs_csharp_api.cs

@@ -416,6 +416,9 @@ private static extern int Highs_addCols(
     [DllImport(highslibname)]
     private static extern int Highs_changeRowBounds(IntPtr highs, int row, double lower, double upper);
 
+    [DllImport(highslibname)]
+    private static extern int Highs_changeRowsBoundsByRange(IntPtr highs, int from_row, int to_row, double[] lower, double[] upper);
+
     [DllImport(highslibname)]
     private static extern int Highs_changeRowsBoundsBySet(IntPtr highs, int num_set_entries, int[] set, double[] lower, double[] upper);
 
@@ -914,6 +917,11 @@ public HighsStatus changeRowBounds(int row, double lower, double upper)
         return (HighsStatus)HighsLpSolver.Highs_changeRowBounds(this.highs, row, lower, upper);
     }
 
+    public HighsStatus changeRowsBoundsByRange(int from, int to, double[] lower, double[] upper)
+    {
+        return (HighsStatus)HighsLpSolver.Highs_changeRowsBoundsByRange(this.highs, from, to, lower, upper);
+    }
+
     public HighsStatus changeRowsBoundsBySet(int[] rows, double[] lower, double[] upper)
     {
         return (HighsStatus)HighsLpSolver.Highs_changeRowsBoundsBySet(this.highs, rows.Length, rows, lower, upper);

highs/interfaces/highs_fortran_api.f90

@@ -572,6 +572,16 @@ function Highs_changeRowBounds (h, row, lo, up) result(s) bind(c, name='Highs_ch
       integer(c_int) :: s
     end function Highs_changeRowBounds
 
+    function Highs_changeRowsBoundsByRange (h, from, to, lo, up) result(s) bind(c, name='Highs_changeRowsBoundsByRange')
+      use iso_c_binding
+      type(c_ptr), VALUE :: h
+      integer(c_int), VALUE :: from
+      integer(c_int), VALUE :: to
+      real(c_double) :: lo(*)
+      real(c_double) :: up(*)
+      integer(c_int) :: s
+    end function Highs_changeRowsBoundsByRange
+
     function Highs_changeRowsBoundsBySet (h, nse, set, lo, up) result(s) bind(c, name='Highs_changeRowsBoundsBySet')
       use iso_c_binding
       type(c_ptr), VALUE :: h