MP2NL: 'nonlinear' vars #237

ampl · Nov 12, 2024 · a7bc189 · a7bc189
1 parent a9cee98
commit a7bc189
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 177 deletions.
diff --git a/include/mp/flat/nl_expr/constr_nl.h b/include/mp/flat/nl_expr/constr_nl.h
@@ -122,7 +122,7 @@ class NLBaseAssign
   /// Imitate
   double coef(int i) const { assert(!i); return -1.0; }
   /// Imitate
-  double var(int i) const { assert(!i); return GetVar(); }
+  int var(int i) const { assert(!i); return GetVar(); }
 
   /// Throw - should not be used
   VarArray1 GetArguments() const { MP_RAISE("No marking for NL items"); }

diff --git a/include/mp/nl-reader.h b/include/mp/nl-reader.h
@@ -2131,7 +2131,8 @@ class NLProblemBuilder {
   /// Add variables
   void AddVariables(const NLHeader& h) {
     // Distinguish NL variable order
-    // See D.M.Gay, Hooking Your Solver to AMPL; and Writing .NL Files,
+    // See D.M.Gay, Hooking Your Solver to AMPL;
+    //     D.M.Gay, Writing .NL Files;
     // and, e.g.,
     // github.com/jump-dev/MathOptInterface.jl/blob/master/src/FileFormats/NL/README.md
     int k=0;                             // current block position