Redefine Not by a linear expr

ampl · Aug 28, 2024 · 6e6c366 · 6e6c366
1 parent ea950a1
commit 6e6c366
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/include/mp/flat/redef/MIP/logical_not.h b/include/mp/flat/redef/MIP/logical_not.h
@@ -22,14 +22,17 @@ class NotConverter_MIP :
 
   /// Convert in both contexts (full reification)
   void Convert(const ItemType& nc, int ) {
-    /// Obtain negation variable via map
-    int var_res_lin = GetMC().AssignResultVar2Args(
-          LinearFunctionalConstraint(
-            {{{-1.0}, {nc.GetArguments()[0]}}, 1.0}));
-    GetMC().AddConstraint_AS_ROOT(LinConEQ{    // Could use RedefineVariable()
-                            { {-1.0, 1.0},
-                              {nc.GetResultVar(), var_res_lin} },
-                            {0.0}});
+    LinearFunctionalConstraint funccon {{{{-1.0}, {nc.GetArguments()[0]}}, 1.0}};
+    funccon.SetContext( GetMC().GetInitExprContext(nc.GetResultVar()) );
+    GetMC().RedefineVariable(nc.GetResultVar(), std::move(funccon));
+    // Old way, no expression: /// Obtain negation variable via map
+    // int var_res_lin = GetMC().AssignResultVar2Args(
+    //       LinearFunctionalConstraint(
+    //         {{{-1.0}, {nc.GetArguments()[0]}}, 1.0}));
+    // GetMC().AddConstraint_AS_ROOT(LinConEQ{    // Could use RedefineVariable()
+    //                         { {-1.0, 1.0},
+    //                           {nc.GetResultVar(), var_res_lin} },
+    //                         {0.0}});
   }
 
   /// Reuse the stored ModelConverter