* mln/fun/vvvv2v/max.hh, * mln/fun/vvvv2v/mean.hh, * mln/fun/vvvv2v/median.hh, * mln/fun/vvvv2v/min.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/fun/vvvv2v/max.hh | 7 +++---- milena/mln/fun/vvvv2v/mean.hh | 7 +++---- milena/mln/fun/vvvv2v/median.hh | 6 ++---- milena/mln/fun/vvvv2v/min.hh | 7 +++---- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 15a9193..678fb09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-26 Guillaume Lazzara <z@lrde.epita.fr> + Add missing typedef in functions. + + * mln/fun/vvvv2v/max.hh, + * mln/fun/vvvv2v/mean.hh, + * mln/fun/vvvv2v/median.hh, + * mln/fun/vvvv2v/min.hh: Here. + +2012-10-26 Guillaume Lazzara <z@lrde.epita.fr> + Add sum functions. * mln/fun/vv2v/sum.hh, diff --git a/milena/mln/fun/vvvv2v/max.hh b/milena/mln/fun/vvvv2v/max.hh index 311bcfe..cf315c7 100644 --- a/milena/mln/fun/vvvv2v/max.hh +++ b/milena/mln/fun/vvvv2v/max.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the max of two values. +/// Functor that computes the max of four values. # include <mln/core/concept/function.hh> # include <mln/math/max.hh> @@ -43,13 +43,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the max of two values. + /// \brief A functor computing the max of four values. template <typename T, typename R=T> struct max : public Function_vvvv2v< max<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; diff --git a/milena/mln/fun/vvvv2v/mean.hh b/milena/mln/fun/vvvv2v/mean.hh index 7cc14e9..1016d47 100644 --- a/milena/mln/fun/vvvv2v/mean.hh +++ b/milena/mln/fun/vvvv2v/mean.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the mean of two values. +/// Functor that computes the mean of four values. # include <mln/core/concept/function.hh> # include <mln/trait/routine/mean.hh> @@ -44,13 +44,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the mean of two values. + /// \brief A functor computing the mean of four values. template <typename T, typename R = mln_trait_routine_mean(4,T) > struct mean : public Function_vvvv2v< mean<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; diff --git a/milena/mln/fun/vvvv2v/median.hh b/milena/mln/fun/vvvv2v/median.hh index e08dabd..b1c0652 100644 --- a/milena/mln/fun/vvvv2v/median.hh +++ b/milena/mln/fun/vvvv2v/median.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the median of two values. +/// Functor that computes the median of four values. # include <mln/core/concept/function.hh> # include <mln/trait/routine/median.hh> @@ -44,9 +44,7 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the median of two values. + /// \brief A functor computing the median of four values. template <typename T, typename R = mln_trait_routine_median(T) > struct median : public Function_vvvv2v< median<T> > { diff --git a/milena/mln/fun/vvvv2v/min.hh b/milena/mln/fun/vvvv2v/min.hh index f0c4b63..2d24be1 100644 --- a/milena/mln/fun/vvvv2v/min.hh +++ b/milena/mln/fun/vvvv2v/min.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the min of two values. +/// Functor that computes the min of four values. # include <mln/core/concept/function.hh> # include <mln/math/min.hh> @@ -43,13 +43,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the min of two values. + /// \brief A functor computing the min of four values. template <typename T, typename R=T> struct min : public Function_vvvv2v< min<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; -- 1.7.2.5