Commit 9618c9e1 authored by Guillaume Duhamel's avatar Guillaume Duhamel
Browse files

Review queue in core and fix some warnings in tests directory.

	Review queue files.
	* mln/core/p_priority_queue.hh,
	* mln/core/p_priority_queue_fast.hh,
	* mln/core/p_priority_queue_fast_with_array.hh,
	* mln/core/p_queue_fast.hh: Review queue.

	Update tests.
	* tests/core/mesh_elt_window.cc,
	* tests/core/mesh_image.cc,
	* tests/debug/iota.cc,
	* tests/debug/println.cc,
	* tests/debug/println_with_border.cc,
	* tests/io/fits/fits.cc,
	* tests/io/pbm/pbm.cc,
	* tests/io/pgm/pgm.cc,
	* tests/io/pgm/pgm16.cc,
	* tests/io/pgm/pgm19.cc,
	* tests/io/pgm/pgm27.cc,
	* tests/io/ppm/ppm.cc,
	* tests/io/ppm/ppm16.cc,
	* tests/io/ppm/ppm23.cc,
	* tests/norm/l1.cc,
	* tests/norm/l2.cc,
	* tests/norm/linfty.cc,
	* tests/value/macros.hh,
	* tests/value/rgb_full.cc,
	* tests/core/t_image.cc: Fix doxygen warnings.

	Move tests.
	* tests/core_p_priority_queue.cc: Remove ...
	* tests/core/p_priority_queue.cc: ... replace here.
	* tests/core_p_priority_queue_fast.cc: Remove ...
	* tests/core/p_priority_queue_fast.cc: ... replace here.
	* tests/core_p_priority_queue_fast_with_array.cc: Remove ...
	* tests/core/p_priority_queue_fast_with_array.cc: ... replace here.
	* tests/core_p_queue.cc: Remove ...
	* tests/core/p_queue.cc: ... replace here.
	* tests/core_p_queue_fast.cc: Remove ...
	* tests/core/p_queue_fast.cc: ... replace here.
	* tests/canvas/Makefile.am,
	* tests/core/Makefile.am: Update Makefile for these tests.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@1617 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 328ead3c
2007-12-18 Guillaume Duhamel <guillaume.duhamel@lrde.epita.fr>
Review queue in core and fix some warnings in tests directory.
Review queue files.
* mln/core/p_priority_queue.hh,
* mln/core/p_priority_queue_fast.hh,
* mln/core/p_priority_queue_fast_with_array.hh,
* mln/core/p_queue_fast.hh: Review queue.
Update tests.
* tests/core/mesh_elt_window.cc,
* tests/core/mesh_image.cc,
* tests/debug/iota.cc,
* tests/debug/println.cc,
* tests/debug/println_with_border.cc,
* tests/io/fits/fits.cc,
* tests/io/pbm/pbm.cc,
* tests/io/pgm/pgm.cc,
* tests/io/pgm/pgm16.cc,
* tests/io/pgm/pgm19.cc,
* tests/io/pgm/pgm27.cc,
* tests/io/ppm/ppm.cc,
* tests/io/ppm/ppm16.cc,
* tests/io/ppm/ppm23.cc,
* tests/norm/l1.cc,
* tests/norm/l2.cc,
* tests/norm/linfty.cc,
* tests/value/macros.hh,
* tests/value/rgb_full.cc,
* tests/core/t_image.cc: Fix doxygen warnings.
Move tests.
* tests/core_p_priority_queue.cc: Remove ...
* tests/core/p_priority_queue.cc: ... replace here.
* tests/core_p_priority_queue_fast.cc: Remove ...
* tests/core/p_priority_queue_fast.cc: ... replace here.
* tests/core_p_priority_queue_fast_with_array.cc: Remove ...
* tests/core/p_priority_queue_fast_with_array.cc: ... replace here.
* tests/core_p_queue.cc: Remove ...
* tests/core/p_queue.cc: ... replace here.
* tests/core_p_queue_fast.cc: Remove ...
* tests/core/p_queue_fast.cc: ... replace here.
* tests/canvas/Makefile.am,
* tests/core/Makefile.am: Update Makefile for these tests.
2007-12-17 Benoit Sigoure <tsuna@lrde.epita.fr>
Add a missing include.
......
......@@ -53,13 +53,11 @@ namespace mln
template <typename P> struct p_array_bkd_piter_;
/*! \brief Point queue class (based on std::deque).
/*! \brief Point priority queue class (based on p_queue and std::map).
*
* This is a mathematical set of points (unique insertion).
*
* \todo Make it work with P being a Point_Site.
* \todo Add a parameter flag to choose another policy for "push"
* (i.e., no-op if multiple or allow multiple insertions).
*
* \warning We have some troubles with point set comparison based on
* a call to npoints() when this container is multiple.
......
......@@ -53,13 +53,11 @@ namespace mln
template <typename P> struct p_array_bkd_piter_;
/*! \brief Point queue class (based on std::deque).
/*! \brief Point fast queue class (based on std::map and p_queue_fast).
*
* This is a mathematical set of points (unique insertion).
*
* \todo Make it work with P being a Point_Site.
* \todo Add a parameter flag to choose another policy for "push"
* (i.e., no-op if multiple or allow multiple insertions).
*
* \warning We have some troubles with point set comparison based on
* a call to npoints() when this container is multiple.
......@@ -168,7 +166,7 @@ namespace mln
bb_.init();
typename std::map<T, p_queue_fast<P> >::const_iterator it = q_.begin ();
for (; it != q_.end (); ++it)
for (unsigned i = 0; i < (*it).second.npoints (); ++i)
bb_.take((*it).second[i]);
......
......@@ -53,13 +53,11 @@ namespace mln
template <typename P> struct p_array_bkd_piter_;
/*! \brief Point queue class (based on std::deque).
/*! \brief Point queue class (based on std::vector and p_queue_fast).
*
* This is a mathematical set of points (unique insertion).
*
* \todo Make it work with P being a Point_Site.
* \todo Add a parameter flag to choose another policy for "push"
* (i.e., no-op if multiple or allow multiple insertions).
*
* \warning We have some troubles with point set comparison based on
* a call to npoints() when this container is multiple.
......
......@@ -57,8 +57,6 @@ namespace mln
* This is a mathematical set of points (unique insertion).
*
* \todo Make it work with P being a Point_Site.
* \todo Add a parameter flag to choose another policy for "push"
* (i.e., no-op if multiple or allow multiple insertions).
*
* \warning We have some troubles with point set comparison based on
* a call to npoints() when this container is multiple.
......
......@@ -3,3 +3,9 @@
include $(top_srcdir)/milena/tests/tests.mk
SUBDIRS = browsing
check_PROGRAMS = \
chamfer
chamfer_SOURCES = chamfer.cc
......@@ -15,7 +15,12 @@ check_PROGRAMS = \
p_runs \
rle_image \
sparse_image \
t_image
t_image \
p_priority_queue \
p_priority_queue_fast \
p_priority_queue_fast_with_array \
p_queue \
p_queue_fast
category_SOURCES = category.cc
clone_SOURCES = clone.cc
......@@ -30,5 +35,12 @@ p_runs_SOURCES = p_runs.cc
rle_image_SOURCES = rle_image.cc
sparse_image_SOURCES = sparse_image.cc
t_image_SOURCES = t_image.cc
p_priority_queue_SOURCES = p_priority_queue.cc
p_priority_queue_fast_SOURCES = p_priority_queue_fast.cc
p_priority_queue_fast_with_array_SOURCES = p_priority_queue_fast.cc
p_queue_SOURCES = p_priority_queue_fast.cc
p_queue_fast_SOURCES = p_priority_queue_fast.cc
TESTS = $(check_PROGRAMS)
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/mesh_elt_window.cc
/*! \file tests/core/mesh_elt_window.cc
*
* \brief Tests on mln::win::mesh_elt_window.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/mesh_image.cc
/*! \file tests/core/mesh_image.cc
*
* \brief Tests on mln::mesh_image.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/core_p_priority_queue.cc
/*! \file tests/core/p_priority_queue.cc
*
* \brief Tests on mln::p_priority_queue.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/core_p_priority_queue_fast.cc
/*! \file tests/core/p_priority_queue_fast.cc
*
* \brief Tests on mln::p_priority_queue_fast.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/p_priority_queue_fast_with_array.cc
/*! \file tests/core/p_priority_queue_fast_with_array.cc
*
* \brief Tests on mln::p_priority_queue_fast_with_array.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/core_p_queue.cc
/*! \file tests/core/p_queue.cc
*
* \brief Tests on mln::p_queue.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/core_p_queue_fast.cc
/*! \file tests/core/p_queue_fast.cc
*
* \brief Tests on mln::p_queue_fast.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/t_image.cc
/*! \file tests/core/t_image.cc
*
* \brief Tests on mln::t_image.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/debug_iota.cc
/*! \file tests/debug/iota.cc
*
* \brief Tests on mln::debug::iota.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/debug_println.cc
/*! \file tests/debug/println.cc
*
* \brief Test on mln::debug::println.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/debug_println_with_border.cc
/*! \file tests/debug/println_with_border.cc
*
* \brief Test on mln::debug::println_with_border.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/fits_load.cc
/*! \file tests/io/fits/fits.cc
*
* \brief Test on mln::io::fits::load.
*/
......
......@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/io_pbm.cc
/*! \file tests/io/pbm/pbm.cc
*
* \brief Test on mln::io::pbm::.
*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment