COPT con names #209

Bump dates
ampl · Jul 24, 2023 · 1fab7e3 · 1fab7e3
1 parent d1e6522
commit 1fab7e3
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 7 deletions.
diff --git a/CHANGES.mp.md b/CHANGES.mp.md
@@ -1,6 +1,12 @@
 Summary of recent updates to the AMPL MP Library
 ================================================
 
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230714
 - Print warnings in non-verbose mode too.
 - 'barrier' equivalent to 'barrier=1' for integer options.

diff --git a/solvers/copt/CHANGES.copt.md b/solvers/copt/CHANGES.copt.md
@@ -1,6 +1,12 @@
 Summary of recent updates to COPT for AMPL
 ==========================================
 
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and linear constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230621
 - Fix quadratic objective with repeated subexpressions.
 

diff --git a/solvers/copt/coptmodelapi.cc b/solvers/copt/coptmodelapi.cc
@@ -42,47 +42,47 @@ void CoptModelAPI::AddConstraint(const LinConRange& lc) {
 												 lc.pvars(), lc.pcoefs(), 0,
 												 lc.lb() < -COPT_INFINITY ? -COPT_INFINITY : lc.lb(),
 												 lc.ub() > COPT_INFINITY ? COPT_INFINITY : lc.ub(),
-												 NULL));
+												 lc.name()));
 }
 
 void CoptModelAPI::AddConstraint(const LinConLE& lc) {
   char sense = COPT_LESS_EQUAL;
   COPT_CCALL(COPT_AddRow(lp(), lc.size(), lc.pvars(), lc.pcoefs(),
-    sense, lc.rhs(), 0, NULL));
+		sense, lc.rhs(), 0, lc.name()));
 }
 void CoptModelAPI::AddConstraint(const LinConEQ& lc) {
   char sense = COPT_EQUAL;
   COPT_CCALL(COPT_AddRow(lp(), lc.size(), lc.pvars(), lc.pcoefs(),
-    sense, lc.rhs(), 0, NULL));
+		sense, lc.rhs(), 0, lc.name()));
 }
 void CoptModelAPI::AddConstraint(const LinConGE& lc) {
   char sense = COPT_GREATER_EQUAL;
   COPT_CCALL(COPT_AddRow(lp(), lc.size(), lc.pvars(), lc.pcoefs(),
-    sense, lc.rhs(), 0, NULL));
+		sense, lc.rhs(), 0, lc.name()));
 }
 
 void CoptModelAPI::AddConstraint(const QuadConLE& qc) {
   const auto& lt = qc.GetLinTerms();
   const auto& qt = qc.GetQPTerms();
   COPT_CCALL(COPT_AddQConstr(lp(), lt.size(), (int*)lt.pvars(), (double*)lt.pcoefs(),
                              qt.size(), (int*)qt.pvars1(), (int*)qt.pvars2(),
-                             (double*)qt.pcoefs(), COPT_LESS_EQUAL, qc.rhs(), NULL));
+														 (double*)qt.pcoefs(), COPT_LESS_EQUAL, qc.rhs(), qc.name()));
 }
 
 void CoptModelAPI::AddConstraint(const QuadConEQ& qc) {
   const auto& lt = qc.GetLinTerms();
   const auto& qt = qc.GetQPTerms();
   COPT_CCALL(COPT_AddQConstr(lp(), lt.size(), (int*)lt.pvars(), (double*)lt.pcoefs(),
                              qt.size(), (int*)qt.pvars1(), (int*)qt.pvars2(),
-                             (double*)qt.pcoefs(), COPT_EQUAL, qc.rhs(), NULL));
+														 (double*)qt.pcoefs(), COPT_EQUAL, qc.rhs(), qc.name()));
 }
 
 void CoptModelAPI::AddConstraint(const QuadConGE& qc) {
   const auto& lt = qc.GetLinTerms();
   const auto& qt = qc.GetQPTerms();
   COPT_CCALL(COPT_AddQConstr(lp(), lt.size(), (int*)lt.pvars(), (double*)lt.pcoefs(),
                              qt.size(), (int*)qt.pvars1(), (int*)qt.pvars2(),
-                             (double*)qt.pcoefs(), COPT_GREATER_EQUAL, qc.rhs(), NULL));
+														 (double*)qt.pcoefs(), COPT_GREATER_EQUAL, qc.rhs(), qc.name()));
 }
 
 

diff --git a/solvers/gurobi/CHANGES.gurobi.md b/solvers/gurobi/CHANGES.gurobi.md
@@ -1,6 +1,12 @@
 Summary of recent updates to gurobi for AMPL
 ============================================
 
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230625
 - Updated to Gurobi libraries 10.0.2, which include many bugfixes.
 

diff --git a/solvers/highsmp/CHANGES.highsmp.md b/solvers/highsmp/CHANGES.highsmp.md
@@ -1,6 +1,12 @@
 Summary of recent updates to HiGHS for AMPL
 ===========================================
 
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and linear constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230621
 - Fix quadratic objective with repeated subexpressions.
 - Fix Hessian API.

diff --git a/solvers/mosek/CHANGES.mosek.md b/solvers/mosek/CHANGES.mosek.md
@@ -1,6 +1,13 @@
 Summary of recent updates to MOSEK for AMPL
 ===========================================
 
+
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and linear constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230621
 - Fix quadratic objective with repeated subexpressions.
 

diff --git a/solvers/xpress/CHANGES.xpress.md b/solvers/xpress/CHANGES.xpress.md
@@ -2,6 +2,12 @@ Summary of recent updates to Xpress for AMPL
 ============================================
 
 
+## 20230724
+- option [solver_]auxfiles rc; transfers names
+	of variables and linear constraints into the model;
+	(solver)_options 'cvt:names=0-3' controls names.
+
+
 ## 20230714
 - Options barrier/primal/dual/network like in ASL.