URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-06-08 Edwin Carlinet <carlinet@lrde.epita.fr> Add forgotten path alteration due to accu move. * mln/accu/all.hh, * mln/accu/essential.hh, * mln/accu/stat/all.hh * mln/accu/stat/essential.hh: Move min, max, max_h, min_h, min_max accus from accu to accu/stat. * sandbox/folio/mln/dt/raw_cp_fast.hh, * sandbox/folio/mln/dt/raw_dmap_fast.hh, * sandbox/folio/mln/dt/raw_path_fast.hh, * sandbox/fred/old/accuprops2.cc, * sandbox/garrigues/fllt/lower.hh, * sandbox/garrigues/fllt/upper.hh, * sandbox/garrigues/lower.hh, * sandbox/garrigues/upper.hh, * sandbox/theo/browsing/fwd.cc: Replace accu::accu_name by accu::stat:accu_name. * tests/accu/stat/max.cc, * tests/accu/stat/max_h.cc, * tests/accu/stat/min.cc, * tests/accu/stat/min_h.cc, * tests/accu/stat/min_max.cc: Replace "accu/accu_name.cc" by "accu/stat/accu_name.cc". --- mln/accu/all.hh | 5 ---- mln/accu/essential.hh | 6 ---- mln/accu/stat/all.hh | 2 + mln/accu/stat/essential.hh | 42 ++++++++++++++++++++++++++++++++++ sandbox/folio/mln/dt/raw_cp_fast.hh | 2 - sandbox/folio/mln/dt/raw_dmap_fast.hh | 2 - sandbox/folio/mln/dt/raw_path_fast.hh | 2 - sandbox/fred/old/accuprops2.cc | 2 - sandbox/garrigues/fllt/lower.hh | 2 - sandbox/garrigues/fllt/upper.hh | 2 - sandbox/garrigues/lower.hh | 2 - sandbox/garrigues/upper.hh | 2 - sandbox/theo/browsing/fwd.cc | 2 - tests/accu/stat/max.cc | 4 +-- tests/accu/stat/max_h.cc | 4 +-- tests/accu/stat/min.cc | 4 +-- tests/accu/stat/min_h.cc | 4 +-- tests/accu/stat/min_max.cc | 2 - 18 files changed, 63 insertions(+), 28 deletions(-) Index: trunk/milena/mln/accu/all.hh =================================================================== --- trunk/milena/mln/accu/all.hh (revision 4010) +++ trunk/milena/mln/accu/all.hh (revision 4011) @@ -69,13 +69,8 @@ # include <mln/accu/line.hh> # include <mln/accu/lor.hh> # include <mln/accu/lor_basic.hh> -# include <mln/accu/stat/max.hh> -# include <mln/accu/stat/max_h.hh> # include <mln/accu/mean.hh> # include <mln/accu/median_h.hh> -# include <mln/accu/stat/min.hh> -# include <mln/accu/stat/min_h.hh> -# include <mln/accu/stat/min_max.hh> # include <mln/accu/nil.hh> # include <mln/accu/pair.hh> # include <mln/accu/rank.hh> Index: trunk/milena/mln/accu/essential.hh =================================================================== --- trunk/milena/mln/accu/essential.hh (revision 4010) +++ trunk/milena/mln/accu/essential.hh (revision 4011) @@ -36,16 +36,12 @@ # include <mln/accu/center.hh> # include <mln/accu/count.hh> # include <mln/accu/histo.hh> -# include <mln/accu/stat/max.hh> -# include <mln/accu/stat/max_h.hh> # include <mln/accu/mean.hh> # include <mln/accu/median_h.hh> -# include <mln/accu/stat/min.hh> -# include <mln/accu/stat/min_h.hh> -# include <mln/accu/stat/min_max.hh> # include <mln/accu/rank.hh> # include <mln/accu/sum.hh> +# include <mln/accu/stat/essential.hh> # include <mln/accu/image/essential.hh> # include <mln/accu/site_set/essential.hh> Index: trunk/milena/mln/accu/stat/essential.hh =================================================================== --- trunk/milena/mln/accu/stat/essential.hh (revision 0) +++ trunk/milena/mln/accu/stat/essential.hh (revision 4011) @@ -0,0 +1,42 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Milena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_ACCU_STAT_ESSENTIAL_HH_ +# define MLN_ACCU_STAT_ESSENTIAL_HH_ + +/// \file mln/accu/stat/essential.hh +/// +/// File that includes the most useful statistical accumulator types. + +# include <mln/accu/stat/max.hh> +# include <mln/accu/stat/max_h.hh> +# include <mln/accu/stat/min.hh> +# include <mln/accu/stat/min_h.hh> +# include <mln/accu/stat/min_max.hh> + +#endif // !MLN_ACCU_STAT_ESSENTIAL_HH_ + Property changes on: trunk/milena/mln/accu/stat/essential.hh ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/mln/accu/stat/all.hh =================================================================== --- trunk/milena/mln/accu/stat/all.hh (revision 4010) +++ trunk/milena/mln/accu/stat/all.hh (revision 4011) @@ -55,6 +55,8 @@ # include <mln/accu/stat/variance.hh> # include <mln/accu/stat/max.hh> # include <mln/accu/stat/min.hh> +# include <mln/accu/stat/max_h.hh> +# include <mln/accu/stat/min_h.hh> # include <mln/accu/stat/min_max.hh> Index: trunk/milena/sandbox/fred/old/accuprops2.cc =================================================================== --- trunk/milena/sandbox/fred/old/accuprops2.cc (revision 4010) +++ trunk/milena/sandbox/fred/old/accuprops2.cc (revision 4011) @@ -346,7 +346,7 @@ typedef image2d<int> I; I ima(1000, 1000); - morpho::accu::from_mln_accu<accu::min>::ret<util::pix<I> > acc; + morpho::accu::from_mln_accu<accu::stat::min>::ret<util::pix<I> > acc; float elapsed; mln::util::timer chrono; Index: trunk/milena/sandbox/garrigues/fllt/lower.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt/lower.hh (revision 4010) +++ trunk/milena/sandbox/garrigues/fllt/lower.hh (revision 4011) @@ -71,7 +71,7 @@ static const int inc = 1; static const bool parent_is_brighter = true; - typedef accu::min accu_for_gn; + typedef accu::stat::min accu_for_gn; static const neighb2d& bdr_nbh() { return c8(); } static const neighb2d& reg_nbh() { return c4(); } Index: trunk/milena/sandbox/garrigues/fllt/upper.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt/upper.hh (revision 4010) +++ trunk/milena/sandbox/garrigues/fllt/upper.hh (revision 4011) @@ -71,7 +71,7 @@ static const int inc = -1; static const bool parent_is_brighter = false; - typedef accu::max accu_for_gn; + typedef accu::stat::max accu_for_gn; static const neighb2d& bdr_nbh() { return c4(); } static const neighb2d& reg_nbh() { return c8(); } Index: trunk/milena/sandbox/garrigues/lower.hh =================================================================== --- trunk/milena/sandbox/garrigues/lower.hh (revision 4010) +++ trunk/milena/sandbox/garrigues/lower.hh (revision 4011) @@ -73,7 +73,7 @@ static const int inc = 1; static const bool parent_is_brighter = true; - typedef accu::min accu_for_gn; + typedef accu::stat::min accu_for_gn; static const neighb2d& bdr_nbh() { return c8(); } static const neighb2d& reg_nbh() { return c4(); } Index: trunk/milena/sandbox/garrigues/upper.hh =================================================================== --- trunk/milena/sandbox/garrigues/upper.hh (revision 4010) +++ trunk/milena/sandbox/garrigues/upper.hh (revision 4011) @@ -74,7 +74,7 @@ static const int inc = -1; static const bool parent_is_brighter = false; - typedef accu::max accu_for_gn; + typedef accu::stat::max accu_for_gn; static const neighb2d& bdr_nbh() { return c4(); } static const neighb2d& reg_nbh() { return c8(); } Index: trunk/milena/sandbox/theo/browsing/fwd.cc =================================================================== --- trunk/milena/sandbox/theo/browsing/fwd.cc (revision 4010) +++ trunk/milena/sandbox/theo/browsing/fwd.cc (revision 4011) @@ -502,7 +502,7 @@ // win.insert(dpoint2d(0, 0)); // win.insert(dpoint2d(0, 1)); -// accu_win<I, accu::min, W> f(ima, win); +// accu_win<I, accu::stat::min, W> f(ima, win); // canvas::browsing::fwd(f); // canvas::browsing::row_fwd(f); Index: trunk/milena/sandbox/folio/mln/dt/raw_path_fast.hh =================================================================== --- trunk/milena/sandbox/folio/mln/dt/raw_path_fast.hh (revision 4010) +++ trunk/milena/sandbox/folio/mln/dt/raw_path_fast.hh (revision 4011) @@ -92,7 +92,7 @@ initialize(output, input); // Mod determination. - mln_accu_with_(accu::max, unsigned) accu; + mln_accu_with_(accu::stat::max, unsigned) accu; mln_fwd_piter(I) p(input.domain()); mln_qiter(N) n(nbh, p); for_all(n) Index: trunk/milena/sandbox/folio/mln/dt/raw_dmap_fast.hh =================================================================== --- trunk/milena/sandbox/folio/mln/dt/raw_dmap_fast.hh (revision 4010) +++ trunk/milena/sandbox/folio/mln/dt/raw_dmap_fast.hh (revision 4011) @@ -87,7 +87,7 @@ initialize(distance, input); // Mod determination. - mln_accu_with_(accu::max, unsigned) accu; + mln_accu_with_(accu::stat::max, unsigned) accu; mln_fwd_piter(I) p(input.domain()); mln_qiter(N) n(nbh, p); for_all(n) Index: trunk/milena/sandbox/folio/mln/dt/raw_cp_fast.hh =================================================================== --- trunk/milena/sandbox/folio/mln/dt/raw_cp_fast.hh (revision 4010) +++ trunk/milena/sandbox/folio/mln/dt/raw_cp_fast.hh (revision 4011) @@ -92,7 +92,7 @@ initialize(output, input); // Mod determination. - mln_accu_with_(accu::max, unsigned) accu; + mln_accu_with_(accu::stat::max, unsigned) accu; mln_fwd_piter(I) p(input.domain()); mln_qiter(N) n(nbh, p); for_all(n) Index: trunk/milena/tests/accu/stat/max_h.cc =================================================================== --- trunk/milena/tests/accu/stat/max_h.cc (revision 4010) +++ trunk/milena/tests/accu/stat/max_h.cc (revision 4011) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/max_h.cc +/*! \file tests/accu/stat/max_h.cc * - * \brief Tests on mln::accu::max_h. + * \brief Tests on mln::accu::stat::max_h. */ #include <mln/value/int_u8.hh> Index: trunk/milena/tests/accu/stat/min.cc =================================================================== --- trunk/milena/tests/accu/stat/min.cc (revision 4010) +++ trunk/milena/tests/accu/stat/min.cc (revision 4011) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/min.cc +/*! \file tests/accu/stat/min.cc * - * \brief Tests on mln::accu::min. + * \brief Tests on mln::accu::stat::min. */ #include <mln/core/image/image2d.hh> Index: trunk/milena/tests/accu/stat/max.cc =================================================================== --- trunk/milena/tests/accu/stat/max.cc (revision 4010) +++ trunk/milena/tests/accu/stat/max.cc (revision 4011) @@ -26,9 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/accu/max.cc +/// \file tests/accu/stat/max.cc /// -/// Tests on mln::accu::max. +/// Tests on mln::accu::stat::max. #include <mln/core/image/image2d.hh> #include <mln/debug/iota.hh> Index: trunk/milena/tests/accu/stat/min_max.cc =================================================================== --- trunk/milena/tests/accu/stat/min_max.cc (revision 4010) +++ trunk/milena/tests/accu/stat/min_max.cc (revision 4011) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/min_max.cc +/*! \file tests/accu/stat/min_max.cc * * \brief Tests on mln::accu::stat::min_max. */ Index: trunk/milena/tests/accu/stat/min_h.cc =================================================================== --- trunk/milena/tests/accu/stat/min_h.cc (revision 4010) +++ trunk/milena/tests/accu/stat/min_h.cc (revision 4011) @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/accu/min_h.cc +/*! \file tests/accu/stat/min_h.cc * - * \brief Tests on mln::accu::min_h. + * \brief Tests on mln::accu::stat::min_h. */ #include <mln/value/int_u8.hh>