Made Reduce capable of mapping and init value

Author: rzeldent

src/ReactiveArduinoBases.h

@@ -24,6 +24,9 @@ using ReactiveCompound = T(*)(T, T);
 template <typename Torig, typename Tdest>
 using ReactiveMap = Tdest(*)(Torig);
 
+template <typename Torig, typename Tdest>
+using ReactiveReduce = Tdest(*)(Tdest, Torig);
+
 template <typename T>
 using ReactivePredicate = bool(*)(T);
 

src/ReactiveArduinoCore.h

@@ -76,7 +76,7 @@ template <typename T> class OperatorNoReset;
 template <typename T> class OperatorReset;
 
 template <typename T> class TransformationSelect;
-template <typename T> class TransformationReduce;
+template <typename Torig, typename Tdest> class TransformationReduce;
 template <typename Torig, typename Tdest> class TransformationCast;
 template <typename Torig, typename Tdest> class TransformationMap;
 template <typename T> class TransformationLimit;
@@ -182,7 +182,7 @@ class Observable : IObservable<T>, IResetable<T>
 	template <class Tdest> TransformationCast<T, Tdest>& Cast();
 	template <class Tdest> TransformationMap<T, Tdest>& Select(ReactiveMap<T, Tdest> map);
 	template <class Tdest> TransformationMap<T, Tdest>& Map(ReactiveMap<T, Tdest> map);
-	TransformationReduce<T>& Reduce(ReactiveCompound<T> function);
+	template <class Tdest> TransformationReduce<T, Tdest>& Reduce(ReactiveReduce<T, Tdest> function, Tdest init = Tdest());
 	TransformationUpperLimit<T>& LimitUpper(T upperLimit);
 	TransformationLowerLimit<T>& LimitLower(T lowerLimit);
 	TransformationLimit<T>& Limit(T lowerLimit, T upperLimit);
@@ -473,9 +473,10 @@ auto Observable<T>::Select(ReactiveMap<T, Tdest> map) -> TransformationMap<T, Td
 
 
 template <typename T>
-auto Observable<T>::Reduce(ReactiveCompound<T> function) -> TransformationReduce<T>&
+template <typename Tdest>
+auto Observable<T>::Reduce(ReactiveReduce<T, Tdest> function, Tdest init) -> TransformationReduce<T, Tdest>&
 {
-	auto newOp = new TransformationReduce<T>(function);
+	auto newOp = new TransformationReduce<T, Tdest>(function, init);
 	Compound(*this, *newOp);
 	return *newOp;
 }

src/ReactiveArduinoLib.h

@@ -376,10 +376,10 @@ namespace Reactive
 		return *(new TransformationMap<Torig, Tdest>(map));
 	}
 
-	template <typename T>
-	TransformationReduce<T>& Reduce(ReactiveCompound<T> function)
+	template <typename Torig, typename Tdest>
+	TransformationMap<Torig, Tdest>& Reduce(ReactiveMap<Torig, Tdest> map)
 	{
-		return *(new TransformationReduce<T>(function));
+		return *(new TransformationReduce<Torig, Tdest>(map));
 	}
 
 	template <typename T>

src/Transformations/TransformationReduce.h

@@ -10,29 +10,29 @@ Unless required by applicable law or agreed to in writing, software distributed
 #ifndef _REACTIVETRANSFORMATIONREDUCE_h
 #define _REACTIVETRANSFORMATIONREDUCE_h
 
-template <typename T>
-class TransformationReduce : public Operator<T, T>
+template <typename Torig, typename Tdest>
+class TransformationReduce : public Operator<Torig, Tdest>
 {
 public:
-	ReactiveCompound<T> _function;
+	ReactiveReduce<Torig, Tdest> _function;
 
-	TransformationReduce<T>(ReactiveCompound<T> function);
+	TransformationReduce<Torig, Tdest>(ReactiveReduce<Torig, Tdest> function, Tdest init);
 
-	void OnNext(T value) override;
+	void OnNext(Torig value) override;
 
 private:
-	T _rst = T();
-
+	Tdest _rst;
 };
 
-template <typename T>
-TransformationReduce<T>::TransformationReduce(ReactiveCompound<T> function)
+template <typename Torig, typename Tdest>
+TransformationReduce<Torig, Tdest>::TransformationReduce(ReactiveReduce<Torig, Tdest> function, Tdest init)
 {
 	this->_function = function;
+	this->_rst = init;
 }
 
-template <typename T>
-void TransformationReduce<T>::OnNext(T value)
+template <typename Torig, typename Tdest>
+void TransformationReduce<Torig, Tdest>::OnNext(Torig value)
 {
 	this->_rst = this->_function(this->_rst, value);
 	if (this->_childObserver != nullptr) this->_childObserver->OnNext(this->_rst);