From eba597eff0abcd9ca6c9ae2027b52589f40310fd Mon Sep 17 00:00:00 2001
From: Christian Valente <christian.valente@outlook.com>
Date: Thu, 7 Mar 2024 14:34:51 +0100
Subject: [PATCH] Updated HiGHS driver to 1.7.0.

---
 solvers/highsmp/CHANGES.highsmp.md | 10 ++++++
 solvers/highsmp/highsmpbackend.cc  | 50 +++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/solvers/highsmp/CHANGES.highsmp.md b/solvers/highsmp/CHANGES.highsmp.md
index cd5c402b4..230973f28 100644
--- a/solvers/highsmp/CHANGES.highsmp.md
+++ b/solvers/highsmp/CHANGES.highsmp.md
@@ -1,6 +1,16 @@
 Summary of recent updates to HiGHS for AMPL
 ===========================================
 
+## 20240307
+- *Updated* to HiGHS 1.7.0
+- Added solver pdlp (use option `alg:method` to specify it and
+  `alg:pdlpdgaptol`, `lim:pdlpnativetermination`, `pre:pdlpscaling` 
+  and `lim:pdlpiterationlimit`).
+- Added optional pre centring steps (see options `pre:centring`,
+  `pre:maxcentringsteps` and `pre:centringratiotolerance`).
+- Added options `pre:userboundscale`, `pre:usercostscale`, 
+  `lim:objectivebound` and `lim:objectivetarget`.
+
 
 ## 20240115
 - *Solve result codes*
diff --git a/solvers/highsmp/highsmpbackend.cc b/solvers/highsmp/highsmpbackend.cc
index 423d832c6..14907d5c7 100644
--- a/solvers/highsmp/highsmpbackend.cc
+++ b/solvers/highsmp/highsmpbackend.cc
@@ -411,6 +411,7 @@ static const mp::OptionValueInfo lp_values_method[] = {
   { "choose", "Automatic (default)", -1},
   { "simplex", "Simplex", 1},
   { "ipm", "Interior Point Method", 2},
+  { "pdlp", "cuPDLP-c solver", 3}
 };
 
 static const mp::OptionValueInfo off_on_choose_values[] = {
@@ -470,7 +471,7 @@ void HighsBackend::InitCustomOptions() {
     "Log file name.", "log_file");
 
   const char* c = "choose";
-  AddSolverOption("alg:method method lpmethod",
+  AddSolverOption("alg:method method lpmethod solver",
     "Which algorithm to use :\n"
     "\n.. value-table::\n", "solver", lp_values_method, c);
 
@@ -503,6 +504,14 @@ void HighsBackend::InitCustomOptions() {
     "\n.. value-table::\n",
     "presolve", off_on_choose_values, c);
 
+  AddSolverOption("pre:userboundscale user_bound_scale userboundscale",
+    "Exponent of power-of-two bound scaling for model (default 0).",
+    "user_bound_scale", 0, std::numeric_limits<HighsInt>::max());
+
+  AddSolverOption("pre:usercostscale user_cost_scale usercostscale",
+    "Exponent of power-of-two cost scaling for model (default 0).",
+    "user_cost_scale", 0, std::numeric_limits<HighsInt>::max());
+
   AddSolverOption("alg:parallel parallel",
     "Parallel option :\n"
     "\n.. value-table::\n", "parallel", off_on_choose_values, c);
@@ -519,6 +528,27 @@ void HighsBackend::InitCustomOptions() {
     "Limit on IPM iterations (default: no limit).",
     "ipm_iteration_limit", 0, INT_MAX);
 
+  AddSolverOption("lim:objectivebound objective_bound objectivebound",
+    "Objective bound for termination of the dual simplex solver (default: no limit).",
+    "objective_bound", 0.0, DBL_MAX);
+
+
+  AddSolverOption("lim:objectivetarget objective_target objectivetarget",
+    "Objective target for termination of the MIP solver (default: no limit).",
+    "objective_target", 0.0, DBL_MAX);
+
+  AddSolverOption("lim:pdlpnativetermination pdlp_native_termination pdlpnativetermination",
+    "Use native termination for PDLP solver:\n"
+    "\n.. value-table::\n", "pdlp_native_termination", values_01_noyes_0default_, 0);
+
+  AddSolverOption("pre:pdlpscaling pdlp_scaling pdlpscaling",
+    "Scaling option for PDLP solver:\n"
+    "\n.. value-table::\n", "pdlp_scaling", values_01_noyes_1default_, 1);
+
+  AddSolverOption("lim:pdlpiterationlimit pdlpiterationlimit pdlp_iteration_limit",
+    "Iteration limit for PDLP solver (default: no limit).",
+    "pdlp_iteration_limit", 0, INT_MAX);
+
   AddSolverOption("alg:infinitecost infinitecost infinite_cost",
     "Limit on cost coefficient : values larger than this will be treated as infinite (default: 1e20).",
     "infinite_cost", 1e15, Infinity());
@@ -547,6 +577,10 @@ void HighsBackend::InitCustomOptions() {
     "IPM optimality tolerance (default 1e-8).",
     "ipm_optimality_tolerance", 1e-12, Infinity());
 
+  AddSolverOption("alg:pdlpdgaptol pdlpdgaptol pdlp_d_gap_tol",
+    "Duality gap tolerance for PDLP solver (default 1e-4).",
+    "pdlp_d_gap_tol", 1e-12, Infinity());
+
   AddSolverOption("bar:crossover run_crossover",
     "Run crossover after IPM to get a basic solution",
     "run_crossover", run_crossover_values, c);
@@ -617,6 +651,20 @@ void HighsBackend::InitCustomOptions() {
     "Tolerance on absolute gap of MIP, |ub-lb|, to determine whether optimality has been reached for a MIP instance "
     "(default 1e-06).",
     "mip_abs_gap", 0.0, Infinity());
+
+  AddSolverOption("pre:centring run_centring centring",
+    "Perform centring steps or not:\n"
+    "\n.. value-table::\n", "run_centring", values_01_noyes_0default_, 0);
+
+  AddSolverOption("pre:maxcentringsteps max_centring_steps maxcentringsteps",
+    "Maximum number of steps to use when computing the analytic centre "
+    "(default 5).",
+    "max_centring_steps", 0, INT_MAX);
+
+  AddSolverOption("pre:centringratiotolerance centring_ratio_tolerance centringratiotolerance",
+    "Centring stops when the ratio max(x_j*s_j) / min(x_j*s_j) is below "
+    "this tolerance (default 100).",
+    "centring_ratio_tolerance", 0, INT_MAX);
 }
 
 double HighsBackend::MIPGap() {