c++: Renamed class and fixed namespace naming

1 files changed, 27 insertions, 27 deletions

diff --git a/src/kelunit/unit_reduction.h b/src/kelunit/unit_reduction.h
index d3299ff..d9060d2 100644
--- a/src/kelunit/unit_reduction.h
+++ b/src/kelunit/unit_reduction.h
@@ -8,7 +8,7 @@ template<typename... T>
 constexpr bool is_always_false = false;
 
 template<typename UnitType, int64_t Exponent>
-struct unit_base;
+struct unit_component;
 
 template<typename StorageT, typename... T>
 class unit;
@@ -26,8 +26,8 @@ class unit_redux_list {
 };
 
 template<typename T0, int64_t E0, typename... TL, int64_t... EL>
-struct unit_redux_list<unit_base<T0,E0>, unit_base<TL,EL>...> {
-	using reduced_type = typename unit_matching<unit_redux_list<unit_base<T0,E0>, unit_base<TL,EL>...>, unit_redux_list<>>::type;
+struct unit_redux_list<unit_component<T0,E0>, unit_component<TL,EL>...> {
+	using reduced_type = typename unit_matching<unit_redux_list<unit_component<T0,E0>, unit_component<TL,EL>...>, unit_redux_list<>>::type;
 };
 
 template<typename T, typename U, typename V>
@@ -37,24 +37,24 @@ public:
 };
 
 template<typename T, int64_t E, typename T0, int64_t E0, typename... TL, int64_t... EL, typename... TR, int64_t... ER>
-class unit_matching_reduce<unit_base<T,E>, unit_redux_list<unit_base<T0,E0>,unit_base<TL,EL>...>, unit_redux_list<unit_base<TR,ER>...>> {
+class unit_matching_reduce<unit_component<T,E>, unit_redux_list<unit_component<T0,E0>,unit_component<TL,EL>...>, unit_redux_list<unit_component<TR,ER>...>> {
 public:
 	static constexpr bool is_same = std::is_same_v<T,T0>;
 
-	using match_reduce_type = typename std::conditional<is_same, unit_base<T,E+E0>, unit_base<T,E>>::type;
-	using match_reduce_unit_redux_list = typename std::conditional<is_same, unit_redux_list<unit_base<TR,ER>...>, unit_redux_list<unit_base<TR,ER>..., unit_base<T0,E0>>>::type;
+	using match_reduce_type = typename std::conditional<is_same, unit_component<T,E+E0>, unit_component<T,E>>::type;
+	using match_reduce_unit_redux_list = typename std::conditional<is_same, unit_redux_list<unit_component<TR,ER>...>, unit_redux_list<unit_component<TR,ER>..., unit_component<T0,E0>>>::type;
 
-	using value_type = typename unit_matching_reduce<match_reduce_type, unit_redux_list<unit_base<TL,EL>...>, match_reduce_unit_redux_list>::value_type;
-	using unit_redux_list_type = typename unit_matching_reduce<match_reduce_type, unit_redux_list<unit_base<TL,EL>...>, match_reduce_unit_redux_list>::unit_redux_list_type;
+	using value_type = typename unit_matching_reduce<match_reduce_type, unit_redux_list<unit_component<TL,EL>...>, match_reduce_unit_redux_list>::value_type;
+	using unit_redux_list_type = typename unit_matching_reduce<match_reduce_type, unit_redux_list<unit_component<TL,EL>...>, match_reduce_unit_redux_list>::unit_redux_list_type;
 
-	static constexpr int64_t value_num = unit_matching_reduce<match_reduce_type, unit_redux_list<unit_base<TL,EL>...>, match_reduce_unit_redux_list>::value_num;
+	static constexpr int64_t value_num = unit_matching_reduce<match_reduce_type, unit_redux_list<unit_component<TL,EL>...>, match_reduce_unit_redux_list>::value_num;
 };
 
 template<typename T, int64_t E, typename... TR, int64_t... ER>
-class unit_matching_reduce<unit_base<T,E>, unit_redux_list<>, unit_redux_list<unit_base<TR,ER>...>> {
+class unit_matching_reduce<unit_component<T,E>, unit_redux_list<>, unit_redux_list<unit_component<TR,ER>...>> {
 public:
-	using value_type = unit_base<T,E>;
-	using unit_redux_list_type = unit_redux_list<unit_base<TR,ER>...>;
+	using value_type = unit_component<T,E>;
+	using unit_redux_list_type = unit_redux_list<unit_component<TR,ER>...>;
 
 	static constexpr int64_t value_num = E;
 };
@@ -65,20 +65,20 @@ class unit_matching {
 };
 
 template<typename... T, int64_t... E>
-class unit_matching<unit_redux_list<>,unit_redux_list<unit_base<T,E>...>> {
+class unit_matching<unit_redux_list<>,unit_redux_list<unit_component<T,E>...>> {
 public:
-	using type = unit_redux_list<unit_base<T,E>...>;
+	using type = unit_redux_list<unit_component<T,E>...>;
 
 };
 
 template<typename T0, int64_t E0, typename... TL, int64_t... EL, typename... TR, int64_t... ER>
-class unit_matching<unit_redux_list<unit_base<T0,E0>,unit_base<TL,EL>...>, unit_redux_list<unit_base<TR,ER>...>> {
+class unit_matching<unit_redux_list<unit_component<T0,E0>,unit_component<TL,EL>...>, unit_redux_list<unit_component<TR,ER>...>> {
 public:
-	using reduced_value_type = typename unit_matching_reduce<unit_base<T0,E0>, unit_redux_list<unit_base<TL,EL>...>, unit_redux_list<>>::value_type;
-	using reduced_unit_redux_list_type = typename unit_matching_reduce<unit_base<T0,E0>, unit_redux_list<unit_base<TL,EL>...>, unit_redux_list<>>::unit_redux_list_type;
+	using reduced_value_type = typename unit_matching_reduce<unit_component<T0,E0>, unit_redux_list<unit_component<TL,EL>...>, unit_redux_list<>>::value_type;
+	using reduced_unit_redux_list_type = typename unit_matching_reduce<unit_component<T0,E0>, unit_redux_list<unit_component<TL,EL>...>, unit_redux_list<>>::unit_redux_list_type;
 
-	static constexpr int64_t reduced_value_num = unit_matching_reduce<unit_base<T0,E0>, unit_redux_list<unit_base<TL,EL>...>, unit_redux_list<>>::value_num;
-	using reduced_result_unit_redux_list = typename std::conditional<reduced_value_num == 0, unit_redux_list<unit_base<TR,ER>...>, unit_redux_list<unit_base<TR,ER>...,reduced_value_type>>::type;
+	static constexpr int64_t reduced_value_num = unit_matching_reduce<unit_component<T0,E0>, unit_redux_list<unit_component<TL,EL>...>, unit_redux_list<>>::value_num;
+	using reduced_result_unit_redux_list = typename std::conditional<reduced_value_num == 0, unit_redux_list<unit_component<TR,ER>...>, unit_redux_list<unit_component<TR,ER>...,reduced_value_type>>::type;
 
 	using type = typename unit_matching<reduced_unit_redux_list_type, reduced_result_unit_redux_list>::type;
 };
@@ -90,9 +90,9 @@ public:
 };
 
 template<typename StorageT, typename... UnitTypes, int64_t... UnitExponents>
-class unit_matching_add_storage<unit_redux_list<unit_base<UnitTypes,UnitExponents>...>, StorageT> {
+class unit_matching_add_storage<unit_redux_list<unit_component<UnitTypes,UnitExponents>...>, StorageT> {
 public:
-	using type = unit<StorageT, unit_base<UnitTypes,UnitExponents>...>;
+	using type = unit<StorageT, unit_component<UnitTypes,UnitExponents>...>;
 };
 
 }
@@ -103,9 +103,9 @@ class unit_reduction {
 };
 
 template<typename StorageT, typename... UnitT, int64_t... UnitE>
-class unit_reduction<StorageT, unit_base<UnitT, UnitE>...> {
+class unit_reduction<StorageT, unit_component<UnitT, UnitE>...> {
 public:
-	using list_type = typename impl::unit_matching<impl::unit_redux_list<unit_base<UnitT, UnitE>...>, impl::unit_redux_list<>>::type;
+	using list_type = typename impl::unit_matching<impl::unit_redux_list<unit_component<UnitT, UnitE>...>, impl::unit_redux_list<>>::type;
 	using type = typename impl::unit_matching_add_storage<list_type, StorageT>::type;
 };
 
@@ -115,9 +115,9 @@ class unit_invert {
 };
 
 template<typename StorageT, typename... UnitT, int64_t... UnitE>
-class unit_invert<StorageT, unit_base<UnitT, UnitE>...> {
+class unit_invert<StorageT, unit_component<UnitT, UnitE>...> {
 public:
-	using type = unit<StorageT, unit_base<UnitT, -UnitE>...>;
+	using type = unit<StorageT, unit_component<UnitT, -UnitE>...>;
 };
 
 template<typename T, typename U>
@@ -126,8 +126,8 @@ class unit_multiplication{
 };
 
 template<typename StorageT, typename... UnitT, int64_t... UnitE, typename... UnitRhsT, int64_t... UnitRhsE>
-class unit_multiplication<unit<StorageT, unit_base<UnitT,UnitE>...>, unit<StorageT, unit_base<UnitRhsT, UnitRhsE>...>> {
+class unit_multiplication<unit<StorageT, unit_component<UnitT,UnitE>...>, unit<StorageT, unit_component<UnitRhsT, UnitRhsE>...>> {
 public:
-	using type = typename unit_reduction<StorageT, unit_base<UnitT,UnitE>..., unit_base<UnitRhsT, UnitRhsE>...>::type;
+	using type = typename unit_reduction<StorageT, unit_component<UnitT,UnitE>..., unit_component<UnitRhsT, UnitRhsE>...>::type;
 };
 }