Change GridAxis constructor argument order...again.

bigladder · Feb 15, 2024 · b726d64 · b726d64
1 parent a21884a
commit b726d64
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/include/btwxt/grid-axis.h b/include/btwxt/grid-axis.h
@@ -33,11 +33,11 @@ class GridAxis : public Courier::Sender {
 
     explicit GridAxis(
         std::vector<double> values,
-        std::string name = "",
-        const std::shared_ptr<Courier::Courier>& courier = std::make_shared<BtwxtDefaultCourier>(),
         InterpolationMethod interpolation_method = InterpolationMethod::linear,
         ExtrapolationMethod extrapolation_method = ExtrapolationMethod::constant,
-        std::pair<double, double> extrapolation_limits = {-DBL_MAX, DBL_MAX});
+        std::pair<double, double> extrapolation_limits = {-DBL_MAX, DBL_MAX},
+        std::string name = "",
+        const std::shared_ptr<Courier::Courier>& courier = std::make_shared<BtwxtDefaultCourier>());
 
     // Setters
     void set_interpolation_method(InterpolationMethod interpolation_method_in);

diff --git a/src/grid-axis.cpp b/src/grid-axis.cpp
@@ -8,11 +8,11 @@
 namespace Btwxt {
 
 GridAxis::GridAxis(std::vector<double> values_in,
-                   std::string name,
-                   const std::shared_ptr<Courier::Courier>& courier_in,
                    InterpolationMethod interpolation_method,
                    ExtrapolationMethod extrapolation_method,
-                   std::pair<double, double> extrapolation_limits)
+                   std::pair<double, double> extrapolation_limits,
+                   std::string name,
+                   const std::shared_ptr<Courier::Courier>& courier_in)
     : Courier::Sender(std::move(name), courier_in)
     , values(std::move(values_in))
     , interpolation_method(interpolation_method)

diff --git a/src/regular-grid-interpolator.cpp b/src/regular-grid-interpolator.cpp
@@ -20,11 +20,11 @@ std::vector<GridAxis> construct_grid_axes(const std::vector<std::vector<double>>
     grid_axes.reserve(grid_axis_vectors.size());
     for (const auto& axis : grid_axis_vectors) {
         grid_axes.emplace_back(axis,
-                               fmt::format("Axis {}", grid_axes.size() + 1),
-                               courier_in,
                                InterpolationMethod::linear,
                                ExtrapolationMethod::constant,
-                               std::pair<double, double> {-DBL_MAX, DBL_MAX});
+                               std::pair<double, double> {-DBL_MAX, DBL_MAX},
+                               fmt::format("Axis {}", grid_axes.size() + 1),
+                               courier_in);
     }
     return grid_axes;
 }

diff --git a/test/grid-axis-tests.cpp b/test/grid-axis-tests.cpp
@@ -45,8 +45,6 @@ TEST(GridAxis, calculate_cubic_spacing_ratios)
     static constexpr std::size_t ceiling = 1;
 
     GridAxis grid_axis({6., 10., 15., 20., 22.},
-                       "",
-                       std::make_shared<BtwxtDefaultCourier>(),
                        InterpolationMethod::cubic,
                        ExtrapolationMethod::constant,
                        {-DBL_MAX, DBL_MAX});

diff --git a/test/implementation-tests.cpp b/test/implementation-tests.cpp
@@ -281,14 +281,18 @@ TEST_F(Grid2DImplementationFixture, interpolation_coefficients)
 
 TEST_F(Grid2DImplementationFixture, construct_from_axes)
 {
-    GridAxis ax0 = GridAxis({0, 10, 15}, "ax0");
+    GridAxis ax0 = GridAxis({0, 10, 15},
+                            InterpolationMethod::linear,
+                            ExtrapolationMethod::constant,
+                            {-DBL_MAX, DBL_MAX},
+                            "ax0");
     auto courier = ax0.get_courier();
     GridAxis ax1 = GridAxis({4, 6},
-                            "ax1",
-                            courier,
                             InterpolationMethod::linear,
                             ExtrapolationMethod::constant,
-                            {-DBL_MAX, DBL_MAX});
+                            {-DBL_MAX, DBL_MAX},
+                            "ax1",
+                            courier);
     std::vector<GridAxis> test_axes = {ax0, ax1};
     interpolator = RegularGridInterpolatorImplementation(test_axes, "Test 2D Grid RGI", courier);
     EXPECT_EQ(interpolator.get_number_of_grid_axes(), 2u);