a splitmix64 seeder for hydra, fix hdra::unweight

Author: AAAlvesJr

hydra/Random.h

@@ -150,6 +150,26 @@ struct is_callable: std::conditional<
 }  // namespace detail
 
 
+/**
+ * \ingroup random
+ *
+ * This functions reorder a dataset to produce a unweighted sample according to the weights
+ * [wbegin, wend]. The length of the range [wbegin, wend] should be equal or greater than
+ * the dataset size.
+ *
+ * @param policy parallel backend to perform the unweighting
+ * @param data_begin iterator pointing to the begin of the range of weights
+ * @param data_end iterator pointing to the begin of the range of weights
+ * @param weights_begin iterator pointing to the begin of the range of data
+ * @return
+ */
+template<typename RNG=default_random_engine, typename DerivedPolicy, typename IteratorData, typename IteratorWeight>
+typename std::enable_if<
+detail::random::is_iterator<IteratorData>::value && detail::random::is_iterator<IteratorWeight>::value,
+Range<IteratorData> >::type
+unweight( hydra_thrust::detail::execution_policy_base<DerivedPolicy>  const& policy, IteratorData data_begin, IteratorData data_end, IteratorWeight weights_begin);
+
+
 
 
 /**
@@ -227,6 +247,25 @@ typename std::enable_if<
 unweight( IterableData data, IterableWeight weights);
 
 
+/**
+ * \ingroup random
+ *
+ * This functions reorder a dataset to produce an unweighted sample according to @param functor .
+ *
+ * @param policy
+ * @param begin
+ * @param end
+ * @param functor
+ * @return the index of the last entry of the unweighted event.
+ */
+template<typename RNG=default_random_engine, typename Functor, typename Iterator, typename DerivedPolicy>
+typename std::enable_if<
+	detail::random::is_callable<Functor>::value && detail::random::is_iterator<Iterator>::value,
+	Range<Iterator>
+>::type
+unweight( hydra_thrust::detail::execution_policy_base<DerivedPolicy> const& policy, Iterator begin, Iterator end, Functor const& functor);
+
+
 /**
  * \ingroup random
  *

hydra/SeedRNG.h

@@ -51,7 +51,7 @@ class SeedRNG
 	{}
 
 	 __hydra_host__ __hydra_device__
-	 inline SeetRNG& operator=(SeedRNG const& other)
+	 inline SeedRNG& operator=(SeedRNG const& other)
 	{
 		if(this==&other) return *this;
 

hydra/detail/Random.inl

@@ -39,13 +39,12 @@
 
 namespace hydra{
 
-
-template<typename RNG, typename IteratorData, typename IteratorWeight, hydra::detail::Backend BACKEND>
+template<typename RNG, typename DerivedPolicy, typename IteratorData, typename IteratorWeight>
 typename std::enable_if<
 	detail::random::is_iterator<IteratorData>::value && detail::random::is_iterator<IteratorWeight>::value,
 	Range<IteratorData>
 >::type
-unweight( detail::BackendPolicy<BACKEND> const& policy, IteratorData data_begin, IteratorData data_end, IteratorWeight weights_begin)
+unweight( hydra_thrust::detail::execution_policy_base<DerivedPolicy> const& policy, IteratorData data_begin, IteratorData data_end, IteratorWeight weights_begin)
 {
 
 	typedef typename IteratorWeight::value_type value_type;
@@ -68,6 +67,19 @@ unweight( detail::BackendPolicy<BACKEND> const& policy, IteratorData data_begin,
 	return  make_range(begin , r);
 }
 
+
+template<typename RNG, typename IteratorData, typename IteratorWeight, hydra::detail::Backend BACKEND>
+typename std::enable_if<
+	detail::random::is_iterator<IteratorData>::value && detail::random::is_iterator<IteratorWeight>::value,
+	Range<IteratorData>
+>::type
+unweight( detail::BackendPolicy<BACKEND> const& policy, IteratorData data_begin, IteratorData data_end, IteratorWeight weights_begin)
+{
+
+
+	return  unweight<RNG>(policy.backend, data_begin, data_end, weights_begin);
+}
+
 template< typename RNG, typename IteratorData, typename IteratorWeight>
 typename std::enable_if<
 detail::random::is_iterator<IteratorData>::value && detail::random::is_iterator<IteratorWeight>::value,
@@ -116,17 +128,18 @@ unweight( IterableData&&  data, IterableWeight&&  weights)
 }
 
 
-template< typename RNG, typename Functor, typename Iterator, hydra::detail::Backend  BACKEND>
+template< typename RNG, typename Functor, typename Iterator, typename DerivedPolicy>
 typename std::enable_if<
 	detail::random::is_callable<Functor>::value && detail::random::is_iterator<Iterator>::value,
 	Range<Iterator>
 >::type
-unweight( detail::BackendPolicy<BACKEND> const& policy, Iterator begin, Iterator end, Functor const& functor)
+unweight(hydra_thrust::detail::execution_policy_base<DerivedPolicy>  const& policy, Iterator begin, Iterator end, Functor const& functor)
 {
 
 	typedef typename Functor::return_type value_type;
 
-	typedef hydra_thrust::pointer<value_type, typename detail::BackendPolicy<BACKEND>::execution_policy_type::tag_type> pointer_type;
+	typedef hydra_thrust::pointer<value_type,
+			typename hydra_thrust::detail::execution_policy_base<DerivedPolicy>::tag_type> pointer_type;
 
 	typedef detail::RndFlag<value_type,pointer_type, RNG > flagger_type;
 
@@ -153,6 +166,19 @@ unweight( detail::BackendPolicy<BACKEND> const& policy, Iterator begin, Iterator
 
 }
 
+
+template< typename RNG, typename Functor, typename Iterator, hydra::detail::Backend  BACKEND>
+typename std::enable_if<
+	detail::random::is_callable<Functor>::value && detail::random::is_iterator<Iterator>::value,
+	Range<Iterator>
+>::type
+unweight( detail::BackendPolicy<BACKEND> const& policy, Iterator begin, Iterator end, Functor const& functor)
+{
+
+	return  unweight<RNG>(policy.backend, begin, end, functor );
+
+}
+
 template<typename RNG, typename Functor, typename Iterator>
 typename std::enable_if<
 	detail::random::is_callable<Functor>::value && detail::random::is_iterator<Iterator>::value,