From 97ac7a6bd2336a5521e2ed3b165366ea4c271642 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 14 Aug 2017 20:39:42 +0200
Subject: [PATCH] decouple normalize registration from algo registration
---
.../src/registration/AlgoRegistration.hpp | 23 ++-----------
.../NormalizationRegistration.hpp | 33 +++++++++++++++++++
2 files changed, 36 insertions(+), 20 deletions(-)
create mode 100644 alib2common/src/registration/NormalizationRegistration.hpp
diff --git a/alib2common/src/registration/AlgoRegistration.hpp b/alib2common/src/registration/AlgoRegistration.hpp
index 26a0e653a6..c375983a57 100644
--- a/alib2common/src/registration/AlgoRegistration.hpp
+++ b/alib2common/src/registration/AlgoRegistration.hpp
@@ -8,6 +8,8 @@
#include <abstraction/NormalizeRegistry.hpp>
#include <abstraction/DowncastRegistry.hpp>
+#include <registration/NormalizationRegistration.hpp>
+
namespace registration {
template < class Algorithm, class RealReturnType, class ... RealParameterTypeBases >
@@ -22,14 +24,6 @@ public:
}
};
-template < class Type, typename enable = void >
-struct RequireNormalization : std::false_type {
-};
-
-template < class Type >
-struct RequireNormalization < Type, typename std::enable_if < ext::has_normalize < Type >::value && ! std::is_same < Type, typename Type::normalized_type >::value >::type > : public std::true_type {
-};
-
template < class Type, typename enable = void >
struct RequireDowncast : std::false_type {
};
@@ -40,24 +34,13 @@ struct RequireDowncast < Type *, typename std::enable_if < ! std::is_final < Typ
template < class Algorithm, class ReturnType, class ... ParameterTypes >
class AbstractRegister {
-
- template < class Type, typename std::enable_if < RequireNormalization < Type >::value >::type * = nullptr >
- void registerNormalize ( ) {
- abstraction::NormalizeRegistry::registerNormalize < ReturnType > ( );
- }
-
- template < class Type, typename std::enable_if < ! RequireNormalization < Type >::value >::type * = nullptr >
- void registerNormalize ( ) {
- }
-
public:
AbstractRegister ( ReturnType ( * callback ) ( ParameterTypes ... ) ) {
- bool normalize = RequireNormalization < ReturnType >::value;
+ bool normalize = registration::NormalizationRegister < ReturnType > ( ).requireNormalization ( );
bool downcast = RequireDowncast < ReturnType >::value;
abstraction::AlgorithmRegistry::registerAlgorithm < Algorithm, ReturnType, ParameterTypes ... > ( callback, downcast, normalize );
- registerNormalize < ReturnType > ( );
}
};
diff --git a/alib2common/src/registration/NormalizationRegistration.hpp b/alib2common/src/registration/NormalizationRegistration.hpp
new file mode 100644
index 0000000000..4ea083aa21
--- /dev/null
+++ b/alib2common/src/registration/NormalizationRegistration.hpp
@@ -0,0 +1,33 @@
+#ifndef _NORMALIZATION_REGISTRATION_HPP_
+#define _NORMALIZATION_REGISTRATION_HPP_
+
+#include <abstraction/NormalizeRegistry.hpp>
+
+namespace registration {
+
+template < class ReturnType, typename enable = void >
+class NormalizationRegister {
+public:
+ NormalizationRegister ( ) {
+ }
+
+ bool requireNormalization ( ) const {
+ return false;
+ }
+};
+
+template < class ReturnType >
+class NormalizationRegister < ReturnType, typename std::enable_if < ext::has_normalize < ReturnType >::value && ! std::is_same < ReturnType, typename ReturnType::normalized_type >::value >::type > {
+public:
+ NormalizationRegister ( ) {
+ abstraction::NormalizeRegistry::registerNormalize < ReturnType > ( );
+ }
+
+ bool requireNormalization ( ) const {
+ return true;
+ }
+};
+
+} /* namespace registration */
+
+#endif // _NORMALIZATION_REGISTRATION_HPP_
--
GitLab