--- milena/ChangeLog | 5 +++++ milena/mln/accu/stat/deviation.hh | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 191c165..786011c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-08-26 Guillaume Lazzara <z@lrde.epita.fr> + * mln/accu/stat/deviation.hh: Set first template parameter of + accu::stat:sum to mln_sum(T). + +2010-08-26 Guillaume Lazzara <z@lrde.epita.fr> + * mln/labeling/compute.hh: Add a missing overload in dispatch. 2010-09-22 Guillaume Lazzara <z@lrde.epita.fr> diff --git a/milena/mln/accu/stat/deviation.hh b/milena/mln/accu/stat/deviation.hh index 1aad652..1f15100 100644 --- a/milena/mln/accu/stat/deviation.hh +++ b/milena/mln/accu/stat/deviation.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -84,7 +84,11 @@ namespace mln protected: accu::math::count<T> count_; - accu::math::sum<T,S> sum_; + + // NOTE: accu::math::sum takes mln_sum(T) as first template + // parameter since in the core of the deviation::take method, + // this accumulator takes data of type mln_sum(T). + accu::math::sum<mln_sum(T),S> sum_; T mean_; }; -- 1.5.6.5