From 7ead50acfcdb3ad889493c759079e38f3b32dffc Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Mon, 10 May 2021 16:45:38 +0200
Subject: [PATCH] refactor: `derived_kind` template parameters reordered to be
 compatible with a `derived_unit`

Resolves #229
---
 docs/framework/dimensions.rst                      | 4 ++--
 example/glide_computer/include/glide_computer.h    | 4 ++--
 src/core/include/units/kind.h                      | 2 +-
 test/unit_test/static/kind_test.cpp                | 2 +-
 test/unit_test/static/quantity_kind_test.cpp       | 4 ++--
 test/unit_test/static/quantity_point_kind_test.cpp | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/framework/dimensions.rst b/docs/framework/dimensions.rst
index 344912a6..55cec054 100644
--- a/docs/framework/dimensions.rst
+++ b/docs/framework/dimensions.rst
@@ -77,7 +77,7 @@ you can use a quantity argument instead of a quantity kind.
     :emphasize-lines: 8-9
 
     struct height_kind : kind<height_kind, dim_length> {};
-    struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, height_kind, dim_speed> {};
+    struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, dim_speed, height_kind> {};
 
     template <Unit U, Representation Rep = double> using height = quantity_kind<height_kind, U, Rep>;
     template <Unit U, Representation Rep = double> using rate_of_climb = quantity_kind<rate_of_climb_kind, U, Rep>;
@@ -90,7 +90,7 @@ you can use a quantity argument instead of a quantity kind.
     :emphasize-lines: 8-12
 
     struct width_kind : kind<width_kind, dim_length> {};
-    struct horizontal_area_kind : derived_kind<horizontal_area_kind, width_kind, dim_area> {};
+    struct horizontal_area_kind : derived_kind<horizontal_area_kind, dim_area, width_kind> {};
 
     template <Unit U, Representation Rep = double> using width = quantity_kind<width_kind, U, Rep>;
     template <Unit U, Representation Rep = double> using horizontal_area = quantity_kind<horizontal_area_kind, U, Rep>;
diff --git a/example/glide_computer/include/glide_computer.h b/example/glide_computer/include/glide_computer.h
index 40341237..8185f95f 100644
--- a/example/glide_computer/include/glide_computer.h
+++ b/example/glide_computer/include/glide_computer.h
@@ -77,8 +77,8 @@ constexpr units::Dimensionless auto operator/(const QK1& lhs, const QK2& rhs)
 using horizontal_kind = geographic::horizontal_kind;
 struct vertical_kind : units::kind<vertical_kind, units::isq::si::dim_length> {};
 struct vertical_point_kind : units::point_kind<vertical_point_kind, vertical_kind> {};
-struct velocity_kind : units::derived_kind<velocity_kind, horizontal_kind, units::isq::si::dim_speed> {};
-struct rate_of_climb_kind : units::derived_kind<rate_of_climb_kind, vertical_kind, units::isq::si::dim_speed> {};
+struct velocity_kind : units::derived_kind<velocity_kind, units::isq::si::dim_speed, horizontal_kind> {};
+struct rate_of_climb_kind : units::derived_kind<rate_of_climb_kind, units::isq::si::dim_speed, vertical_kind> {};
 
 // https://en.wikipedia.org/wiki/Flight_planning#Units_of_measurement
 // length
diff --git a/src/core/include/units/kind.h b/src/core/include/units/kind.h
index 7b1eef7f..5494adc5 100644
--- a/src/core/include/units/kind.h
+++ b/src/core/include/units/kind.h
@@ -54,7 +54,7 @@ using downcast_point_kind = downcast<detail::_point_kind_base<K>>;
 template<typename K, Dimension D>
 struct kind : downcast_dispatch<K, detail::_kind_base<K, D>> {};
 
-template<typename DK, Kind BK, Dimension D>
+template<typename DK, Dimension D, Kind BK>
   requires std::same_as<BK, typename BK::base_kind>
 struct derived_kind : downcast_dispatch<DK, detail::_kind_base<BK, D>> {};
 
diff --git a/test/unit_test/static/kind_test.cpp b/test/unit_test/static/kind_test.cpp
index 37d43849..fb6ba0bc 100644
--- a/test/unit_test/static/kind_test.cpp
+++ b/test/unit_test/static/kind_test.cpp
@@ -151,7 +151,7 @@ static_assert(!equivalent<abscissa::_point_kind_base, horizontal_velocity>);
 
 struct height : kind<height, dim_length> {};
 
-struct rate_of_climb : derived_kind<rate_of_climb, height, dim_speed> {};    // program-defined derived kind
+struct rate_of_climb : derived_kind<rate_of_climb, dim_speed, height> {};    // program-defined derived kind
 struct velocity_of_climb : point_kind<velocity_of_climb, rate_of_climb> {};  // program-defined derived point kind
 
 static_assert(Kind<rate_of_climb>);
diff --git a/test/unit_test/static/quantity_kind_test.cpp b/test/unit_test/static/quantity_kind_test.cpp
index 1dc9a5f2..1cc20856 100644
--- a/test/unit_test/static/quantity_kind_test.cpp
+++ b/test/unit_test/static/quantity_kind_test.cpp
@@ -52,8 +52,8 @@ struct radius_kind : kind<radius_kind, dim_length> {};
 struct width_kind : kind<width_kind, dim_length> {};
 struct height_kind : kind<height_kind, dim_length> {};
 
-struct horizontal_area_kind : derived_kind<horizontal_area_kind, width_kind, dim_area> {};
-struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, height_kind, dim_speed> {};
+struct horizontal_area_kind : derived_kind<horizontal_area_kind, dim_area, width_kind> {};
+struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, dim_speed, height_kind> {};
 
 struct apple : kind<apple, dim_one> {};
 struct orange : kind<orange, dim_one> {};
diff --git a/test/unit_test/static/quantity_point_kind_test.cpp b/test/unit_test/static/quantity_point_kind_test.cpp
index df8cb952..b92ba9b5 100644
--- a/test/unit_test/static/quantity_point_kind_test.cpp
+++ b/test/unit_test/static/quantity_point_kind_test.cpp
@@ -54,7 +54,7 @@ struct ordinate_kind : point_kind<ordinate_kind, height_kind> {};
 struct distance_kind : kind<distance_kind, dim_length> {};
 struct cgs_width_kind : kind<cgs_width_kind, cgs::dim_length> {};
 struct cgs_height_kind : kind<cgs_height_kind, cgs::dim_length> {};
-struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, height_kind, dim_speed> {};
+struct rate_of_climb_kind : derived_kind<rate_of_climb_kind, dim_speed, height_kind> {};
 struct altitude_kind : point_kind<altitude_kind, cgs_height_kind> {};
 
 struct apple : kind<apple, dim_one> {};