https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> 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. mln/set/all.hh | 7 +++---- tests/set/Makefile.am | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) Index: mln/set/all.hh --- mln/set/all.hh (revision 3775) +++ mln/set/all.hh (working copy) @@ -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 @@ # 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> Index: tests/set/Makefile.am --- tests/set/Makefile.am (revision 3775) +++ tests/set/Makefile.am (working copy) @@ -5,6 +5,7 @@ check_PROGRAMS = \ card \ compute \ + compute_with_weights \ diff \ inter \ sym_diff \ @@ -13,6 +14,7 @@ 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