Move alpaqa::Box to alpaqa::sets

This avoids alpaqa_tag_invoke ambiguities
kul-optec · Sep 6, 2023 · 6415693 · 6415693
1 parent 16559b4
commit 6415693
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/src/alpaqa/include/alpaqa/functions/indicator-box.hpp b/src/alpaqa/include/alpaqa/functions/indicator-box.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <alpaqa/config/config.hpp>
-#include <alpaqa/problem/box.hpp>
 #include <alpaqa/functions/prox.hpp>
+#include <alpaqa/problem/box.hpp>
 #include <cassert>
 
-namespace alpaqa {
+namespace alpaqa::sets {
 
 template <Config Conf>
 typename Conf::real_t

diff --git a/src/alpaqa/include/alpaqa/problem/box-constr-problem.hpp b/src/alpaqa/include/alpaqa/problem/box-constr-problem.hpp
@@ -139,7 +139,7 @@ class BoxConstrProblem {
     }
 
     /// @see @ref TypeErasedProblem::eval_proj_diff_g
-    void eval_proj_diff_g(crvec z, rvec p) const { p = alpaqa::projecting_difference(z, D); }
+    void eval_proj_diff_g(crvec z, rvec p) const { p = projecting_difference(z, D); }
 
     static void eval_proj_multipliers_box(const Box &D, rvec y, real_t M,
                                           index_t penalty_alm_split) {

diff --git a/src/alpaqa/include/alpaqa/problem/box.hpp b/src/alpaqa/include/alpaqa/problem/box.hpp
@@ -5,6 +5,8 @@
 
 namespace alpaqa {
 
+namespace sets {
+
 template <Config Conf = DefaultConfig>
 struct Box {
     USING_ALPAQA_CONFIG(Conf);
@@ -76,4 +78,8 @@ inline auto dist_squared(const auto &v,        ///< [in] The vector to project
     return d.dot(Σ.asDiagonal() * d);
 }
 
+} // namespace sets
+
+using sets::Box;
+
 } // namespace alpaqa
diff --git a/src/interop/casadi/include/alpaqa/casadi/CasADiControlProblem.hpp b/src/interop/casadi/include/alpaqa/casadi/CasADiControlProblem.hpp
@@ -132,9 +132,9 @@ class CasADiControlProblem {
     void eval_proj_diff_g(crvec z, rvec e) const {
         for (index_t t = 0; t < N; ++t)
             e.segment(t * nc, nc) =
-                alpaqa::projecting_difference(z.segment(t * nc, nc), D);
+                projecting_difference(z.segment(t * nc, nc), D);
         e.segment(N * nc, nc_N) =
-            alpaqa::projecting_difference(z.segment(N * nc, nc_N), D_N);
+            projecting_difference(z.segment(N * nc, nc_N), D_N);
     }
     /// @see @ref TypeErasedControlProblem::eval_proj_multipliers
     void eval_proj_multipliers(rvec y, real_t M) const {

diff --git a/test/inner/test-panoc.cpp b/test/inner/test-panoc.cpp
@@ -90,12 +90,12 @@ TEST(PANOC, calc_ψ_grad_ψ) {
     vec invΣy = Σ.asDiagonal().inverse() * y;
 
     auto ψ_fun = [&op, &f, &g, &Σ, &invΣy](crvec x) -> real_t {
-        return f(x) + 0.5 * alpaqa::dist_squared(g(x) + invΣy, op.D, Σ);
+        return f(x) + 0.5 * dist_squared(g(x) + invΣy, op.D, Σ);
     };
 
     // Compute ψ and ∇ψ manually
     vec ζ     = g(x) + invΣy;
-    vec ẑ     = alpaqa::project(ζ, op.D);
+    vec ẑ     = project(ζ, op.D);
     vec d     = ζ - ẑ;
     vec ŷ     = Σ.asDiagonal() * d;
     real_t ψ  = f(x) + 0.5 * d.dot(ŷ);
@@ -251,12 +251,12 @@ TEST(PANOC, hessian) {
     vec invΣy = Σ.asDiagonal().inverse() * y;
 
     auto ψ_fun = [&op, &f, &g, &Σ, &invΣy](crvec x) -> real_t {
-        return f(x) + 0.5 * alpaqa::dist_squared(g(x) + invΣy, op.D, Σ);
+        return f(x) + 0.5 * dist_squared(g(x) + invΣy, op.D, Σ);
     };
 
     // Compute ψ and ∇ψ manually
     vec ζ     = g(x) + invΣy;
-    vec ẑ     = alpaqa::project(ζ, op.D);
+    vec ẑ     = project(ζ, op.D);
     vec d     = ζ - ẑ;
     vec ŷ     = Σ.asDiagonal() * d;
     real_t ψ  = f(x) + 0.5 * d.dot(ŷ);