AnyParameterProperties refactor

src/shogun/base/AnyParameter.h

@@ -8,6 +8,7 @@
 #define __ANYPARAMETER_H__
 
 #include <shogun/lib/any.h>
+#include <shogun/lib/bitmask_operators.h>
 
 #include <string>
 
@@ -27,10 +28,21 @@ namespace shogun
 		GRADIENT_NOT_AVAILABLE = 0,
 		GRADIENT_AVAILABLE = 1
 	};
-	/** @brief Class AnyParameterProperties keeps track of parameter properties.
-	 * The parameter properties can be either true or false.
-	 * These properties describe if a parameter is for example a hyperparameter
-	 * or if it has a gradient.
+
+	/** parameter properties */
+	enum class ParameterProperties
+	{
+		HYPER = 1u << 0,
+		GRADIENT = 1u << 1,
+		MODEL = 1u << 2
+	};
+
+	enableEnumClassBitmask(ParameterProperties);
+
+	/** @brief Class AnyParameterProperties keeps track of of parameter meta
+	 * information, such as properties and descriptions The parameter properties
+	 * can be either true or false. These properties describe if a parameter is
+	 * for example a hyperparameter or if it has a gradient.
 	 */
 	class AnyParameterProperties
 	{

src/shogun/lib/bitmask_operators.h

@@ -0,0 +1,110 @@
+#ifndef JSS_BITMASK_HPP
+#define JSS_BITMASK_HPP
+
+// (C) Copyright 2015 Just Software Solutions Ltd
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// Boost Software License - Version 1.0 - August 17th, 2003
+//
+// Permission is hereby granted, free of charge, to any person or
+// organization obtaining a copy of the software and accompanying
+// documentation covered by this license (the "Software") to use,
+// reproduce, display, distribute, execute, and transmit the
+// Software, and to prepare derivative works of the Software, and
+// to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire
+// statement, including the above license grant, this restriction
+// and the following disclaimer, must be included in all copies
+// of the Software, in whole or in part, and all derivative works
+// of the Software, unless such copies or derivative works are
+// solely in the form of machine-executable object code generated
+// by a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+// KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+// COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE
+// LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include<type_traits>
+
+namespace shogun {
+
+    template<typename E>
+    struct enable_bitmask_operators {
+        static constexpr bool enable = false;
+    };
+
+    #define enableEnumClassBitmask(T) template<> \
+    struct enable_bitmask_operators<T> \
+    { \
+        static constexpr bool enable = true; \
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E>::type
+    operator|(E lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        return static_cast<E>(
+                static_cast<underlying>(lhs) | static_cast<underlying>(rhs));
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E>::type
+    operator&(E lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        return static_cast<E>(
+                static_cast<underlying>(lhs) & static_cast<underlying>(rhs));
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E>::type
+    operator^(E lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        return static_cast<E>(
+                static_cast<underlying>(lhs) ^ static_cast<underlying>(rhs));
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E>::type
+    operator~(E lhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        return static_cast<E>(
+                ~static_cast<underlying>(lhs));
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E &>::type
+    operator|=(E &lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        lhs = static_cast<E>(
+                static_cast<underlying>(lhs) | static_cast<underlying>(rhs));
+        return lhs;
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E &>::type
+    operator&=(E &lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        lhs = static_cast<E>(
+                static_cast<underlying>(lhs) & static_cast<underlying>(rhs));
+        return lhs;
+    }
+
+    template<typename E>
+    typename std::enable_if<enable_bitmask_operators<E>::enable, E &>::type
+    operator^=(E &lhs, E rhs) {
+        typedef typename std::underlying_type<E>::type underlying;
+        lhs = static_cast<E>(
+                static_cast<underlying>(lhs) ^ static_cast<underlying>(rhs));
+        return lhs;
+    }
+}
+#endif