Update highs header to 1.11.0

Author: metab0t

thirdparty/solvers/highs/HConfig.h

@@ -5,19 +5,16 @@
 /* #undef ZLIB_FOUND */
 #define CUPDLP_CPU
 /* #undef CUPDLP_GPU */
-/* #undef CUPDLP_FORCE_NATIVE */
 #define CMAKE_BUILD_TYPE "Release"
-#define CMAKE_INSTALL_PREFIX "E:/HiGHS/build/install"
 /* #undef HIGHSINT64 */
 /* #undef HIGHS_NO_DEFAULT_THREADS */
 #define HIGHS_HAVE_MM_PAUSE
 /* #undef HIGHS_HAVE_BUILTIN_CLZ */
 #define HIGHS_HAVE_BITSCAN_REVERSE
 
-#define HIGHS_GITHASH "fd8665394"
+#define HIGHS_GITHASH "364c83a51"
 #define HIGHS_VERSION_MAJOR 1
-#define HIGHS_VERSION_MINOR 10
+#define HIGHS_VERSION_MINOR 11
 #define HIGHS_VERSION_PATCH 0
-#define HIGHS_DIR "E:/HiGHS"
 
 #endif /* HCONFIG_H_ */

thirdparty/solvers/highs/Highs.h

@@ -1459,6 +1459,7 @@ class Highs {
  HighsRanging ranging_;
  HighsIis iis_;
  std::vector<HighsObjectiveSolution> saved_objective_and_solution_;
+ HighsFiles files_;
 
  HighsPresolveStatus model_presolve_status_ =
  HighsPresolveStatus::kNotPresolved;
@@ -1476,16 +1477,16 @@ class Highs {
 
  HighsInt max_threads = 0;
  // This is strictly for debugging. It's used to check whether
- // returnFromRun() was called after the previous call to
- // Highs::run() and, assuming that this is always done, it checks
- // whether Highs::run() is called recursively.
- bool called_return_from_run = true;
- HighsInt debug_run_call_num_ = 0;
+ // returnFromOptimizeModel() was called after the previous call to
+ // Highs::optimizeModel() and, assuming that this is always done, it checks
+ // whether Highs::optimizeModel() is called recursively.
+ bool called_return_from_optimize_model = true;
+ HighsInt debug_optimize_call_num_ = 0;
 
  bool written_log_header_ = false;
 
  void reportModelStats() const;
- HighsStatus solve();
+ HighsStatus optimizeModel();
 
  void exactResizeModel() {
  this->model_.lp_.exactResize();
@@ -1568,8 +1569,8 @@ class Highs {
 
  HighsStatus returnFromWriteSolution(FILE* file,
  const HighsStatus return_status);
- HighsStatus returnFromRun(const HighsStatus return_status,
- const bool undo_mods);
+ HighsStatus returnFromOptimizeModel(const HighsStatus return_status,
+  const bool undo_mods);
  HighsStatus returnFromHighs(const HighsStatus return_status);
  void reportSolvedLpQpStats();
 
@@ -1673,6 +1674,7 @@ class Highs {
  bool qFormatOk(const HighsInt num_nz, const HighsInt format);
  void clearZeroHessian();
  HighsStatus checkOptimality(const std::string& solver_type);
+ HighsStatus lpKktCheck(const std::string& message);
  HighsStatus invertRequirementError(std::string method_name) const;
 
  HighsStatus handleInfCost();
@@ -1694,6 +1696,13 @@ class Highs {
  const HighsInt iObj) const;
  bool hasRepeatedLinearObjectivePriorities(
  const HighsLinearObjective* linear_objective = nullptr) const;
+
+ bool tryPdlpCleanup(HighsInt& pdlp_cleanup_iteration_limit,
+ const HighsInfo& presolved_lp_info) const;
+
+ bool optionsHasHighsFiles() const;
+ void saveHighsFiles();
+ void getHighsFiles();
 };
 
 // Start of deprecated methods not in the Highs class

thirdparty/solvers/highs/interfaces/highs_c_api.h

@@ -105,6 +105,7 @@ const HighsInt kHighsCallbackMipLogging = 5;
 const HighsInt kHighsCallbackMipInterrupt = 6;
 const HighsInt kHighsCallbackMipGetCutPool = 7;
 const HighsInt kHighsCallbackMipDefineLazyConstraints = 8;
+const HighsInt kHighsCallbackCallbackMipUserSolution = 9;
 
 const char* const kHighsCallbackDataOutLogTypeName = "log_type";
 const char* const kHighsCallbackDataOutRunningTimeName = "running_time";
@@ -770,7 +771,7 @@ HighsInt Highs_getStringOptionValue(const void* highs, const char* option,
  *
  * @param highs A pointer to the Highs instance.
  * @param option The name of the option.
- * @param type An int in which the corresponding `kHighsOptionType`
+ * @param type A HighsInt in which the corresponding `kHighsOptionType`
  * constant should be placed.
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
@@ -842,7 +843,7 @@ HighsInt Highs_getBoolOptionValues(const void* highs, const char* option,
  HighsInt* current_value,
  HighsInt* default_value);
 /**
- * Get the current and default values of an int option
+ * Get the current and default values of a HighsInt option
  *
  * @param highs A pointer to the Highs instance.
  * @param current_value A pointer to the current value of the option.
@@ -924,7 +925,7 @@ HighsInt Highs_getInt64InfoValue(const void* highs, const char* info,
  *
  * @param highs A pointer to the Highs instance.
  * @param info The name of the info item.
- * @param type An int in which the corresponding `kHighsOptionType`
+ * @param type A HighsInt in which the corresponding `kHighsOptionType`
  * constant is stored.
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
@@ -983,7 +984,7 @@ HighsInt Highs_getModelStatus(const void* highs);
  * LP) gets it if it does not and dual_ray_value is not nullptr.
  *
  * @param highs A pointer to the Highs instance.
- * @param has_dual_ray A pointer to an int to store 1 if a dual ray
+ * @param has_dual_ray A pointer to a HighsInt to store 1 if a dual ray
  * currently exists.
  * @param dual_ray_value An array of length [num_row] filled with the
  * unbounded ray.
@@ -1001,9 +1002,10 @@ HighsInt Highs_getDualRay(const void* highs, HighsInt* has_dual_ray,
  *
  * @param highs A pointer to the Highs
  * instance.
- * @param has_dual_unboundedness_direction A pointer to an int to store 1
- * if the dual unboundedness
- * direction exists.
+ * @param has_dual_unboundedness_direction A pointer to a HighsInt to
+ * store 1 if the dual
+ * unboundedness direction
+ * exists.
  * @param dual_unboundedness_direction_value An array of length [num_col]
  * filled with the unboundedness
  * direction.
@@ -1018,7 +1020,7 @@ HighsInt Highs_getDualUnboundednessDirection(
  * LP) gets it if it does not and primal_ray_value is not nullptr.
  *
  * @param highs A pointer to the Highs instance.
- * @param has_primal_ray A pointer to an int to store 1 if the primal ray
+ * @param has_primal_ray A pointer to a HighsInt to store 1 if the primal ray
  * exists.
  * @param primal_ray_value An array of length [num_col] filled with the
  * unbounded ray.
@@ -1163,15 +1165,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.
@@ -1279,7 +1281,7 @@ HighsInt Highs_setCallback(void* highs, HighsCCallbackType user_callback,
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
  */
-HighsInt Highs_startCallback(void* highs, const int callback_type);
+HighsInt Highs_startCallback(void* highs, const HighsInt callback_type);
 
 /**
  * Stop callback of given type
@@ -1289,7 +1291,7 @@ HighsInt Highs_startCallback(void* highs, const int callback_type);
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
  */
-HighsInt Highs_stopCallback(void* highs, const int callback_type);
+HighsInt Highs_stopCallback(void* highs, const HighsInt callback_type);
 
 /**
  * Return the cumulative wall-clock time spent in `Highs_run`.
@@ -1670,6 +1672,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.
  *
@@ -1754,15 +1774,15 @@ HighsInt Highs_getObjectiveOffset(const void* highs, double* offset);
  * @param highs A pointer to the Highs instance.
  * @param from_col The first column for which to query data for.
  * @param to_col The last column (inclusive) for which to query data for.
- * @param num_col An integer populated with the number of columns got from
+ * @param num_col A HighsInt populated with the number of columns got from
  * the model (this should equal `to_col - from_col + 1`).
  * @param costs An array of size [to_col - from_col + 1] for the column
  * cost coefficients.
  * @param lower An array of size [to_col - from_col + 1] for the column
  * lower bounds.
  * @param upper An array of size [to_col - from_col + 1] for the column
  * upper bounds.
- * @param num_nz An integer to be populated with the number of non-zero
+ * @param num_nz A HighsInt to be populated with the number of non-zero
  * elements in the constraint matrix.
  * @param matrix_start An array of size [to_col - from_col + 1] with the start
  * indices of each column in `matrix_index` and
@@ -1831,13 +1851,13 @@ HighsInt Highs_getColsByMask(const void* highs, const HighsInt* mask,
  * @param highs A pointer to the Highs instance.
  * @param from_row The first row for which to query data for.
  * @param to_row The last row (inclusive) for which to query data for.
- * @param num_row An integer to be populated with the number of rows got
+ * @param num_row A HighsInt to be populated with the number of rows got
  * from the model.
  * @param lower An array of size [to_row - from_row + 1] for the row
  * lower bounds.
  * @param upper An array of size [to_row - from_row + 1] for the row
  * upper bounds.
- * @param num_nz An integer to be populated with the number of non-zero
+ * @param num_nz A HighsInt to be populated with the number of non-zero
  * elements in the constraint matrix.
  * @param matrix_start An array of size [to_row - from_row + 1] with the start
  * indices of each row in `matrix_index` and
@@ -1940,7 +1960,7 @@ HighsInt Highs_getColByName(const void* highs, const char* name, HighsInt* col);
  * Get the integrality of a column.
  *
  * @param col The index of the column to query.
- * @param integrality An integer in which the integrality of the column should
+ * @param integrality A HighsInt in which the integrality of the column should
  * be placed. The integer is one of the `kHighsVarTypeXXX`
  * constants.
  *
@@ -1994,7 +2014,7 @@ HighsInt Highs_deleteColsByMask(void* highs, HighsInt* mask);
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
  */
-HighsInt Highs_deleteRowsByRange(void* highs, const int from_row,
+HighsInt Highs_deleteRowsByRange(void* highs, const HighsInt from_row,
  const HighsInt to_row);
 
 /**
@@ -2222,9 +2242,9 @@ HighsInt Highs_getPresolvedLp(const void* highs, const HighsInt a_format,
  *
  * @returns A `kHighsStatus` constant indicating whether the call succeeded.
  */
-HighsInt Highs_crossover(void* highs, const int num_col, const int num_row,
- const double* col_value, const double* col_dual,
- const double* row_dual);
+HighsInt Highs_crossover(void* highs, const HighsInt num_col,
+ const HighsInt num_row, const double* col_value,
+ const double* col_dual, const double* row_dual);
 
 /**
  * Compute the ranging information for all costs and bounds. For
@@ -2361,6 +2381,49 @@ void Highs_resetGlobalScheduler(const HighsInt blocking);
 const void* Highs_getCallbackDataOutItem(const HighsCallbackDataOut* data_out,
  const char* item_name);
 
+/**
+ * Set a solution within a callback by passing a subset of the values.
+ *
+ * For any values that are unavailable/unknown, pass kHighsUndefined.
+ *
+ * @param data_in A pointer to the callback input data instance.
+ * @param num_entries Number of variables in the set
+ * @param value An array of length [num_entries <= num_col] with
+ * column solution values.
+ *
+ * @returns A `kHighsStatus` constant indicating whether the call succeeded.
+ */
+HighsInt Highs_setCallbackSolution(HighsCallbackDataIn* data_in,
+ const HighsInt num_entries,
+ const double* value);
+
+/**
+ * Set a partial primal solution by passing values for a set of variables,
+ * within a valid callback.
+ *
+ * @param data_in A pointer to the callback input data instance.
+ * @param num_entries Number of variables in the set
+ * @param index Indices of variables in the set
+ * @param value Values of variables in the set
+ *
+ * @returns A `kHighsStatus` constant indicating whether the call succeeded.
+ */
+HighsInt Highs_setCallbackSparseSolution(HighsCallbackDataIn* data_in,
+ const HighsInt num_entries,
+ const HighsInt* index,
+ const double* value);
+
+/**
+ * Finds a feasible solution for a given (partial) primal user solution,
+ * within a valid callback.
+ *
+ * On success, the user solution is updated within the callback input data
+ * instance.
+ *
+ * @returns A `kHighsStatus` constant indicating whether the call succeeded.
+ */
+HighsInt Highs_repairCallbackSolution(HighsCallbackDataIn* data_in);
+
 // *********************
 // * Deprecated methods*
 // *********************

thirdparty/solvers/highs/io/HMpsFF.h

@@ -164,7 +164,8 @@ class HMpsFF {
 
  enum class Boundtype { kLe, kEq, kGe }; //, kFr };
 
- // see https://docs.mosek.com/latest/capi/mps-format.html#csection-optional
+ // see
+ // https://docs.mosek.com/latest_kkt/capi/mps-format.html#csection-optional
  enum class ConeType { kZero, kQuad, kRQuad, kPExp, kPPow, kDExp, kDPow };
 
  std::string objective_name;

thirdparty/solvers/highs/io/HighsIO.h

@@ -44,9 +44,7 @@ struct HighsLogOptions {
  HighsInt* log_dev_level;
  void (*user_log_callback)(HighsLogType, const char*, void*);
  void* user_log_callback_data;
- std::function<void(int, const std::string&, const HighsCallbackDataOut*,
- HighsCallbackDataIn*, void*)>
- user_callback;
+ HighsCallbackFunctionType user_callback;
  void* user_callback_data;
  bool user_callback_active;
  void clear();

thirdparty/solvers/highs/ipm/ipx/ipx_c.h

@@ -10,7 +10,7 @@
 extern "C"{
 #endif
  /* These functions call their equivalent method of LpSolver for
- the object pointed to by @self. See src/lp_solver.h for
+ the object pointed to by @self. See highs/lp_solver.h for
  documentation of the methods. */
  ipxint ipx_load_model(void* self, ipxint num_var, const double* obj,
  const double* lb, const double* ub, ipxint num_constr,

thirdparty/solvers/highs/ipm/ipx/ipx_internal.h

@@ -55,6 +55,7 @@ struct Parameters : public ipx_parameters {
  centring_alpha_scaling = 0.5;
  bad_products_tolerance = 3;
  highs_logging = false;
+ timeless_log = false;
  log_options = nullptr;
  }