Merge branch 'latest' of https://github.com/ERGO-Code/HiGHS into coeffStren

Author: fwesselm

FEATURES.md

@@ -18,3 +18,5 @@ ZI rounding and shifting MIP primal heuristics have been added (see [#2287](http
 
 Added `Highs_changeRowsBoundsByRange` to C API, fixing [#2296](https://github.com/ERGO-Code/HiGHS/issues/2296))
 
+Corrected docstrings for `Highs_getReducedRow`, motivated by [#2312](https://github.com/ERGO-Code/HiGHS/issues/2312))
+

extern/zstr/zstr.hpp

@@ -11,6 +11,7 @@
 #include <zlib.h>
 
 #include <cassert>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 #include <memory>

highs/interfaces/highs_c_api.h

@@ -1164,15 +1164,15 @@ HighsInt Highs_getBasisTransposeSolve(const void* highs, const double* rhs,
  * See `Highs_getBasicVariables` for a description of the ``B`` matrix.
  *
  * The arrays `row_vector` and `row_index` must have an allocated length of
- * [num_row]. However, check `row_num_nz` to see how many non-zero elements are
+ * [num_col]. However, check `row_num_nz` to see how many non-zero elements are
  * actually stored.
  *
  * @param highs         A pointer to the Highs instance.
  * @param row           The index of the row to compute.
- * @param row_vector    An array of length [num_row] in which to store the
+ * @param row_vector    An array of length [num_col] in which to store the
  *                      values of the non-zero elements.
  * @param row_num_nz    The number of non-zeros in the row.
- * @param row_index     An array of length [num_row] in which to store the
+ * @param row_index     An array of length [num_col] in which to store the
  *                      indices of the non-zero elements.
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.

highs/mip/HighsFeasibilityJump.cpp

@@ -30,7 +30,8 @@ HighsModelStatus HighsMipSolverData::feasibilityJump() {
   // Configure Feasibility Jump and pass it the problem
   int verbosity = mipsolver.submip ? 0 : mipsolver.options_mip_->log_dev_level;
   auto solver = external_feasibilityjump::FeasibilityJumpSolver(
-      /* seed = */ 0, /* verbosity = */ verbosity,
+      /* seed = */ mipsolver.options_mip_->random_seed,
+      /* verbosity = */ verbosity,
       /* equalityTolerance = */ epsilon,
       /* violationTolerance = */ feastol);
 

highs/mip/feasibilityjump.hh

@@ -467,9 +467,9 @@ class FeasibilityJumpSolver {
 
  public:
   FeasibilityJumpSolver(int seed = 0, int _verbosity = 0,
-                        double _weightUpdateDecay = 1.0,
                         double equalityTolerance = 1e-5,
-                        double violationTolerance = 1e-5)
+                        double violationTolerance = 1e-5,
+                        double _weightUpdateDecay = 1.0)
       : problem(equalityTolerance, violationTolerance),
         jumpMove(equalityTolerance) {
     verbosity = _verbosity;