[Olena-patches] olena: olena-2.0-847-g7b885b8 Simplify the implementation of mln::fun::vv2v::algebra::vec.

* mln/fun/vv2v/vec.hh (mln::fun::vv2v::algebra::vec::operator()): Here. Fix the documentation. --- milena/ChangeLog | 8 ++++++++ milena/mln/fun/vv2v/vec.hh | 17 ++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 65a3e0e..c0e8e2b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2014-02-24 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Simplify the implementation of mln::fun::vv2v::algebra::vec. + + * mln/fun/vv2v/vec.hh (mln::fun::vv2v::algebra::vec::operator()): + Here. + Fix the documentation. + 2011-01-17 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; * apps/bench/list2table: Generate a shorter table. diff --git a/milena/mln/fun/vv2v/vec.hh b/milena/mln/fun/vv2v/vec.hh index 908d4ff..d77dd9b 100644 --- a/milena/mln/fun/vv2v/vec.hh +++ b/milena/mln/fun/vv2v/vec.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -28,10 +29,11 @@ /// \file /// -/// computing the vecimum of two values using a functor. +/// Forming a vector (mln::algebra::vec) from two values of the same +/// type using a functor. # include <mln/core/concept/function.hh> -# include <mln/algebra/vec.hh> +# include <mln/make/vec.hh> namespace mln @@ -43,9 +45,8 @@ namespace mln namespace vv2v { - // FIXME: Doc. - - /// \brief A functor computing the vecimum of two values. + /// \brief A functor forming a vector (mln::algebra::vec) from + /// two values of the same type. template <typename V> struct vec : public Function_vv2v< vec<V> > { @@ -61,9 +62,7 @@ namespace mln algebra::vec<2,V> vec<V>::operator()(const V& v1, const V& v2) const { - algebra::vec<2,V> tmp; - tmp.set(v1, v2); - return tmp; + return make::vec(v1, v2); } # endif // ! MLN_INCLUDE_ONLY -- 1.7.10.4