Merge branch 'master' into develop

loliGothicK · Feb 26, 2020 · b09c2b4 · b09c2b4
2 parents 3e76293 + d91bb80
commit b09c2b4
Show file tree

Hide file tree

Showing 336 changed files with 1,430 additions and 855 deletions.
diff --git a/include/dimensional/dimensional.hpp b/include/dimensional/dimensional.hpp
@@ -1,11 +1,11 @@
 #ifndef MITAMA_DIMENSIONAL_HPP
 #define MITAMA_DIMENSIONAL_HPP
-#include <dimensional/fwd/dimensional_fwd.hpp>
-#include <dimensional/fwd/system.hpp>
-#include <dimensional/mitamagic/utility_ext.hpp>
-#include <dimensional/mitamagic/type_traits_ext.hpp>
-#include <dimensional/mitamagic/ratio_ext.hpp>
-#include <dimensional/mitamagic/type_list.hpp>
+#include <mitama/dimensional/fwd/dimensional_fwd.hpp>
+#include <mitama/dimensional/fwd/system.hpp>
+#include <mitama/dimensional/mitamagic/utility_ext.hpp>
+#include <mitama/dimensional/mitamagic/type_traits_ext.hpp>
+#include <mitama/dimensional/mitamagic/ratio_ext.hpp>
+#include <mitama/dimensional/mitamagic/type_list.hpp>
 #include <type_traits>
 
 namespace mitama::mitamagic {

diff --git a/include/dimensional/math/all.hpp b/include/dimensional/math/all.hpp
diff --git a/include/dimensional/quantity.hpp b/include/dimensional/quantity.hpp
@@ -1,7 +1,7 @@
 #ifndef MITAMA_DIMENSIONAL_QUANTITY_HPP
 #define MITAMA_DIMENSIONAL_QUANTITY_HPP
-#include <dimensional/fwd/quantity_fwd.hpp>
-#include <dimensional/dimensional_traits.hpp>
+#include <mitama/dimensional/fwd/quantity_fwd.hpp>
+#include <mitama/dimensional/dimensional_traits.hpp>
 
 namespace mitama {
 

diff --git a/include/dimensional/systems/si/all.hpp b/include/dimensional/systems/si/all.hpp
diff --git a/include/dimensional/systems/si/base_units/all.hpp b/include/dimensional/systems/si/base_units/all.hpp
diff --git a/include/dimensional/systems/si/base_units/ampere.hpp b/include/dimensional/systems/si/base_units/ampere.hpp
@@ -1,8 +1,8 @@
 #ifndef MITAMA_DIMENSIONAL_SI_UNITS_AMPERE_HPP
 #define MITAMA_DIMENSIONAL_SI_UNITS_AMPERE_HPP
-#include <dimensional/systems/si/base_units/fwd/si_base_units.hpp>
-#include <dimensional/systems/si/prefix.hpp>
-#include <dimensional/units.hpp>
+#include <mitama/dimensional/systems/si/base_units/fwd/si_base_units.hpp>
+#include <mitama/dimensional/systems/si/prefix.hpp>
+#include <mitama/dimensional/units.hpp>
 
 namespace mitama::systems::si {
 

diff --git a/include/dimensional/systems/si/base_units/fwd/si_base_units.hpp b/include/dimensional/systems/si/base_units/fwd/si_base_units.hpp
@@ -1,16 +1,16 @@
 #ifndef MITAMA_DIMENSIONAL_SI_BASE_UNITS_FWD_HPP
 #define MITAMA_DIMENSIONAL_SI_BASE_UNITS_FWD_HPP
-#include <dimensional/systems/si/base_dimension/electric_current.hpp>
-#include <dimensional/systems/si/base_dimension/luminous_intensity.hpp>
-#include <dimensional/systems/si/base_dimension/thermodynamic_temperature.hpp>
-#include <dimensional/systems/si/base_dimension/mass.hpp>
-#include <dimensional/systems/si/base_dimension/length.hpp>
-#include <dimensional/systems/si/base_dimension/amount_of_substance.hpp>
-#include <dimensional/systems/si/base_dimension/time.hpp>
-#include <dimensional/systems/si/base_dimension/angle.hpp>
-#include <dimensional/systems/si/base_dimension/solid_angle.hpp>
-#include <dimensional/units.hpp>
-#include <dimensional/system.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/electric_current.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/luminous_intensity.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/thermodynamic_temperature.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/mass.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/length.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/amount_of_substance.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/time.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/angle.hpp>
+#include <mitama/dimensional/systems/si/base_dimension/solid_angle.hpp>
+#include <mitama/dimensional/units.hpp>
+#include <mitama/dimensional/system.hpp>
 
 namespace mitama::systems::si {
 using ampere_base_unit = base_units<electric_current, 0>;

diff --git a/include/dimensional/systems/si/literals/all.hpp b/include/dimensional/systems/si/literals/all.hpp
diff --git a/include/dimensional/arithmetic.hpp → include/mitama/dimensional/arithmetic.hpp b/include/dimensional/arithmetic.hpp → include/mitama/dimensional/arithmetic.hpp
@@ -1,8 +1,8 @@
 #ifndef MITAMA_DIMENSIONAL_ARITHMETIC_HPP
 #define MITAMA_DIMENSIONAL_ARITHMETIC_HPP
-#include <dimensional/quantity.hpp>
-#include <dimensional/delta.hpp>
-#include <dimensional/system.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/delta.hpp>
+#include <mitama/dimensional/system.hpp>
 
 namespace mitama {
 

diff --git a/include/dimensional/delta.hpp → include/mitama/dimensional/delta.hpp b/include/dimensional/delta.hpp → include/mitama/dimensional/delta.hpp
@@ -1,8 +1,8 @@
 #ifndef MITAMA_DIMENSIONAL_DELTA_HPP
 #define MITAMA_DIMENSIONAL_DELTA_HPP
-#include <dimensional/quantity.hpp>
-#include <dimensional/systems/nonsi/degree_celsius.hpp>
-#include <dimensional/systems/si/base_units/kelvin.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/systems/nonsi/degree_celsius.hpp>
+#include <mitama/dimensional/systems/si/base_units/kelvin.hpp>
 #include <type_traits>
 
 namespace mitama {

diff --git a/include/mitama/dimensional/dimensional.hpp b/include/mitama/dimensional/dimensional.hpp
@@ -0,0 +1,63 @@
+#ifndef MITAMA_DIMENSIONAL_HPP
+#define MITAMA_DIMENSIONAL_HPP
+#include <mitama/dimensional/fwd/dimensional_fwd.hpp>
+#include <mitama/dimensional/fwd/system.hpp>
+#include <mitama/dimensional/mitamagic/utility_ext.hpp>
+#include <mitama/dimensional/mitamagic/type_traits_ext.hpp>
+#include <mitama/dimensional/mitamagic/ratio_ext.hpp>
+#include <mitama/dimensional/mitamagic/type_list.hpp>
+#include <type_traits>
+
+namespace mitama::mitamagic {
+template <class T, class... Types>
+inline constexpr std::size_t dimension_count_v =
+    (static_cast<std::size_t>(std::is_same_v<typename T::dimension_type,
+                                             typename Types::dimension_type>) +
+     ... + std::size_t{}); // type count meta-function
+} // namespace mitama::mitamagic
+
+namespace mitama {
+
+template < class >
+struct si_base_units {};
+
+template <int I, class Dim, class Exponent> struct dimension_tag {};
+
+template <class... Units>
+struct dimensional_t : private Units::tag... // for Dimensional tags
+{
+  template < class T >
+  struct is_wildcard : std::is_same<T, system<>> {};
+  // sanity check for duplicate
+  static_assert(std::conjunction_v<std::bool_constant<
+                    (mitamagic::dimension_count_v<Units, Units...> == 1)>...>,
+                "same dimension is not allowed");
+  // sanity check for system
+  static_assert(mitamagic::tlist_all_same_v<
+                  mitamagic::tlist_remove_if_t<is_wildcard,
+                    mitamagic::type_list<typename Units::system_type...>>>,
+                "different units within a dimension");
+  static constexpr std::size_t value = sizeof...(Units);
+  using system_type
+    = mitamagic::tlist_element_t<0,
+        std::conditional_t<
+          std::is_same_v<
+            mitamagic::type_list<>,
+            mitamagic::tlist_remove_if_t<is_wildcard,
+              mitamagic::type_list<typename Units::system_type...>
+            >
+          >,
+          mitamagic::type_list<system<>>,
+          mitamagic::tlist_remove_if_t<is_wildcard,
+            mitamagic::type_list<typename Units::system_type...>
+          >
+        >
+      >;
+};
+
+template <class... Units>
+using make_dimensional_t = si_base_units<dimensional_t<Units...>>;
+
+
+} // namespace mitama
+#endif
diff --git a/include/dimensional/dimensional_traits.hpp → ...mitama/dimensional/dimensional_traits.hpp b/include/dimensional/dimensional_traits.hpp → ...mitama/dimensional/dimensional_traits.hpp
@@ -1,12 +1,12 @@
 #ifndef MITAMA_DIMENSIONAL_DIMENSIONAL_TRAITS_HPP
 #define MITAMA_DIMENSIONAL_DIMENSIONAL_TRAITS_HPP
-#include <dimensional/fwd/quantity_fwd.hpp>
-#include <dimensional/fwd/units_fwd.hpp>
-#include <dimensional/fwd/dimensional_fwd.hpp>
-#include <dimensional/mitamagic/type_traits_ext.hpp>
-#include <dimensional/mitamagic/type_list.hpp>
+#include <mitama/dimensional/fwd/quantity_fwd.hpp>
+#include <mitama/dimensional/fwd/units_fwd.hpp>
+#include <mitama/dimensional/fwd/dimensional_fwd.hpp>
+#include <mitama/dimensional/mitamagic/type_traits_ext.hpp>
+#include <mitama/dimensional/mitamagic/type_list.hpp>
 #include <type_traits>
-#include <dimensional/mitamagic/quotient.hpp>
+#include <mitama/dimensional/mitamagic/quotient.hpp>
 
 namespace mitama {
     // quantity_t traits

diff --git a/include/dimensional/fwd/dimensional_fwd.hpp → ...itama/dimensional/fwd/dimensional_fwd.hpp b/include/dimensional/fwd/dimensional_fwd.hpp → ...itama/dimensional/fwd/dimensional_fwd.hpp
diff --git a/include/dimensional/fwd/expr_fwd.hpp → include/mitama/dimensional/fwd/expr_fwd.hpp b/include/dimensional/fwd/expr_fwd.hpp → include/mitama/dimensional/fwd/expr_fwd.hpp
diff --git a/include/dimensional/fwd/quantity_fwd.hpp → ...e/mitama/dimensional/fwd/quantity_fwd.hpp b/include/dimensional/fwd/quantity_fwd.hpp → ...e/mitama/dimensional/fwd/quantity_fwd.hpp
@@ -1,6 +1,6 @@
 #ifndef MITAMA_DIMENSIONAL_FWD_QUANTITY_FWD_HPP
 #define MITAMA_DIMENSIONAL_FWD_QUANTITY_FWD_HPP
-#include <dimensional/fwd/system.hpp>
+#include <mitama/dimensional/fwd/system.hpp>
 
 namespace mitama {
 

diff --git a/include/dimensional/fwd/system.hpp → include/mitama/dimensional/fwd/system.hpp b/include/dimensional/fwd/system.hpp → include/mitama/dimensional/fwd/system.hpp
diff --git a/include/dimensional/fwd/units_fwd.hpp → include/mitama/dimensional/fwd/units_fwd.hpp b/include/dimensional/fwd/units_fwd.hpp → include/mitama/dimensional/fwd/units_fwd.hpp
@@ -1,7 +1,7 @@
 #ifndef MITAMA_DIMENSIONAL_FWD_UNITS_FWD_HPP
 #define MITAMA_DIMENSIONAL_FWD_UNITS_FWD_HPP
 #include <ratio>
-#include <dimensional/fwd/system.hpp>
+#include <mitama/dimensional/fwd/system.hpp>
 
 namespace mitama {
     template <int N, class Dim, class = std::ratio<1>, class = std::ratio<1>, class = system<>>

diff --git a/include/dimensional/io.hpp → include/mitama/dimensional/io.hpp b/include/dimensional/io.hpp → include/mitama/dimensional/io.hpp
@@ -1,8 +1,8 @@
 #ifndef MITAMA_DIMENSIONAL_IO_HPP
 #define MITAMA_DIMENSIONAL_IO_HPP
-#include <dimensional/quantity.hpp>
-#include <dimensional/systems/si/all.hpp>
-#include <dimensional/mitamagic/utility_ext.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/systems/si/all.hpp>
+#include <mitama/dimensional/mitamagic/utility_ext.hpp>
 #include <iostream>
 #include <type_traits>
 #include <string>

diff --git a/include/dimensional/math/abs.hpp → include/mitama/dimensional/math/abs.hpp b/include/dimensional/math/abs.hpp → include/mitama/dimensional/math/abs.hpp
@@ -2,7 +2,7 @@
 #define MITAMA_DIMENSIONAL_MATH_ABS_HPP
 
 #include <cmath>
-#include <dimensional/quantity.hpp>
+#include <mitama/dimensional/quantity.hpp>
 
 namespace mitama {
 

diff --git a/include/mitama/dimensional/math/all.hpp b/include/mitama/dimensional/math/all.hpp
@@ -0,0 +1,13 @@
+#ifndef MITAMA_DIMENSIONAL_MATH_ALL_HPP
+#define MITAMA_DIMENSIONAL_MATH_ALL_HPP
+
+#include <mitama/dimensional/math/abs.hpp>
+#include <mitama/dimensional/math/minmax.hpp>
+#include <mitama/dimensional/math/pow.hpp>
+#include <mitama/dimensional/math/root.hpp>
+#include <mitama/dimensional/math/nearest_integer.hpp>
+#include <mitama/dimensional/math/trigonometric.hpp>
+#include <mitama/dimensional/math/modular.hpp>
+#include <mitama/dimensional/math/logarithm.hpp>
+
+#endif
diff --git a/include/dimensional/math/logarithm.hpp → ...ude/mitama/dimensional/math/logarithm.hpp b/include/dimensional/math/logarithm.hpp → ...ude/mitama/dimensional/math/logarithm.hpp
@@ -1,8 +1,8 @@
 #ifndef MITAMA_DIMENSIONAL_MATH_LOGATITHM_HPP
 #define MITAMA_DIMENSIONAL_MATH_LOGATITHM_HPP
 #include <cmath>
-#include <dimensional/quantity.hpp>
-#include <dimensional/arithmetic.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/arithmetic.hpp>
 
 namespace mitama {
 template <template <class> class Synonym,

diff --git a/include/dimensional/math/minmax.hpp → include/mitama/dimensional/math/minmax.hpp b/include/dimensional/math/minmax.hpp → include/mitama/dimensional/math/minmax.hpp
@@ -1,7 +1,7 @@
 #ifndef MITAMA_DIMENSIONAL_MATH_MINMAX_HPP
 #define MITAMA_DIMENSIONAL_MATH_MINMAX_HPP
 
-#include <dimensional/quantity.hpp>
+#include <mitama/dimensional/quantity.hpp>
 #include <cmath>
 
 namespace mitama {

diff --git a/include/dimensional/math/modular.hpp → include/mitama/dimensional/math/modular.hpp b/include/dimensional/math/modular.hpp → include/mitama/dimensional/math/modular.hpp
@@ -2,8 +2,8 @@
 #define MITAMA_DIMENSIONAL_MATH_MODULAR_HPP
 
 #include <cmath>
-#include <dimensional/quantity.hpp>
-#include <dimensional/arithmetic.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/arithmetic.hpp>
 
 namespace mitama {
 

diff --git a/include/dimensional/math/nearest_integer.hpp → ...tama/dimensional/math/nearest_integer.hpp b/include/dimensional/math/nearest_integer.hpp → ...tama/dimensional/math/nearest_integer.hpp
@@ -1,6 +1,6 @@
 #ifndef MITAMA_DIMENSIONAL_MATH_NEARBYINT_HPP
 #define MITAMA_DIMENSIONAL_MATH_NEARBYINT_HPP
-#include <dimensional/quantity.hpp>
+#include <mitama/dimensional/quantity.hpp>
 #include <cmath>
 namespace mitama {
 template <template<class> class Synonym, class T, class... Units, class S>

diff --git a/include/dimensional/math/pow.hpp → include/mitama/dimensional/math/pow.hpp b/include/dimensional/math/pow.hpp → include/mitama/dimensional/math/pow.hpp
@@ -2,7 +2,7 @@
 #define MITAMA_DIMENSIONAL_MATH_POW_HPP
 
 #include <cmath>
-#include <dimensional/quantity.hpp>
+#include <mitama/dimensional/quantity.hpp>
 
 namespace mitama {
 

diff --git a/include/dimensional/math/root.hpp → include/mitama/dimensional/math/root.hpp b/include/dimensional/math/root.hpp → include/mitama/dimensional/math/root.hpp
@@ -2,8 +2,8 @@
 #define MITAMA_DIMENSIONAL_MATH_ROOT_HPP
 
 #include <cmath>
-#include <dimensional/quantity.hpp>
-#include <dimensional/systems/si/base_units/meter.hpp>
+#include <mitama/dimensional/quantity.hpp>
+#include <mitama/dimensional/systems/si/base_units/meter.hpp>
 namespace mitama {
 
 template < template <class> class Synonym, class T, class... Units, class S >

diff --git a/include/dimensional/math/trigonometric.hpp → ...mitama/dimensional/math/trigonometric.hpp b/include/dimensional/math/trigonometric.hpp → ...mitama/dimensional/math/trigonometric.hpp
@@ -1,7 +1,7 @@
 #ifndef MITAMA_DIMENSIONAL_MATH_TRIGONOMETRIC_HPP
 #define MITAMA_DIMENSIONAL_MATH_TRIGONOMETRIC_HPP
 
-#include <dimensional/systems/si/derived_units/angle.hpp>
+#include <mitama/dimensional/systems/si/derived_units/angle.hpp>
 #include <cmath>
 
 namespace mitama {

diff --git a/...imensional/mitamagic/chars_to_decimal.hpp → ...imensional/mitamagic/chars_to_decimal.hpp b/...imensional/mitamagic/chars_to_decimal.hpp → ...imensional/mitamagic/chars_to_decimal.hpp
diff --git a/include/dimensional/mitamagic/quotient.hpp → ...mitama/dimensional/mitamagic/quotient.hpp b/include/dimensional/mitamagic/quotient.hpp → ...mitama/dimensional/mitamagic/quotient.hpp
@@ -1,9 +1,9 @@
 #ifndef MITAMA_DIMENSIONAL_MITAMAGIC_QUOTIENT_HPP
 #define MITAMA_DIMENSIONAL_MITAMAGIC_QUOTIENT_HPP
-#include <dimensional/dimensional.hpp>
-#include <dimensional/units.hpp>
-#include <dimensional/mitamagic/type_list.hpp>
-#include <dimensional/dimensional_traits.hpp>
+#include <mitama/dimensional/dimensional.hpp>
+#include <mitama/dimensional/units.hpp>
+#include <mitama/dimensional/mitamagic/type_list.hpp>
+#include <mitama/dimensional/dimensional_traits.hpp>
 #include <cmath>
 #include <iostream>
 #include <ratio>

diff --git a/include/dimensional/mitamagic/ratio_ext.hpp → ...itama/dimensional/mitamagic/ratio_ext.hpp b/include/dimensional/mitamagic/ratio_ext.hpp → ...itama/dimensional/mitamagic/ratio_ext.hpp
diff --git a/include/dimensional/mitamagic/type_list.hpp → ...itama/dimensional/mitamagic/type_list.hpp b/include/dimensional/mitamagic/type_list.hpp → ...itama/dimensional/mitamagic/type_list.hpp
diff --git a/...dimensional/mitamagic/type_traits_ext.hpp → ...dimensional/mitamagic/type_traits_ext.hpp b/...dimensional/mitamagic/type_traits_ext.hpp → ...dimensional/mitamagic/type_traits_ext.hpp
diff --git a/...ude/dimensional/mitamagic/utility_ext.hpp → ...ama/dimensional/mitamagic/utility_ext.hpp b/...ude/dimensional/mitamagic/utility_ext.hpp → ...ama/dimensional/mitamagic/utility_ext.hpp