sleipnirgroup-jormungandr 0.6.7.dev4__tar.gz → 0.6.7.dev5__tar.gz

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sleipnirgroup-jormungandr
-Version: 0.6.7.dev4
+Version: 0.6.7.dev5
 Summary: Reverse mode autodiff library and NLP solver DSL
 License-Expression: BSD-3-Clause
 License-File: LICENSE.txt

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/include/sleipnir/optimization/solver/ipm.hpp

@@ -375,6 +375,13 @@ ExitStatus ipm(const IPMMatrixCallbacks<Scalar>& matrix_callbacks,
     }
   }};
 
+  // Print initial iterate diagnostics
+  if (options.diagnostics) {
+    print_initial_iterate_diagnostics(
+        E_0, f, c_e.template lpNorm<1>() + (c_i - s).template lpNorm<1>(),
+        s.dot(z), μ);
+  }
+
   while (E_0 > Scalar(options.tolerance)) {
     ScopedProfiler inner_iter_profiler{inner_iter_prof};
 

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/include/sleipnir/optimization/solver/newton.hpp

@@ -156,6 +156,11 @@ ExitStatus newton(
     }
   }};
 
+  // Print initial iterate diagnostics
+  if (options.diagnostics) {
+    print_initial_iterate_diagnostics(E_0, f, Scalar(0), Scalar(0), Scalar(0));
+  }
+
   while (E_0 > Scalar(options.tolerance)) {
     ScopedProfiler inner_iter_profiler{inner_iter_prof};
 

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/include/sleipnir/optimization/solver/sqp.hpp

@@ -253,6 +253,12 @@ ExitStatus sqp(const SQPMatrixCallbacks<Scalar>& matrix_callbacks,
     }
   }};
 
+  // Print initial iterate diagnostics
+  if (options.diagnostics) {
+    print_initial_iterate_diagnostics(E_0, f, c_e.template lpNorm<1>(),
+                                      Scalar(0), Scalar(0));
+  }
+
   while (E_0 > Scalar(options.tolerance)) {
     ScopedProfiler inner_iter_profiler{inner_iter_prof};
 

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/include/sleipnir/util/print_diagnostics.hpp

@@ -175,6 +175,35 @@ inline void print_bound_constraint_global_infeasibility_error(
 #define print_bound_constraint_global_infeasibility_error(...)
 #endif
 
+#ifndef SLEIPNIR_DISABLE_DIAGNOSTICS
+/// Prints diagnostics for the initial iterate.
+///
+/// @tparam Scalar Scalar type.
+/// @param error The error.
+/// @param cost The cost.
+/// @param infeasibility The infeasibility.
+/// @param complementarity The complementarity.
+/// @param μ The barrier parameter.
+template <typename Scalar>
+void print_initial_iterate_diagnostics(Scalar error, Scalar cost,
+                                       Scalar infeasibility,
+                                       Scalar complementarity, Scalar μ) {
+  slp::println("┏{:━^119}┓", "");
+  slp::println(
+      "┃{:^4}   {:^9} {:^10} {:^11} {:^10} {:^8} {:^8} {:^5} {:^5} {:^8} {:^8} "
+      "{:^8} {:^8} {:^2}┃",
+      "iter", "duration", "error", "cost", "infeas.", "complem.", "μ", "δ", "γ",
+      "|p_pr|", "|p_du|", "α_pr", "α_du", "↩");
+  slp::println("┡{:━^119}┩", "");
+
+  slp::println(
+      "│init   {:^9} {:10.4e} {:11.4e} {:10.4e} {:8.2e} {:8.2e} {:^50}│", "",
+      error, cost, infeasibility, complementarity, μ, "");
+}
+#else
+#define print_initial_iterate_diagnostics(...)
+#endif
+
 #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS
 /// Prints diagnostics for the current iteration.
 ///
@@ -206,12 +235,8 @@ void print_iteration_diagnostics(int iterations, IterationType type,
                                  Scalar full_dual_step_inf_norm,
                                  Scalar primal_α, Scalar primal_α_max,
                                  Scalar α_reduction_factor, Scalar dual_α) {
-  if (iterations % 20 == 0) {
-    if (iterations == 0) {
-      slp::println("┏{:━^119}┓", "");
-    } else {
-      slp::println("┢{:━^119}┪", "");
-    }
+  if (iterations > 0 && iterations % 20 == 0) {
+    slp::println("┢{:━^119}┪", "");
     slp::println(
         "┃{:^4}   {:^9} {:^10} {:^11} {:^10} {:^8} {:^8} {:^5} {:^5} {:^8} "
         "{:^8} {:^8} {:^8} {:^2}┃",

{sleipnirgroup_jormungandr-0.6.7.dev4 → sleipnirgroup_jormungandr-0.6.7.dev5}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *
 
-__version__ = "0.6.7.dev4"
+__version__ = "0.6.7.dev5"