fix lambda signature participating in composite signature type resolution...

Author: AAAlvesJr

examples/misc/quick_test.inl

@@ -140,9 +140,19 @@ int main(int argv, char** argc)
     std::cout << Total( hydra::make_tuple( _x(1.0), _y(-1.0), _v(1.0), _u(-1.0))) << std::endl;
 
 
+    auto myfunc = hydra::wrap_lambda( [] __hydra_dual__ (unsigned int npar, const hydra::Parameter* params, _x x, _y y) {
+
+    	return x + params[0]*y;
+
+    }, exponent);
+
+    auto mycombination = Gx + myfunc * Gy;
+
+    std::cout << "mycombination: " << mycombination(_x(-1.0), _y(1.0)) << std::endl;
+
     //What is the type of the natural signature of Total?
     //uncomment this
-    //typename decltype(Total)::argument_type  test{};
+   // typename decltype(mycombination)::argument_type  test{};
     //std::cout << test.dummy << '\n';
 
 	return 0;

hydra/Lambda.h

@@ -302,16 +302,16 @@ template<typename LambdaType, size_t NPARAM>
 class  Lambda : public detail::Parameters<NPARAM>
 {
 
-	typedef typename detail::lambda_traits<LambdaType>::argument_rvalue_type argument_rvalue_type;
+	typedef typename detail::trimmed_lambda_signature<typename detail::lambda_traits<LambdaType>::argument_rvalue_type>::type argument_rvalue_type;
 
 public:
 
 	typedef void hydra_lambda_type;
 
 	typedef typename detail::lambda_traits<LambdaType>::return_type   return_type;
-	typedef typename detail::lambda_traits<LambdaType>::argument_type argument_type;
+	typedef typename detail::trimmed_lambda_signature<typename detail::lambda_traits<LambdaType>::argument_type>::type argument_type;
 
-	enum {arity=detail::lambda_traits<LambdaType>::arity};
+	enum {arity=detail::lambda_traits<LambdaType>::arity-2};
 
 
 	explicit Lambda()=delete;
@@ -391,8 +391,7 @@ class  Lambda : public detail::Parameters<NPARAM>
 	template<typename ...T>
 	__hydra_host__  __hydra_device__
 	inline typename std::enable_if<
-	(!detail::is_valid_type_pack<argument_type, size_t,
-			const hydra::Parameter*, T...>::value),
+	(!detail::is_valid_type_pack<argument_type, T...>::value),
 	return_type>::type
 	operator()(T...x)  const
 	{
@@ -413,8 +412,7 @@ class  Lambda : public detail::Parameters<NPARAM>
 	template<typename ...T>
 	__hydra_host__  __hydra_device__
 	inline typename  std::enable_if<
-	(detail::is_valid_type_pack<argument_type, size_t,
-			const hydra::Parameter*, T...>::value),
+	(detail::is_valid_type_pack<argument_type, T...>::value),
 	return_type>::type
 	operator()(T...x)  const
 	{
@@ -426,13 +424,7 @@ class  Lambda : public detail::Parameters<NPARAM>
 	inline typename std::enable_if<
 	( detail::is_tuple_type< typename std::decay<T>::type >::value )                 &&
 	(!detail::is_tuple_of_function_arguments< typename std::decay<T>::type >::value) &&
-	( std::is_convertible<
-			typename detail::tuple_cat_type<
-			         hydra::tuple<size_t, const Parameter*>,
-			         typename std::decay<T>::type
-			    >::type,
-			argument_rvalue_type
-			>::value ),
+	( std::is_convertible<typename std::decay<T>::type,	argument_rvalue_type>::value ),
 	return_type >::type
 	operator()( T x )  const
 	{
@@ -500,30 +492,30 @@ class  Lambda : public detail::Parameters<NPARAM>
 
 		return fLambda(this->GetNumberOfParameters(), this->GetParameters(),
 			detail::get_tuple_element<
-			typename hydra_thrust::tuple_element<I+2,argument_rvalue_type>::type >(x)...);
+			typename hydra_thrust::tuple_element<I,argument_rvalue_type>::type >(x)...);
 	}
 
 	template<typename T>
 	__hydra_host__ __hydra_device__
 	inline return_type call(T x) const
 	{
-		return call_helper(x, detail::make_index_sequence<arity-2>{});
+		return call_helper(x, detail::make_index_sequence<arity>{});
 	}
 
 	template<typename T, size_t ...I>
 	__hydra_host__ __hydra_device__
 	inline  return_type raw_call_helper(T x, detail::index_sequence<I...> ) const
 	{
 		return fLambda(this->GetNumberOfParameters(), this->GetParameters(),
-				static_cast<typename hydra_thrust::tuple_element<I+2,argument_rvalue_type>::type>(
+				static_cast<typename hydra_thrust::tuple_element<I,argument_rvalue_type>::type>(
 				hydra_thrust::get<I>(x))...);
 	}
 
 	template<typename T>
 	__hydra_host__ __hydra_device__
 	inline return_type raw_call(T x) const
 	{
-		return raw_call_helper(x, detail::make_index_sequence<arity-2>{});
+		return raw_call_helper(x, detail::make_index_sequence<arity>{});
 	}
 
 

hydra/detail/FunctorTraits.h

@@ -101,6 +101,16 @@ struct functor_traits<ReturnType(ClassType::*)(Args...) const>
 
 };
 
+template<typename T>
+struct trimmed_lambda_signature;
+
+template<typename Head, typename Neck, typename ...Tail>
+struct trimmed_lambda_signature< hydra_thrust::tuple<Head,Neck, Tail...> >
+{
+	typedef hydra_thrust::tuple<Tail...> type;
+};
+
+
 template<typename Functor, typename T= hydra_thrust::void_t<> >
 struct is_hydra_functor:std::false_type{};
 

hydra/detail/utility/MSB.h

@@ -73,7 +73,7 @@ msb( Integer x){
 
 	#else
 
-	   Integer _x
+	   Integer _x;
 	   unsigned y;
 	   int n = 64;