Fix CE2017

Author: ewarchul

include/cecxx/benchmark/cec_2017/basic_problems.hpp

@@ -24,10 +24,10 @@
 
 namespace cecxx::benchmark::cec_2017 {
 static constexpr auto basic_1 = detail::basic_problem_invoker{
-    cecxx::functions::unimodal::sum_diff_pow, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
+    cecxx::functions::unimodal::bent_cigar, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
 
 static constexpr auto basic_2 = detail::basic_problem_invoker{
-    cecxx::functions::unimodal::bent_cigar, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
+    cecxx::functions::unimodal::sum_diff_pow, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};
 
 static constexpr auto basic_3 = detail::basic_problem_invoker{
     cecxx::functions::unimodal::ellips, 1.0, {.rot = do_affine_trans::yes, .shift = do_affine_trans::yes}};

include/cecxx/benchmark/cec_2017/complex_problems.hpp

@@ -67,7 +67,7 @@ const auto complex_6 = detail::complex_problem_invoker{std::tuple{basic_16, basi
                                                         }}};
 
 const auto complex_7
-    = detail::complex_problem_invoker{std::tuple{basic_14, basic_7, basic_12, basic_2, basic_3, basic_16},
+    = detail::complex_problem_invoker{std::tuple{basic_14, basic_7, basic_12, basic_1, basic_3, basic_16},
                                       {.deltas = {10.0, 20.0, 30.0, 40.0, 50.0, 60.0},
                                        .biases = {0.0, 100.0, 200.0, 300.0, 400.0, 500.0},
                                        .scales = {

include/cecxx/benchmark/cec_2017/hybrid_problems.hpp

@@ -5,19 +5,19 @@
 
 namespace cecxx::benchmark::cec_2017 {
 const auto hybrid_1 = detail::hybrid_problem_invoker{std::tuple{basic_5, basic_6, basic_7}, {0.2, 0.4, 0.4}};
-const auto hybrid_2 = detail::hybrid_problem_invoker{std::tuple{basic_3, basic_12, basic_2}, {0.3, 0.3, 0.4}};
-const auto hybrid_3 = detail::hybrid_problem_invoker{std::tuple{basic_2, basic_6, basic_9}, {0.3, 0.3, 0.4}};
+const auto hybrid_2 = detail::hybrid_problem_invoker{std::tuple{basic_3, basic_12, basic_1}, {0.3, 0.3, 0.4}};
+const auto hybrid_3 = detail::hybrid_problem_invoker{std::tuple{basic_1, basic_6, basic_9}, {0.3, 0.3, 0.4}};
 const auto hybrid_4
     = detail::hybrid_problem_invoker{std::tuple{basic_3, basic_13, basic_8, basic_7}, {0.2, 0.2, 0.2, 0.4}};
 const auto hybrid_5
-    = detail::hybrid_problem_invoker{std::tuple{basic_2, basic_14, basic_7, basic_6}, {0.2, 0.2, 0.3, 0.3}};
+    = detail::hybrid_problem_invoker{std::tuple{basic_1, basic_14, basic_7, basic_6}, {0.2, 0.2, 0.3, 0.3}};
 const auto hybrid_6
     = detail::hybrid_problem_invoker{std::tuple{basic_16, basic_14, basic_6, basic_12}, {0.2, 0.2, 0.3, 0.3}};
 const auto hybrid_7 = detail::hybrid_problem_invoker{std::tuple{basic_17, basic_13, basic_18, basic_12, basic_7},
                                                      {0.1, 0.2, 0.2, 0.2, 0.3}};
 const auto hybrid_8 = detail::hybrid_problem_invoker{std::tuple{basic_3, basic_13, basic_7, basic_14, basic_4},
                                                      {0.2, 0.2, 0.2, 0.2, 0.2}};
-const auto hybrid_9 = detail::hybrid_problem_invoker{std::tuple{basic_2, basic_7, basic_18, basic_12, basic_16},
+const auto hybrid_9 = detail::hybrid_problem_invoker{std::tuple{basic_1, basic_7, basic_18, basic_19, basic_16},
                                                      {0.2, 0.2, 0.2, 0.2, 0.2}};
 const auto hybrid_10 = detail::hybrid_problem_invoker{
     std::tuple{basic_14, basic_17, basic_13, basic_7, basic_12, basic_8}, {0.1, 0.1, 0.2, 0.2, 0.2, 0.2}};

src/benchmark/cec_2017/problem_evaluation_mappings.cpp

@@ -13,21 +13,21 @@ auto evaluate(detail::problem_context_view_t ctx, const problem_number_t fn, std
         case 2:
             return basic_2(input, ctx);
         case 3:
-            return basic_3(input, ctx);
+            return basic_5(input, ctx);
         case 4:
-            return basic_4(input, ctx);
+            return basic_6(input, ctx);
         case 5:
-            return basic_5(input, ctx);
+            return basic_7(input, ctx);
         case 6:
-            return basic_6(input, ctx);
+            return basic_8(input, ctx);
         case 7:
-            return basic_7(input, ctx);
+            return basic_9(input, ctx);
         case 8:
-            return basic_8(input, ctx);
+            return basic_10(input, ctx);
         case 9:
-            return basic_9(input, ctx);
+            return basic_11(input, ctx);
         case 10:
-            return basic_10(input, ctx);
+            return basic_12(input, ctx);
         case 11:
             return hybrid_1(input, ctx);
         case 12: