Overloaded Uno::solve() with no user callbacks (this passes a NoUserC…

…allbacks object that does nothing)
cvanaret · Nov 20, 2024 · f3c2191 · f3c2191
1 parent 6060c49
commit f3c2191
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/uno/Uno.cpp b/uno/Uno.cpp
@@ -31,6 +31,14 @@ namespace uno {
 
    Level Logger::level = INFO;
 
+   // solve without user callbacks
+   void Uno::solve(const Model& model, Iterate& current_iterate, const Options& options) {
+      // pass user callbacks that do nothing
+      NoUserCallbacks user_callbacks{};
+      this->solve(model, current_iterate, options, user_callbacks);
+   }
+
+   // solve with user callbacks
    void Uno::solve(const Model& model, Iterate& current_iterate, const Options& options, UserCallbacks& user_callbacks) {
       Timer timer{};
       Statistics statistics = Uno::create_statistics(model, options);

diff --git a/uno/Uno.hpp b/uno/Uno.hpp
@@ -20,6 +20,8 @@ namespace uno {
    public:
       Uno(GlobalizationMechanism& globalization_mechanism, const Options& options);
 
+      // solve with or without user callbacks
+      void solve(const Model& model, Iterate& initial_iterate, const Options& options);
       void solve(const Model& model, Iterate& initial_iterate, const Options& options, UserCallbacks& user_callbacks);
 
       static std::string current_version();

diff --git a/uno/tools/UserCallbacks.hpp b/uno/tools/UserCallbacks.hpp
@@ -19,6 +19,15 @@ namespace uno {
       virtual void notify_new_primals(const Vector<double>& primals) = 0;
       virtual void notify_new_multipliers(const Multipliers& multipliers) = 0;
    };
+
+   class NoUserCallbacks: public UserCallbacks {
+   public:
+      NoUserCallbacks(): UserCallbacks() { }
+
+      void notify_acceptable_iterate(const Vector<double>& /*primals*/, const Multipliers& /*multipliers*/, double /*objective_multiplier*/) override { }
+      void notify_new_primals(const Vector<double>& /*primals*/) override { }
+      void notify_new_multipliers(const Multipliers& /*multipliers*/) override { }
+   };
 } // namespace
 
 #endif //UNO_USERCALLBACKS_H