...

Author: AAAlvesJr

CHANGELOG.md

@@ -12,6 +12,8 @@ Bug fixes:
 
 2) Covering composite of composites (https://github.com/MultithreadCorner/Hydra/issues/100)
 
+3) Covering caching for parameterless functors.
+
 
 ### Hydra 3.2.1
 

hydra/detail/Compose.h

@@ -42,13 +42,17 @@
 #include <hydra/detail/CompositeTraits.h>
 #include <hydra/Parameter.h>
 #include <hydra/Tuple.h>
+#include <type_traits>
 
 namespace hydra {
 
 
 template<typename F0, typename F1, typename... Fs >
 class Compose: public detail::CompositeBase<F0, F1, Fs...>
 {
+
+
+
 public:
 	    //tag
 
@@ -80,11 +84,16 @@ class Compose: public detail::CompositeBase<F0, F1, Fs...>
 			return *this;
 		}
 
-	  	template<typename T1>
+	  	template<typename ...T>
 	  	__hydra_host__ __hydra_device__
-	  	inline return_type operator()(T1&& x ) const
+	  	inline std::enable_if<
+	  		detail::is_valid_type_pack< argument_type, T...>::value,
+	  		return_type>::type
+	  	operator()( T... x ) const
 	  	{
 
+	  		static_assert( std::is_convertible< hydra::tuple<T...>, argument_type>::value, ">>>>>>>");
+
 	  		//evaluating f(g_1(x), g_2(x), ..., g_n(x))
 
 	  		auto g = detail::dropFirst(this->fFtorTuple);
@@ -93,7 +102,7 @@ class Compose: public detail::CompositeBase<F0, F1, Fs...>
 
 	  		typedef decltype(g) G_tuple ;
 
-	  		return f(detail::invoke<G_tuple, T1>(std::forward<T1>(x),g ));
+	  		return f(detail::invoke<G_tuple, hydra::tuple<T&...>>(hydra::tie(x...), g ));
 	  	}
 
 

hydra/detail/CompositeBase.h

@@ -39,6 +39,7 @@
 #include <hydra/detail/Constant.h>
 #include <hydra/Parameter.h>
 #include <hydra/Placeholders.h>
+#include <hydra/detail/TupleTraits.h>
 
 namespace hydra {
 
@@ -48,8 +49,11 @@ template<typename F0, typename F1, typename... Fs >
 class  CompositeBase
 {
 
+
+
 public:
 
+    typedef typename hydra::detail::merged_tuple<typename F1::argument_type>::type argument_type;
 	typedef typename hydra_thrust::tuple<F0, F1, Fs...> functors_type;
 
 	//tag