[Olena-patches] [PATCH 15/31] Mix missing updates in mln::set.

* mln/set/all.hh: Update. (todo): Remove; geom::nsites on site sets is set::card. * tests/set/Makefile.am: Update. --- milena/ChangeLog | 8 ++++++++ milena/mln/set/all.hh | 7 +++---- milena/tests/set/Makefile.am | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d717702..a68e195 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-05-07 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; + Mix missing updates in mln::set. + + * mln/set/all.hh: Update. + (todo): Remove; geom::nsites on site sets is set::card. + * tests/set/Makefile.am: Update. + +2009-05-07 Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; + Add 'set compute accumulator with weights'. * mln/core/internal/site_iterator_base.hh diff --git a/milena/mln/set/all.hh b/milena/mln/set/all.hh index 9745e25..d0598a2 100644 --- a/milena/mln/set/all.hh +++ b/milena/mln/set/all.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -32,8 +32,6 @@ /// \file mln/set/all.hh /// /// File that includes all set-related routines. -/// -/// \todo Move geom::sites here (set::nsites). namespace mln { @@ -46,6 +44,7 @@ namespace mln # include <mln/set/card.hh> # include <mln/set/compute.hh> +# include <mln/set/compute_with_weights.hh> # include <mln/set/diff.hh> # include <mln/set/inter.hh> # include <mln/set/get.hh> diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am index 5be3d5e..fc936de 100644 --- a/milena/tests/set/Makefile.am +++ b/milena/tests/set/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ card \ compute \ + compute_with_weights \ diff \ inter \ sym_diff \ @@ -13,6 +14,7 @@ check_PROGRAMS = \ card_SOURCES = card.cc compute_SOURCES = compute.cc +compute_with_weights_SOURCES = compute_with_weights.cc diff_SOURCES = diff.cc inter_SOURCES = inter.cc sym_diff_SOURCES = sym_diff.cc -- 1.6.1.2