Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Aug 6, 2023. It is now read-only.

Commit ed08ea1

Browse files
luk036luk036
committed
new EllAlgo 1.4.0
1 parent b74d557 commit ed08ea1

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎specific.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CPMAddPackage(
77

88
CPMAddPackage(
99
NAME EllAlgo
10-
GIT_TAG 1.3.8
10+
GIT_TAG 1.4.0
1111
GITHUB_REPOSITORY luk036/ellalgo-cpp
1212
OPTIONS "INSTALL_ONLY YES" # create an installable target
1313
)

‎test/source/test_lmi.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ TEST_CASE("LMI test (stable)") {
137137
auto t = 1e100; // std::numeric_limits<double>::max()
138138
const auto result = cutting_plane_optim(omega, ellip, t);
139139
auto x = std::get<0>(result);
140-
auto ell_info = std::get<1>(result);
141-
// fmt::print("{:f} {} {} \n", t, ell_info.num_iters, ell_info.feasible);
140+
auto num_iters = std::get<1>(result);
141+
// fmt::print("{:f} {} {} \n", t, num_iters, ell_info.feasible);
142142
// std::cout << "LMI xbest: " << xb << "\n";
143143
// std::cout << "LMI result: " << fb << ", " << niter << ", " << feasible <<
144144
// ", " << status
@@ -151,8 +151,8 @@ TEST_CASE("LMI test (stable)") {
151151
// "registry using the
152152
// spdlog::get(logger_name)");
153153

154-
CHECK(ell_info.feasible);
155-
CHECK(ell_info.num_iters == 112);
154+
CHECK(x.size() != 0U);
155+
CHECK(num_iters == 112);
156156
}
157157

158158
TEST_CASE("LMI test ") {
@@ -206,10 +206,10 @@ TEST_CASE("LMI test ") {
206206
auto ellip = EllStable<Vec>(10.0, Vec{0.0, 0.0, 0.0});
207207

208208
auto t = 1e100; // std::numeric_limits<double>::max()
209-
const auto result = cutting_plane_optim(omega, ellip, t);
210-
auto x = std::get<0>(result);
211-
auto ell_info = std::get<1>(result);
209+
const auto __result = cutting_plane_optim(omega, ellip, t);
210+
const auto &x = std::get<0>(__result);
211+
const auto &num_iters = std::get<1>(__result);
212212

213-
CHECK(ell_info.feasible);
214-
CHECK(ell_info.num_iters == 111);
213+
CHECK(x.size() != 0U);
214+
CHECK(num_iters == 111);
215215
}

‎test/source/test_lmi_old.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ TEST_CASE("LMI test (stable)") {
135135
auto ellip = Ell<Vec>(10.0, Vec{0.0, 0.0, 0.0});
136136

137137
auto t = 1e100; // std::numeric_limits<double>::max()
138-
// const auto [x, ell_info] = cutting_plane_optim(omega, ellip, t);
138+
// const auto [x, num_iters] = cutting_plane_optim(omega, ellip, t);
139139
const auto result = cutting_plane_optim(omega, ellip, t);
140140
auto x = std::get<0>(result);
141-
auto ell_info = std::get<1>(result);
142-
// fmt::print("{:f} {} {} \n", t, ell_info.num_iters, ell_info.feasible);
141+
auto num_iters = std::get<1>(result);
142+
// fmt::print("{:f} {} {} \n", t, num_iters, ell_info.feasible);
143143
// std::cout << "LMI xbest: " << xb << "\n";
144144
// std::cout << "LMI result: " << fb << ", " << niter << ", " << feasible <<
145145
// ", " << status
@@ -152,8 +152,8 @@ TEST_CASE("LMI test (stable)") {
152152
// "registry using the
153153
// spdlog::get(logger_name)");
154154

155-
CHECK(ell_info.feasible);
156-
CHECK(ell_info.num_iters == 112);
155+
CHECK(x.size() != 0U);
156+
CHECK(num_iters == 112);
157157
}
158158

159159
TEST_CASE("LMI test ") {
@@ -207,11 +207,11 @@ TEST_CASE("LMI test ") {
207207
auto ellip = EllStable<Vec>(10.0, Vec{0.0, 0.0, 0.0});
208208

209209
auto t = 1e100; // std::numeric_limits<double>::max()
210-
// const auto [x, ell_info] = cutting_plane_optim(omega, ellip, t);
210+
// const auto [x, num_iters] = cutting_plane_optim(omega, ellip, t);
211211
const auto result = cutting_plane_optim(omega, ellip, t);
212-
auto x = std::get<0>(result);
213-
auto ell_info = std::get<1>(result);
212+
const auto &x = std::get<0>(result);
213+
const auto &num_iters = std::get<1>(result);
214214

215-
CHECK(ell_info.feasible);
216-
CHECK(ell_info.num_iters == 111);
215+
CHECK(x.size() != 0U);
216+
CHECK(num_iters == 111);
217217
}

‎test_lmi_old.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ TEST_CASE("LMI test (stable)") {
135135
auto E = Ell<Vec>(10.0, Vec{0.0, 0.0, 0.0});
136136

137137
auto t = 1e100; // std::numeric_limits<double>::max()
138-
// const auto [x, ell_info] = cutting_plane_optim(P, E, t);
138+
// const auto [x, num_iters] = cutting_plane_optim(P, E, t);
139139
const auto result = cutting_plane_optim(P, E, t);
140140
auto x = std::get<0>(result);
141-
auto ell_info = std::get<1>(result);
142-
// fmt::print("{:f} {} {} \n", t, ell_info.num_iters, ell_info.feasible);
141+
auto num_iters = std::get<1>(result);
142+
// fmt::print("{:f} {} {} \n", t, num_iters, ell_info.feasible);
143143
// std::cout << "LMI xbest: " << xb << "\n";
144144
// std::cout << "LMI result: " << fb << ", " << niter << ", " << feasible <<
145145
// ", " << status
@@ -153,7 +153,7 @@ TEST_CASE("LMI test (stable)") {
153153
// spdlog::get(logger_name)");
154154

155155
CHECK(ell_info.feasible);
156-
CHECK(ell_info.num_iters == 112);
156+
CHECK(num_iters == 112);
157157
}
158158

159159
TEST_CASE("LMI test ") {
@@ -207,11 +207,11 @@ TEST_CASE("LMI test ") {
207207
auto E = EllStable<Vec>(10.0, Vec{0.0, 0.0, 0.0});
208208

209209
auto t = 1e100; // std::numeric_limits<double>::max()
210-
// const auto [x, ell_info] = cutting_plane_optim(P, E, t);
210+
// const auto [x, num_iters] = cutting_plane_optim(P, E, t);
211211
const auto result = cutting_plane_optim(P, E, t);
212212
auto x = std::get<0>(result);
213-
auto ell_info = std::get<1>(result);
213+
auto num_iters = std::get<1>(result);
214214

215215
CHECK(ell_info.feasible);
216-
CHECK(ell_info.num_iters == 111);
216+
CHECK(num_iters == 111);
217217
}

0 commit comments

Comments
 (0)