22
22
// #include <xtensor-blas/xlinalg.hpp>
23
23
24
24
/* *
25
- * @brief my_oracle
25
+ * @brief my_old_oracle
26
26
*
27
27
*/
28
- class my_oracle {
28
+ class my_old_oracle {
29
29
using Arr = xt::xarray<double , xt::layout_type::row_major>;
30
30
using M_t = std::vector<Arr>;
31
31
using Cut = std::tuple<Arr, double >;
@@ -45,8 +45,8 @@ class my_oracle {
45
45
* @param[in] B2
46
46
* @param[in] c
47
47
*/
48
- my_oracle (gsl::span<const Arr> F1, Arr B1, gsl::span<const Arr> F2, Arr B2 ,
49
- Arr c)
48
+ my_old_oracle (gsl::span<const Arr> F1, Arr B1, gsl::span<const Arr> F2,
49
+ Arr B2, Arr c)
50
50
: lmi1{F1, std::move (B1)}, lmi2{F2, std::move (B2)}, c{std::move (c)} {}
51
51
52
52
/* *
@@ -90,7 +90,7 @@ TEST_CASE("LMI (old) test") {
90
90
{{-5.0 , 2.0 , -17.0 }, {2.0 , -6.0 , 8.0 }, {-17.0 , 8.0 , 6.0 }}};
91
91
auto B2 = Arr{{14.0 , 9.0 , 40.0 }, {9.0 , 91.0 , 10.0 }, {40.0 , 10.0 , 15.0 }};
92
92
auto c = Arr{1.0 , -1.0 , 1.0 };
93
- auto P = my_oracle (F1, std::move (B1), F2, std::move (B2), std::move (c));
93
+ auto P = my_old_oracle (F1, std::move (B1), F2, std::move (B2), std::move (c));
94
94
auto E = ell (10.0 , Arr{0.0 , 0.0 , 0.0 });
95
95
auto t = 1e100 ; // std::numeric_limits<double>::max()
96
96
const auto [x, ell_info] = cutting_plane_dc (P, E, t);
@@ -115,7 +115,7 @@ TEST_CASE("LMI (old) test (stable)") {
115
115
{{-5.0 , 2.0 , -17.0 }, {2.0 , -6.0 , 8.0 }, {-17.0 , 8.0 , 6.0 }}};
116
116
auto B2 = Arr{{14.0 , 9.0 , 40.0 }, {9.0 , 91.0 , 10.0 }, {40.0 , 10.0 , 15.0 }};
117
117
auto c = Arr{1.0 , -1.0 , 1.0 };
118
- auto P = my_oracle (F1, std::move (B1), F2, std::move (B2), std::move (c));
118
+ auto P = my_old_oracle (F1, std::move (B1), F2, std::move (B2), std::move (c));
119
119
auto E = ell_stable (10.0 , Arr{0.0 , 0.0 , 0.0 });
120
120
auto t = 1e100 ; // std::numeric_limits<double>::max()
121
121
const auto [x, ell_info] = cutting_plane_dc (P, E, t);
0 commit comments