Ell is now a template class

Author: luk036

CMakeLists.txt

@@ -12,7 +12,7 @@ option(INSTALL_ONLY "Enable for installation only" OFF)
 # Note: update this to your new project's name and version
 project(
   LmiSolver
-  VERSION 1.3.2
+  VERSION 1.3.3
   LANGUAGES CXX
 )
 

bench/BM_lmi.cpp

@@ -99,7 +99,7 @@ static void LMI_Lazy(benchmark::State &state) {
 
   while (state.KeepRunning()) {
     auto P = my_oracle<LmiOracle<Arr>>(F1, B1, F2, B2, Arr{1.0, -1.0, 1.0});
-    auto E = Ell(10.0, Arr{0.0, 0.0, 0.0});
+    auto E = Ell<Arr>(10.0, Arr{0.0, 0.0, 0.0});
     auto t = 1e100; // std::numeric_limits<double>::max()
     [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);
   }
@@ -131,7 +131,7 @@ static void LMI_old(benchmark::State &state) {
 
   while (state.KeepRunning()) {
     auto P = my_oracle<LmiOldOracle<Arr>>(F1, B1, F2, B2, Arr{1.0, -1.0, 1.0});
-    auto E = Ell(10.0, Arr{0.0, 0.0, 0.0});
+    auto E = Ell<Arr>(10.0, Arr{0.0, 0.0, 0.0});
     auto t = 1e100; // std::numeric_limits<double>::max()
     [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);
   }
@@ -159,7 +159,7 @@ static void LMI_No_Trick(benchmark::State &state) {
 
   while (state.KeepRunning()) {
     auto P = my_oracle<LmiOracle<Arr>>(F1, B1, F2, B2, Arr{1.0, -1.0, 1.0});
-    auto E = Ell(10.0, Arr{0.0, 0.0, 0.0});
+    auto E = Ell<Arr>(10.0, Arr{0.0, 0.0, 0.0});
     E.no_defer_trick = true;
     auto t = 1e100; // std::numeric_limits<double>::max()
     [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);

include/lmisolver/ldlt_ext.hpp

@@ -2,8 +2,8 @@
 #pragma once
 
 #include <cstddef> // for size_t
-#include <utility> // for pair
 #include <ellalgo/ell_matrix.hpp>
+#include <utility> // for pair
 
 /**
  * @brief LDLT factorization for LMI

source/ldlt_ext.cpp

@@ -4,9 +4,7 @@
 #include <lmisolver/ldlt_ext.hpp>
 
 template <typename Arr036>
-ldlt_ext<Arr036>::ldlt_ext(size_t N)
-    : witness_vec(0.0, N), _n{N}, T{N} {
-}
+ldlt_ext<Arr036>::ldlt_ext(size_t N) : witness_vec(0.0, N), _n{N}, T{N} {}
 
 /**
  * @brief witness that certifies $A$ is not
@@ -38,8 +36,7 @@ template <typename Arr036> auto ldlt_ext<Arr036>::witness() -> double {
  * @return double
  */
 template <typename Arr036>
-auto ldlt_ext<Arr036>::sym_quad(const Arr036 &A) const
-    -> double {
+auto ldlt_ext<Arr036>::sym_quad(const Arr036 &A) const -> double {
   auto res = double{};
   const auto &v = this->witness_vec;
   // const auto& [start, stop] = this->p;
@@ -67,8 +64,7 @@ using Arr = xt::xarray<double, xt::layout_type::row_major>;
  *
  * @return typename ldlt_ext<Arr036>::Mat
  */
-template <typename Arr036>
-auto ldlt_ext<Arr036>::sqrt() -> Arr036 {
+template <typename Arr036> auto ldlt_ext<Arr036>::sqrt() -> Arr036 {
   assert(this->is_spd());
 
   Arr036 M = xt::zeros<double>({this->_n, this->_n});

specific.cmake

@@ -19,7 +19,7 @@ endif(xtensor_ADDED)
 
 CPMAddPackage(
   NAME EllAlgo
-  GIT_TAG 1.3.3
+  GIT_TAG 1.3.4
   GITHUB_REPOSITORY luk036/ellalgo-cpp
   OPTIONS "INSTALL_ONLY YES" # create an installable target
 )

test/source/test_lmi.cpp

@@ -103,7 +103,7 @@ TEST_CASE("LMI test (stable)") {
   auto B2 = Arr{{14.0, 9.0, 40.0}, {9.0, 91.0, 10.0}, {40.0, 10.0, 15.0}};
 
   auto P = my_oracle(F1, B1, F2, B2, std::move(c));
-  auto E = Ell(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = Ell<Arr>(10.0, Arr{0.0, 0.0, 0.0});
 
   auto t = 1e100; // std::numeric_limits<double>::max()
   const auto [x, ell_info] = cutting_plane_optim(P, E, t);
@@ -139,7 +139,7 @@ TEST_CASE("LMI test ") {
   auto B2 = Arr{{14.0, 9.0, 40.0}, {9.0, 91.0, 10.0}, {40.0, 10.0, 15.0}};
 
   auto P = my_oracle(F1, B1, F2, B2, std::move(c));
-  auto E = EllStable(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = EllStable<Arr>(10.0, Arr{0.0, 0.0, 0.0});
 
   auto t = 1e100; // std::numeric_limits<double>::max()
   const auto [x, ell_info] = cutting_plane_optim(P, E, t);

test/source/test_lmi_old.cpp

@@ -102,7 +102,7 @@ TEST_CASE("LMI (old) test") {
   auto B2 = Arr{{14.0, 9.0, 40.0}, {9.0, 91.0, 10.0}, {40.0, 10.0, 15.0}};
   auto c = Arr{1.0, -1.0, 1.0};
   auto P = my_old_oracle(F1, std::move(B1), F2, std::move(B2), std::move(c));
-  auto E = Ell(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = Ell<Arr>(10.0, Arr{0.0, 0.0, 0.0});
   auto t = 1e100; // std::numeric_limits<double>::max()
   const auto [x, ell_info] = cutting_plane_optim(P, E, t);
 
@@ -127,7 +127,7 @@ TEST_CASE("LMI (old) test (stable)") {
   auto B2 = Arr{{14.0, 9.0, 40.0}, {9.0, 91.0, 10.0}, {40.0, 10.0, 15.0}};
   auto c = Arr{1.0, -1.0, 1.0};
   auto P = my_old_oracle(F1, std::move(B1), F2, std::move(B2), std::move(c));
-  auto E = EllStable(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = EllStable<Arr>(10.0, Arr{0.0, 0.0, 0.0});
   auto t = 1e100; // std::numeric_limits<double>::max()
   const auto [x, ell_info] = cutting_plane_optim(P, E, t);