rename some objects and functions

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
+  VERSION 1.3.1
   LANGUAGES CXX
 )
 

bench/BM_lmi.cpp

@@ -1,5 +1,5 @@
-#include <ellalgo/cutting_plane.hpp>    // for cutting_plane_dc
-#include <ellalgo/ell.hpp>              // for ell
+#include <ellalgo/cutting_plane.hpp>    // for cutting_plane_optim
+#include <ellalgo/ell.hpp>              // for Ell
 #include <gsl/span>                     // for span
 #include <lmisolver/lmi_old_oracle.hpp> // for lmi_old_oracle
 #include <lmisolver/lmi_oracle.hpp>     // for lmi_oracle
@@ -88,9 +88,9 @@ static void LMI_Lazy(benchmark::State &state) {
 
   while (state.KeepRunning()) {
     auto P = my_oracle<lmi_oracle<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(10.0, Arr{0.0, 0.0, 0.0});
     auto t = 1e100; // std::numeric_limits<double>::max()
-    [[maybe_unused]] const auto rslt = cutting_plane_dc(P, E, t);
+    [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);
   }
 }
 
@@ -121,9 +121,9 @@ static void LMI_old(benchmark::State &state) {
   while (state.KeepRunning()) {
     auto P =
         my_oracle<lmi_old_oracle<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(10.0, Arr{0.0, 0.0, 0.0});
     auto t = 1e100; // std::numeric_limits<double>::max()
-    [[maybe_unused]] const auto rslt = cutting_plane_dc(P, E, t);
+    [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);
   }
 }
 BENCHMARK(LMI_old);
@@ -149,10 +149,10 @@ static void LMI_No_Trick(benchmark::State &state) {
 
   while (state.KeepRunning()) {
     auto P = my_oracle<lmi_oracle<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(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_dc(P, E, t);
+    [[maybe_unused]] const auto rslt = cutting_plane_optim(P, E, t);
   }
 }
 

specific.cmake

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

test/source/test_lmi.cpp

@@ -3,9 +3,9 @@
  */
 #include <doctest/doctest.h> // for ResultBuilder, CHECK, TestCase
 
-#include <ellalgo/cutting_plane.hpp>   // for cutting_plane_dc
-#include <ellalgo/ell.hpp>             // for ell
-#include <ellalgo/ell_stable.hpp>      // for ell_stable
+#include <ellalgo/cutting_plane.hpp>   // for cutting_plane_optim
+#include <ellalgo/ell.hpp>             // for Ell
+#include <ellalgo/ell_stable.hpp>      // for EllStable
 #include <lmisolver/lmi_oracle.hpp>    // for lmi_oracle
 #include <xtensor/xarray.hpp>          // for xarray_container
 #include <xtensor/xlayout.hpp>         // for layout_type, layout_type::row...
@@ -92,10 +92,10 @@ 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(10.0, Arr{0.0, 0.0, 0.0});
 
   auto t = 1e100; // std::numeric_limits<double>::max()
-  const auto [x, ell_info] = cutting_plane_dc(P, E, t);
+  const auto [x, ell_info] = cutting_plane_optim(P, E, t);
   // fmt::print("{:f} {} {} \n", t, ell_info.num_iters, ell_info.feasible);
   // std::cout << "LMI xbest: " << xb << "\n";
   // std::cout << "LMI result: " << fb << ", " << niter << ", " << feasible <<
@@ -128,10 +128,10 @@ 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 = ell_stable(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = EllStable(10.0, Arr{0.0, 0.0, 0.0});
 
   auto t = 1e100; // std::numeric_limits<double>::max()
-  const auto [x, ell_info] = cutting_plane_dc(P, E, t);
+  const auto [x, ell_info] = cutting_plane_optim(P, E, t);
 
   CHECK(ell_info.feasible);
   CHECK(ell_info.num_iters == 111);

test/source/test_lmi_old.cpp

@@ -3,9 +3,9 @@
  */
 #include <doctest/doctest.h> // for ResultBuilder, CHECK, TestCase
 
-#include <ellalgo/cutting_plane.hpp>    // for cutting_plane_dc
-#include <ellalgo/ell.hpp>              // for ell
-#include <ellalgo/ell_stable.hpp>       // for ell_stable
+#include <ellalgo/cutting_plane.hpp>    // for cutting_plane_optim
+#include <ellalgo/ell.hpp>              // for Ell
+#include <ellalgo/ell_stable.hpp>       // for EllStable
 #include <gsl/span>                     // for span
 #include <lmisolver/lmi_old_oracle.hpp> // for lmi_old_oracle
 #include <optional>                     // for optional
@@ -91,9 +91,9 @@ 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(10.0, Arr{0.0, 0.0, 0.0});
   auto t = 1e100; // std::numeric_limits<double>::max()
-  const auto [x, ell_info] = cutting_plane_dc(P, E, t);
+  const auto [x, ell_info] = cutting_plane_optim(P, E, t);
 
   CHECK(x[0] < -0.3);
   CHECK(ell_info.feasible);
@@ -116,9 +116,9 @@ 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 = ell_stable(10.0, Arr{0.0, 0.0, 0.0});
+  auto E = EllStable(10.0, Arr{0.0, 0.0, 0.0});
   auto t = 1e100; // std::numeric_limits<double>::max()
-  const auto [x, ell_info] = cutting_plane_dc(P, E, t);
+  const auto [x, ell_info] = cutting_plane_optim(P, E, t);
 
   CHECK(ell_info.feasible);
   CHECK(ell_info.num_iters == 111);