Skip to content

Commit b56f4b6

Browse files
ewarchulewarchul
committed
Format code
1 parent 031190b commit b56f4b6

File tree

4 files changed

+47
-42
lines changed

4 files changed

+47
-42
lines changed

‎include/cecxx/benchmark/cec_2014/basic_problems.hpp‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,24 @@ static constexpr auto basic_2 = detail::basic_problem_invoker{
2828
cecxx::functions::unimodal::bent_cigar, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
2929
static constexpr auto basic_3 = detail::basic_problem_invoker{
3030
cecxx::functions::multimodal::discus, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
31-
static constexpr auto basic_4 = detail::basic_problem_invoker{
32-
cecxx::functions::multimodal::rosenbrock, 2.048 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
31+
static constexpr auto basic_4
32+
= detail::basic_problem_invoker{cecxx::functions::multimodal::rosenbrock,
33+
2.048 / 100.0,
34+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
3335
static constexpr auto basic_5 = detail::basic_problem_invoker{
3436
cecxx::functions::multimodal::ackley, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
35-
static constexpr auto basic_6 = detail::basic_problem_invoker{
36-
cecxx::functions::multimodal::weierstrass, 0.5 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
37+
static constexpr auto basic_6
38+
= detail::basic_problem_invoker{cecxx::functions::multimodal::weierstrass,
39+
0.5 / 100.0,
40+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
3741
static constexpr auto basic_7 = detail::basic_problem_invoker{
3842
cecxx::functions::multimodal::griewank, 6.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
3943
static constexpr auto basic_8 = detail::basic_problem_invoker{
4044
cecxx::functions::multimodal::rastrigin, 5.12 / 100.0, {.rot = do_affine_trans::no, .shift = do_affine_trans::yes}};
41-
static constexpr auto basic_9 = detail::basic_problem_invoker{
42-
cecxx::functions::multimodal::rastrigin, 5.12 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
45+
static constexpr auto basic_9
46+
= detail::basic_problem_invoker{cecxx::functions::multimodal::rastrigin,
47+
5.12 / 100.0,
48+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
4349
static constexpr auto basic_10 = detail::basic_problem_invoker{
4450
cecxx::functions::multimodal::schwefel, 10.0, {.rot = do_affine_trans::no, .shift = do_affine_trans::yes}};
4551
static constexpr auto basic_11 = detail::basic_problem_invoker{
@@ -50,8 +56,10 @@ static constexpr auto basic_13 = detail::basic_problem_invoker{
5056
cecxx::functions::multimodal::happycat, 5.0 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
5157
static constexpr auto basic_14 = detail::basic_problem_invoker{
5258
cecxx::functions::multimodal::hgbat, 5.0 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
53-
static constexpr auto basic_15 = detail::basic_problem_invoker{
54-
cecxx::functions::multimodal::grie_rosen, 5.0 / 100.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
59+
static constexpr auto basic_15
60+
= detail::basic_problem_invoker{cecxx::functions::multimodal::grie_rosen,
61+
5.0 / 100.0,
62+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
5563
static constexpr auto basic_16 = detail::basic_problem_invoker{
5664
cecxx::functions::multimodal::escaffer, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
5765

‎include/cecxx/benchmark/cec_2014/hybrid_problems.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
namespace cecxx::benchmark::cec_2014 {
77
const auto hybrid_1 = detail::hybrid_problem_invoker{std::tuple{basic_11, basic_9, basic_1}, {0.3, 0.3, 0.4}};
88
const auto hybrid_2 = detail::hybrid_problem_invoker{std::tuple{basic_2, basic_14, basic_9}, {0.3, 0.3, 0.4}};
9-
const auto hybrid_3 = detail::hybrid_problem_invoker{std::tuple{basic_7, basic_6, basic_4, basic_16}, {0.2, 0.2, 0.3, 0.3}};
9+
const auto hybrid_3
10+
= detail::hybrid_problem_invoker{std::tuple{basic_7, basic_6, basic_4, basic_16}, {0.2, 0.2, 0.3, 0.3}};
1011
const auto hybrid_4
1112
= detail::hybrid_problem_invoker{std::tuple{basic_14, basic_3, basic_15, basic_9}, {0.2, 0.2, 0.3, 0.3}};
1213
const auto hybrid_5 = detail::hybrid_problem_invoker{std::tuple{basic_16, basic_14, basic_4, basic_10, basic_1},
1314
{0.1, 0.2, 0.2, 0.2, 0.3}};
14-
const auto hybrid_6
15-
= detail::hybrid_problem_invoker{std::tuple{basic_12, basic_13, basic_15, basic_11, basic_5}, {0.1, 0.2, 0.2, 0.2, 0.3}};
15+
const auto hybrid_6 = detail::hybrid_problem_invoker{std::tuple{basic_12, basic_13, basic_15, basic_11, basic_5},
16+
{0.1, 0.2, 0.2, 0.2, 0.3}};
1617
} // namespace cecxx::benchmark::cec_2014

‎include/cecxx/benchmark/cec_2017/complex_problems.hpp‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ const auto complex_7
107107
= detail::complex_problem_invoker{std::tuple{basic_14, basic_7, basic_12, basic_1, basic_3, basic_16},
108108
{.deltas = {10.0, 20.0, 30.0, 40.0, 50.0, 60.0},
109109
.biases = {0.0, 100.0, 200.0, 300.0, 400.0, 500.0},
110-
.masks = {
111-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
112-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
113-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
114-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
115-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
116-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
117-
},
110+
.masks = {
111+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
112+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
113+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
114+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
115+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
116+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}
117+
},
118118

119119
.scales = {
120120
{0, 10},
@@ -129,15 +129,14 @@ const auto complex_8
129129
= detail::complex_problem_invoker{std::tuple{basic_13, basic_20, basic_4, basic_6, basic_15, basic_16},
130130
{.deltas = {10.0, 20.0, 30.0, 40.0, 50.0, 60.0},
131131
.biases = {0.0, 100.0, 200.0, 300.0, 400.0, 500.0},
132-
.masks = {
133-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
134-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
135-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
136-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
137-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
138-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
139-
},
140-
132+
.masks = {
133+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
134+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
135+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
136+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
137+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
138+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}
139+
},
141140
.scales = {
142141
{0, 10},
143142
{1, 10},
@@ -152,12 +151,11 @@ const auto complex_9 = detail::complex_problem_invoker{
152151
{
153152
.deltas = {10.0, 30.0, 50.0},
154153
.biases = {0.0, 100.0, 200.0},
155-
.masks = {
156-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
157-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
158-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
159-
},
160-
154+
.masks = {
155+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
156+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
157+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}
158+
},
161159
.scales = {{0, 1}, {1, 1}, {2, 1}}
162160
}};
163161

@@ -166,12 +164,11 @@ const auto complex_10 = detail::complex_problem_invoker{
166164
{
167165
.deltas = {10.0, 30.0, 50.0},
168166
.biases = {0.0, 100.0, 200.0},
169-
.masks = {
170-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
171-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
172-
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
173-
},
174-
167+
.masks = {
168+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
169+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes},
170+
{.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}
171+
},
175172
.scales = {{0, 1}, {1, 1}, {2, 1}}
176173
}};
177174
} // namespace cecxx::benchmark::cec_2017

‎include/cecxx/benchmark/detail/problem_invokers/hybrid_problem_invoker.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ template <typename... F>
3131
class hybrid_problem_invoker {
3232
public:
3333
constexpr hybrid_problem_invoker(std::tuple<F...> compounds, std::vector<double> compound_ratios)
34-
: compounds{compounds}, compound_ratios{std::move(compound_ratios)} {
35-
}
34+
: compounds{compounds}, compound_ratios{std::move(compound_ratios)} {}
3635

3736
auto operator()(std::span<const double> input, problem_context_view_t ctx,
3837
affine_mask_t mask = {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}) const -> double {

0 commit comments

Comments
 (0)