Use C++17

CMakeLists.txt

@@ -3,7 +3,7 @@ project (Tapkee  LANGUAGES CXX)
 cmake_minimum_required (VERSION 3.3)
 
 # set paths
-set (CMAKE_CXX_STANDARD 11)
+set (CMAKE_CXX_STANDARD 17)
 set (TAPKEE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
 set (TAPKEE_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set (TAPKEE_TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/test/unit")

include/tapkee/defines/random.hpp

@@ -9,6 +9,7 @@
 #include <cstdlib>
 #include <algorithm>
 #include <limits>
+#include <random>
 
 namespace tapkee
 {
@@ -57,7 +58,9 @@ inline ScalarType gaussian_random()
 template <class RAI>
 inline void random_shuffle(RAI first, RAI last)
 {
-	std::random_shuffle(first,last,uniform_random_index_bounded);
+	std::random_device rng;
+	std::mt19937 urng(rng());
+	std::shuffle(first,last, urng);
 }
 
 }

include/tapkee/methods.hpp

@@ -118,7 +118,7 @@ class ImplementationBase
 
 		p_target_dimension = parameters[target_dimension];
 		p_n_neighbors = parameters[num_neighbors].checked().satisfies(Positivity<IndexType>());
-		
+
 		if (n_vectors > 0)
 		{
 			p_target_dimension.checked().satisfies(InRange<IndexType>(1,n_vectors));
@@ -157,23 +157,21 @@ class ImplementationBase
 		if (context.is_cancelled()) 
 			throw cancelled_exception();
 
-		using std::mem_fun_ref_t;
-		using std::mem_fun_ref;
-		typedef std::mem_fun_ref_t<TapkeeOutput,ImplementationBase> ImplRef;
-
 #define tapkee_method_handle(X)																	\
 		case X:																					\
 		{																						\
 			timed_context tctx__("[+] embedding with " # X);									\
-			ImplRef ref = conditional_select<													\
+			if constexpr (																		\
 				((!MethodTraits<X>::needs_kernel)   || (!is_dummy<KernelCallback>::value))   &&	\
 				((!MethodTraits<X>::needs_distance) || (!is_dummy<DistanceCallback>::value)) &&	\
-				((!MethodTraits<X>::needs_features) || (!is_dummy<FeaturesCallback>::value)),	\
-					ImplRef>()(mem_fun_ref(&ImplementationBase::embed##X),						\
-					           mem_fun_ref(&ImplementationBase::embedEmpty));					\
-			return ref(*this);																	\
+				((!MethodTraits<X>::needs_features) || (!is_dummy<FeaturesCallback>::value))	\
+			) {																					\
+				return ImplementationBase::embed##X();											\
+			} else {																			\
+				return ImplementationBase::embedEmpty();										\
+			}																					\
 		}																						\
-		break																					\
+		break;																					\
 
 		switch (method)
 		{