Fixed geometric_traits.hpp

Author: TomSaw

src/modm/math/geometry/geometric_traits.hpp

@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2009-2011, Fabian Greif
  * Copyright (c) 2012, Niklas Hauser
+ * Copyright (c) 2021, Thomas Sommer
  *
  * This file is part of the modm project.
  *
@@ -10,12 +11,12 @@
  */
 // ----------------------------------------------------------------------------
 
-#ifndef MODM_GEOMETRIC_TRAITS_HPP
-#define MODM_GEOMETRIC_TRAITS_HPP
+#pragma once
 
+#include <concepts>
 #include <cmath>
-#include <stdint.h>
 #include <modm/architecture/utils.hpp>
+#include <modm/math/utils/arithmetic_traits.hpp>
 
 namespace modm
 {
@@ -26,123 +27,59 @@ namespace modm
 	 * \author	Fabian Greif
 	 */
 	template <typename T>
-	struct GeometricTraits
-	{
-		static const bool isValidType = false;
-
-		/**
-		 * \brief	Round if converting from a floating point base to
-		 * 			a integer base.
-		 *
-		 * For T = \c float and \c double this method is specialized to return
-		 * the result directly without any rounding.
-		 */
-		static inline T
-		round(float value)
-		{
-			return ::round(value);
-		}
-	};
-
-	template <>
-	struct GeometricTraits<int8_t>
-	{
-		static const bool isValidType = true;
-
-		using FloatType = float;
-		using WideType = int16_t;
-
-		static inline int8_t
-		round(float value)
-		{
-			return ::round(value);
-		}
-	};
+	struct GeometricTraits;
 
-	// TODO is this useful?
-	template <>
-	struct GeometricTraits<uint8_t>
+	template <std::integral T>
+	struct GeometricTraits<T>
 	{
-		static const bool isValidType = true;
+		// DEPRICATED Don't validate with isValidType, use requires modm::arithmetic<T>
+		static const bool isValidType = false;
 
 		using FloatType = float;
-		using WideType = int16_t;
+		using WideType = modm::WideType<T>;
 
-		static inline uint8_t
+		static inline T
 		round(float value)
 		{
 			return ::round(value);
 		}
 	};
 
-	template <>
-	struct GeometricTraits<int16_t>
+	template <std::floating_point T>
+	struct GeometricTraits<T>
 	{
+		// DEPRICATED Don't validate with isValidType, use requires modm::arithmetic<T>
 		static const bool isValidType = true;
 
-		using FloatType = float;
-		using WideType = int32_t;
+		using FloatType = T;
+		using WideType = T;
 
-		static inline int16_t
-		round(float value)
+		static inline T
+		round(T value)
 		{
-			return ::round(value);
+			return value;
 		}
 	};
 
+	// FIXME only avr
+	// %% if target == "avr"
 	template <>
 	struct GeometricTraits<int32_t>
 	{
+		// DEPRICATED Don't validate with isValidType, use requires modm::arithmetic<T>
 		static const bool isValidType = true;
 
 		using FloatType = float;
-		// %% if target == "stm32"
-		// using WideType = int64_t;
-		// %% else if target == "avr"
-
-		// OPTIMIZE only fall back to int32_t on avr architecture
 		// Usually the range of a int32_t is big enough so that no
 		// conversion to int64_t is required. This exception is made because
 		// 64-bit operations are very, very slow on an AVR.
 		using WideType = int32_t;
-		// %% endif
 
 		static inline int32_t
 		round(float value)
 		{
 			return ::round(value);
 		}
 	};
-
-	template <>
-	struct GeometricTraits<float>
-	{
-		static const bool isValidType = true;
-
-		using FloatType = float;
-		using WideType = float;
-
-		static inline float
-		round(float value)
-		{
-			return value;
-		}
-	};
-
-	template <>
-	struct GeometricTraits<double>
-	{
-		static const bool isValidType = true;
-
-		using FloatType = double;
-		using WideType = double;
-
-		static inline double
-		round(double value)
-		{
-			return value;
-		}
-	};
-}
-
-#endif // MODM_GEOMETRIC_TRAITS_HPP
+	// %% endif
+}

src/modm/math/geometry/vector.hpp

@@ -18,7 +18,6 @@
 #include <stdint.h>
 
 #include <modm/math/matrix.hpp>
-#include <modm/math/utils/arithmetic_traits.hpp>
 
 #include "geometric_traits.hpp"