NLW2_NLSuffix_C, NLW2_NLSolution_C: insert 'NL' #30

For conformance with C++ and Python

nl-writer2/examples/c/easyAPI_1_MILP/nlsol_ex_easy_api_c.c

@@ -85,7 +85,7 @@ static int ApproxEqual(double n, double m) {
 
 /// Check solution
 int NLW2_CheckSolution_C(
-    NLW2_Solution_C* p_sol, NLW2_SolCheckData_C* p_sol_ref) {
+    NLW2_NLSolution_C* p_sol, NLW2_SolCheckData_C* p_sol_ref) {
   if (!ApproxEqual(p_sol->obj_val_, p_sol_ref->obj_val_ref_)) {
     printf("MILP 1: wrong obj val (%.17g !~ %.17g)\n",
            p_sol->obj_val_, p_sol_ref->obj_val_ref_);
@@ -113,7 +113,7 @@ int SolveAndCheck(const char* solver, const char* sopts,
   NLW2_NLSolver_C nlse = NLW2_MakeNLSolver_C(NULL);
   NLW2_SetNLOptions_C(&nlse, nlopts);
   NLW2_SetFileStub_C(&nlse, stub);
-  NLW2_Solution_C sol = NLW2_SolveNLModel_C(&nlse, &nlme, solver, sopts);
+  NLW2_NLSolution_C sol = NLW2_SolveNLModel_C(&nlse, &nlme, solver, sopts);
   if (sol.solve_result_ >= -1) {
     if (!NLW2_CheckSolution_C(&sol, &solchkdata)) {
       printf("Solution check failed.\n");

nl-writer2/include/api/c/nl-model-c.h

@@ -135,7 +135,7 @@ void NLW2_SetDualWarmstart_C(NLW2_NLModel_C* ,
 
 
 /// NL suffix type
-typedef struct NLW2_Suffix_C {
+typedef struct NLW2_NLSuffix_C {
   /// Name
   const char* name_;
   /// Suffix table
@@ -155,14 +155,14 @@ typedef struct NLW2_Suffix_C {
   int numval_;
   /// Values. Always double precision.
   const double* values_;
-} NLW2_Suffix_C;
+} NLW2_NLSuffix_C;
 
 /// Add suffix, e.g., basis statuses.
 /// @return true iff new suffix added (vs replaced.)
 /// @note SOS constraints can be modeled as suffixes
 ///   for some AMPL solvers.
 int NLW2_AddSuffix_C(NLW2_NLModel_C* ,
-                     NLW2_Suffix_C suf_c);
+                     NLW2_NLSuffix_C suf_c);
 
 
 /// Compute objective value
@@ -207,7 +207,7 @@ const char* NLW2_ObjName_C(NLW2_NLModel_C* );
 
 
 /// NL solution
-typedef struct NLW2_Solution_C {
+typedef struct NLW2_NLSolution_C {
   /**
    Solve result.
    If >-2, solver interaction successful. Then:
@@ -249,8 +249,8 @@ typedef struct NLW2_Solution_C {
   /// Num suffixes
   int nsuf_;
   /// Suffixes
-  const NLW2_Suffix_C* suffixes_;
-} NLW2_Solution_C;
+  const NLW2_NLSuffix_C* suffixes_;
+} NLW2_NLSolution_C;
 
 
 #ifdef __cplusplus

nl-writer2/include/api/c/nl-solver-c.h

@@ -99,7 +99,7 @@ const char* NLW2_GetErrorMessage_C(NLW2_NLSolver_C* );
 ///
 /// @see NLW2_LoadNLModel_C(), NLW2_RunSolver_C(),
 ///   NLW2_ReadSolution_C() for details.
-NLW2_Solution_C NLW2_SolveNLModel_C(NLW2_NLSolver_C* ,
+NLW2_NLSolution_C NLW2_SolveNLModel_C(NLW2_NLSolver_C* ,
                                     NLW2_NLModel_C* ,
                                     const char* solver,
                                     const char* solver_opts);
@@ -156,7 +156,7 @@ int NLW2_RunSolver_C(NLW2_NLSolver_C* ,
 /// @note To compute objective value,
 ///   execute NLW2_ComputeObjValue_C()
 ///   if x_ available.
-NLW2_Solution_C NLW2_ReadSolution_C(NLW2_NLSolver_C* );
+NLW2_NLSolution_C NLW2_ReadSolution_C(NLW2_NLSolver_C* );
 
 /// Read solution to SOLHandler.
 ///

nl-writer2/src/nl-model-c.cc

@@ -123,7 +123,7 @@ void NLW2_SetDualWarmstart_C(NLW2_NLModel_C* nlme,
 { CastNZ<mp::NLModel>(nlme->p_data_)->SetWarmstart(ini_y); }
 
 int NLW2_AddSuffix_C(NLW2_NLModel_C* nlme,
-                     NLW2_Suffix_C suf_c) {
+                     NLW2_NLSuffix_C suf_c) {
   mp::NLSuffix suf{
     suf_c.name_, suf_c.table_, suf_c.kind_,
     {suf_c.values_, suf_c.values_+suf_c.numval_}

nl-writer2/src/nl-solver-c.cc

@@ -685,7 +685,7 @@ using NLSOL_C_Impl
 /// Storage for NLSE_Solution_C data
 struct NLW2_Solution_C_Data {
   mp::NLSolution sol_;
-  std::vector<NLW2_Suffix_C> suffixes_;
+  std::vector<NLW2_NLSuffix_C> suffixes_;
 };
 
 }  // namespace mp
@@ -743,15 +743,15 @@ const char* NLW2_GetErrorMessage_C(NLW2_NLSolver_C* pnls) {
 
 /// Add solution data to NLW2_NLSolver_C
 /// and return its C wrapper, NLW2_Solution_C.
-static NLW2_Solution_C NLW2_WrapNLSOL_Solution_C
+static NLW2_NLSolution_C NLW2_WrapNLSOL_Solution_C
 (NLW2_NLSolver_C* nlse, mp::NLSolution sol) {
   // Store the C++ data
   if (!nlse->p_sol_)
     nlse->p_sol_ = new mp::NLW2_Solution_C_Data;
   auto& sol_data = *CastNZ<mp::NLW2_Solution_C_Data>(nlse->p_sol_);
   sol_data.sol_ = std::move(sol);
 
-  NLW2_Solution_C result;
+  NLW2_NLSolution_C result;
   {
     const auto& sol=sol_data.sol_;
     result.nbs_ = sol.nbs_;
@@ -763,7 +763,7 @@ static NLW2_Solution_C NLW2_WrapNLSOL_Solution_C
     sol_data.suffixes_.reserve(sol.suffixes_.size());
     result.suffixes_ = sol_data.suffixes_.data();
     for (const auto& suf: sol.suffixes_) {
-      NLW2_Suffix_C suf_c;
+      NLW2_NLSuffix_C suf_c;
       suf_c.kind_ = suf.kind_;
       suf_c.name_ = suf.name_.c_str();
       suf_c.table_ = suf.table_.c_str();
@@ -779,7 +779,7 @@ static NLW2_Solution_C NLW2_WrapNLSOL_Solution_C
   return result;
 }
 
-NLW2_Solution_C NLW2_SolveNLModel_C(NLW2_NLSolver_C* nlse,
+NLW2_NLSolution_C NLW2_SolveNLModel_C(NLW2_NLSolver_C* nlse,
                                     NLW2_NLModel_C* nlme,
                                     const char* solver,
                                     const char* solver_opts) {
@@ -821,7 +821,7 @@ int NLW2_RunSolver_C(NLW2_NLSolver_C* pnls,
       ->Solve(solver, solver_opts);
 }
 
-NLW2_Solution_C NLW2_ReadSolution_C(NLW2_NLSolver_C* nlse) {
+NLW2_NLSolution_C NLW2_ReadSolution_C(NLW2_NLSolver_C* nlse) {
   auto sol
       = CastNZ<mp::NLSolver>(nlse->p_nlsol_)->ReadSolution();
   return NLW2_WrapNLSOL_Solution_C(nlse, std::move(sol));