sleipnirgroup-jormungandr 0.5.6.dev18__tar.gz → 0.5.6.dev20__tar.gz

{sleipnirgroup_jormungandr-0.5.6.dev18 → sleipnirgroup_jormungandr-0.5.6.dev20}/PKG-INFO

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

{sleipnirgroup_jormungandr-0.5.6.dev18 → sleipnirgroup_jormungandr-0.5.6.dev20}/include/sleipnir/optimization/solver/interior_point.hpp

@@ -567,11 +567,9 @@ ExitStatus interior_point(
           scope_exit soc_exit{[&] {
             soc_profiler.stop();
 
-            if (options.diagnostics) {
+            if (options.diagnostics && step_acceptable) {
               print_iteration_diagnostics(
-                  iterations,
-                  step_acceptable ? IterationType::ACCEPTED_SOC
-                                  : IterationType::REJECTED_SOC,
+                  iterations, IterationType::SECOND_ORDER_CORRECTION,
                   soc_profiler.current_duration(),
                   unscaled_kkt_error<Scalar, KKTErrorType::INF_NORM_SCALED>(
                       matrices.scaling, g, A_e, trial_c_e, A_i, trial_c_i,

{sleipnirgroup_jormungandr-0.5.6.dev18 → sleipnirgroup_jormungandr-0.5.6.dev20}/include/sleipnir/optimization/solver/sqp.hpp

@@ -393,11 +393,9 @@ ExitStatus sqp(const SQPMatrixCallbacks<Scalar>& matrix_callbacks,
           scope_exit soc_exit{[&] {
             soc_profiler.stop();
 
-            if (options.diagnostics) {
+            if (options.diagnostics && step_acceptable) {
               print_iteration_diagnostics(
-                  iterations,
-                  step_acceptable ? IterationType::ACCEPTED_SOC
-                                  : IterationType::REJECTED_SOC,
+                  iterations, IterationType::SECOND_ORDER_CORRECTION,
                   soc_profiler.current_duration(),
                   kkt_error<Scalar, KKTErrorType::INF_NORM_SCALED>(
                       g, A_e, trial_c_e, trial_y),

{sleipnirgroup_jormungandr-0.5.6.dev18 → sleipnirgroup_jormungandr-0.5.6.dev20}/include/sleipnir/util/print_diagnostics.hpp

@@ -24,10 +24,8 @@ namespace slp {
 enum class IterationType : uint8_t {
   /// Normal iteration.
   NORMAL,
-  /// Accepted second-order correction iteration.
-  ACCEPTED_SOC,
-  /// Rejected second-order correction iteration.
-  REJECTED_SOC,
+  /// Second-order correction iteration.
+  SECOND_ORDER_CORRECTION,
   /// Feasibility restoration iteration.
   FEASIBILITY_RESTORATION
 };
@@ -202,16 +200,16 @@ void print_iteration_diagnostics(int iterations, IterationType type,
                                  Scalar α_reduction_factor, Scalar dual_α) {
   if (iterations % 20 == 0) {
     if (iterations == 0) {
-      slp::println("┏{:━^122}┓", "");
+      slp::println("┏{:━^119}┓", "");
     } else {
-      slp::println("┢{:━^122}┪", "");
+      slp::println("┢{:━^119}┪", "");
     }
     slp::println(
-        "┃{:^4} {:^4} {:^9} {:^10} {:^11} {:^10} {:^8} {:^8} {:^5} {:^5} {:^8} "
+        "┃{:^4}   {:^9} {:^10} {:^11} {:^10} {:^8} {:^8} {:^5} {:^5} {:^8} "
         "{:^8} {:^8} {:^8} {:^2}┃",
-        "iter", "type", "duration", "error", "cost", "infeas.", "complem.", "μ",
-        "δ", "γ", "|p_pr|", "|p_du|", "α_pr", "α_du", "↩");
-    slp::println("┡{:━^122}┩", "");
+        "iter", "duration", "error", "cost", "infeas.", "complem.", "μ", "δ",
+        "γ", "|p_pr|", "|p_du|", "α_pr", "α_du", "↩");
+    slp::println("┡{:━^119}┩", "");
   }
 
   // For the number of backtracks, we want x such that:
@@ -228,9 +226,9 @@ void print_iteration_diagnostics(int iterations, IterationType type,
   int backtracks =
       static_cast<int>(log(primal_α / primal_α_max) / log(α_reduction_factor));
 
-  constexpr std::array ITERATION_TYPES{"norm", "✓SOC", "XSOC", "rest"};
+  constexpr std::array ITERATION_TYPES{" ", "s", "r"};
   slp::println(
-      "│{:4} {:4} {:9.3f} {:.4e} {:11.4e} {:.4e} {:.2e} {:.2e} {:<5} {:<5} "
+      "│{:4} {:1} {:9.3f} {:.4e} {:11.4e} {:.4e} {:.2e} {:.2e} {:<5} {:<5} "
       "{:.2e} {:.2e} {:.2e} {:.2e} {:2d}│",
       iterations, ITERATION_TYPES[std::to_underlying(type)], to_ms(time), error,
       cost, infeasibility, complementarity, μ, power_of_10(δ), power_of_10(γ),
@@ -244,7 +242,7 @@ void print_iteration_diagnostics(int iterations, IterationType type,
 #ifndef SLEIPNIR_DISABLE_DIAGNOSTICS
 /// Prints bottom of iteration diagnostics table.
 inline void print_bottom_iteration_diagnostics() {
-  slp::println("└{:─^122}┘", "");
+  slp::println("└{:─^119}┘", "");
 }
 #else
 #define print_bottom_iteration_diagnostics(...)

{sleipnirgroup_jormungandr-0.5.6.dev18 → sleipnirgroup_jormungandr-0.5.6.dev20}/python/src/sleipnir/__init__.py

@@ -2,4 +2,4 @@
 
 from ._sleipnir import *
 
-__version__ = "0.5.6.dev18"
+__version__ = "0.5.6.dev20"