MO Emulator: fix .objabstol, .objreltol #239

ampl · Jun 15, 2024 · b450cad · b450cad
1 parent 7c8be43
commit b450cad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/include/mp/flat/converter_model.h b/include/mp/flat/converter_model.h
@@ -338,9 +338,9 @@ class FlatModel
 
     mapi.InitProblemModificationPhase(GetModelInfo());
     PushVariablesTo(mapi);
+    PushCustomConstraintsTo(mapi);
     if (!if_skip_pushing_objs())
       PushObjectivesTo(mapi);
-    PushCustomConstraintsTo(mapi);
     mapi.FinishProblemModificationPhase();
   }
 

diff --git a/include/mp/flat/converter_multiobj.h b/include/mp/flat/converter_multiobj.h
@@ -173,11 +173,12 @@ class MOManager {
       std::function<sol::Status(void)> get_stt, std::function<Solution(void)> get_sol) {
     if (++i_current_obj_ >= obj_new_.size()) {
       status_ = MOManagerStatus::FINISHED;
-      MPD( GetEnv() ).Print(
-          "\n\n"
-          "==============================================================================\n"
-          "MULTI-OBJECTIVE MODE: done.\n\n");
-      return false;                              // all done
+			if (MPD( GetEnv() ).verbose_mode())
+				MPD( GetEnv() ).Print(
+							"\n\n"
+							"==============================================================================\n"
+							"MULTI-OBJECTIVE MODE: done.\n\n");
+			return false;                              // all done
     }
     if (MPD( GetEnv() ).verbose_mode())
       MPD( GetEnv() ).Print(
@@ -216,17 +217,17 @@ class MOManager {
     if (obj_last.GetQPTerms().size()) {
       if (obj::MAX == obj_last.obj_sense())
         MPD( AddConstraint(
-            QuadConGE{ { obj_last.GetLinTerms(), obj_last.GetQPTerms() }, objval_last_ } ) );
+						QuadConGE{ { obj_last.GetLinTerms(), obj_last.GetQPTerms() }, lim } ) );
       else
         MPD( AddConstraint(
-            QuadConLE{ { obj_last.GetLinTerms(), obj_last.GetQPTerms() }, objval_last_ } ) );
+						QuadConLE{ { obj_last.GetLinTerms(), obj_last.GetQPTerms() }, lim } ) );
     } else {
       if (obj::MAX == obj_last.obj_sense())
         MPD( AddConstraint(
-            LinConGE{ { obj_last.GetLinTerms() }, objval_last_ } ) );
+						LinConGE{ { obj_last.GetLinTerms() }, lim } ) );
       else
         MPD( AddConstraint(
-            LinConLE{ { obj_last.GetLinTerms() }, objval_last_ } ) );
+						LinConLE{ { obj_last.GetLinTerms() }, lim } ) );
     }
   }