URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-12-18 Guillaume Duhamel <guillaume.duhamel(a)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.
---
mln/core/p_priority_queue.hh | 4
mln/core/p_priority_queue_fast.hh | 4
mln/core/p_priority_queue_fast_with_array.hh | 4
mln/core/p_queue_fast.hh | 2
tests/canvas/Makefile.am | 6 +
tests/core/Makefile.am | 14 +++
tests/core/mesh_elt_window.cc | 2
tests/core/mesh_image.cc | 2
tests/core/p_priority_queue.cc | 98 +++++++++++++++++++++++
tests/core/p_priority_queue_fast.cc | 98 +++++++++++++++++++++++
tests/core/p_priority_queue_fast_with_array.cc | 105 +++++++++++++++++++++++++
tests/core/p_queue.cc | 57 +++++++++++++
tests/core/p_queue_fast.cc | 57 +++++++++++++
tests/core/t_image.cc | 2
tests/debug/iota.cc | 2
tests/debug/println.cc | 2
tests/debug/println_with_border.cc | 2
tests/io/fits/fits.cc | 2
tests/io/pbm/pbm.cc | 2
tests/io/pgm/pgm.cc | 2
tests/io/pgm/pgm16.cc | 2
tests/io/pgm/pgm19.cc | 2
tests/io/pgm/pgm27.cc | 2
tests/io/ppm/ppm.cc | 2
tests/io/ppm/ppm16.cc | 2
tests/io/ppm/ppm23.cc | 2
tests/norm/l1.cc | 2
tests/norm/l2.cc | 2
tests/norm/linfty.cc | 2
tests/value/macros.hh | 2
tests/value/rgb_full.cc | 2
31 files changed, 457 insertions(+), 32 deletions(-)
Index: trunk/milena/tests/core_p_queue.cc (deleted)
===================================================================
Index: trunk/milena/tests/core_p_priority_queue.cc (deleted)
===================================================================
Index: trunk/milena/tests/core_p_priority_queue_fast.cc (deleted)
===================================================================
Index: trunk/milena/tests/core_p_priority_queue_fast_with_array.cc (deleted)
===================================================================
Index: trunk/milena/tests/core_p_queue_fast.cc (deleted)
===================================================================
Index: trunk/milena/tests/debug/iota.cc
===================================================================
--- trunk/milena/tests/debug/iota.cc (revision 1616)
+++ trunk/milena/tests/debug/iota.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/debug/println_with_border.cc
===================================================================
--- trunk/milena/tests/debug/println_with_border.cc (revision 1616)
+++ trunk/milena/tests/debug/println_with_border.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/debug/println.cc
===================================================================
--- trunk/milena/tests/debug/println.cc (revision 1616)
+++ trunk/milena/tests/debug/println.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/value/rgb_full.cc
===================================================================
--- trunk/milena/tests/value/rgb_full.cc (revision 1616)
+++ trunk/milena/tests/value/rgb_full.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/value/rgb.cc
+/*! \file tests/value/rgb_full.cc
*
* \brief Tests on mln::value::rgb.
*/
Index: trunk/milena/tests/value/macros.hh
===================================================================
--- trunk/milena/tests/value/macros.hh (revision 1616)
+++ trunk/milena/tests/value/macros.hh (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/value_macros.hh
+/*! \file tests/value/macros.hh
*
* \brief Utilities to tests value types.
*/
Index: trunk/milena/tests/canvas/Makefile.am
===================================================================
--- trunk/milena/tests/canvas/Makefile.am (revision 1616)
+++ trunk/milena/tests/canvas/Makefile.am (revision 1617)
@@ -3,3 +3,9 @@
include $(top_srcdir)/milena/tests/tests.mk
SUBDIRS = browsing
+
+check_PROGRAMS = \
+ chamfer
+
+chamfer_SOURCES = chamfer.cc
+
Index: trunk/milena/tests/core/mesh_image.cc
===================================================================
--- trunk/milena/tests/core/mesh_image.cc (revision 1616)
+++ trunk/milena/tests/core/mesh_image.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/core/p_queue.cc
===================================================================
--- trunk/milena/tests/core/p_queue.cc (revision 0)
+++ trunk/milena/tests/core/p_queue.cc (revision 1617)
@@ -0,0 +1,57 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena 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.
+
+/*! \file tests/core/p_queue.cc
+ *
+ * \brief Tests on mln::p_queue.
+ */
+
+#include <mln/core/point2d.hh>
+#include <mln/core/p_queue.hh>
+
+
+
+int main()
+{
+ using namespace mln;
+
+ p_queue<point2d> q;
+ q
+ .push(make::point2d(6, 9))
+ .push(make::point2d(5, 1))
+ .push(make::point2d(4, 2));
+ mln_assertion(q.npoints() == 3);
+
+ std::cout << q.bbox() << std::endl;
+ std::cout << q << std::endl;
+
+ q.pop();
+ mln_assertion(q.npoints() == 2);
+ point2d p = q.front();
+ mln_assertion(q.npoints() == 2);
+ mln_assertion(p == make::point2d(5, 1));
+}
Index: trunk/milena/tests/core/p_priority_queue.cc
===================================================================
--- trunk/milena/tests/core/p_priority_queue.cc (revision 0)
+++ trunk/milena/tests/core/p_priority_queue.cc (revision 1617)
@@ -0,0 +1,98 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena 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.
+
+/*! \file tests/core/p_priority_queue.cc
+ *
+ * \brief Tests on mln::p_priority_queue.
+ */
+
+#include <mln/core/point2d.hh>
+#include <mln/core/p_priority_queue.hh>
+
+int main ()
+{
+ using namespace mln;
+
+ p_priority_queue<point2d, unsigned> q;
+ point2d p1 (6, 9);
+ point2d p2 (5, 1);
+ point2d p3 (4, 2);
+
+ mln_assertion (q.is_empty ());
+
+ mln_assertion (q.npoints () == 0);
+
+ q.push_force (p3);
+ q.push_force (p1, 3);
+ q.push_force (p2, 5);
+
+ std::cout << q.bbox () << std::endl;
+ std::cout << q << std::endl;
+
+ mln_assertion (!q.is_empty ());
+
+ mln_assertion (q.has (p1));
+ mln_assertion (q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 3);
+ mln_assertion (q.front () == p2);
+ q.pop ();
+
+ mln_assertion (q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 2);
+ mln_assertion (q.front () == p1);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 1);
+ mln_assertion (q.front () == p3);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (!q.has (p3));
+ mln_assertion (q.npoints () == 0);
+
+ mln_assertion (q.is_empty ());
+
+ q.push_force (p3);
+ q.push_force (p2, 5);
+ q.push_force (p1, 3);
+
+ mln_assertion (q[2] == p3);
+ mln_assertion (q[1] == p1);
+ mln_assertion (q[0] == p2);
+ q.clear ();
+ mln_assertion (q.is_empty ());
+}
Index: trunk/milena/tests/core/t_image.cc
===================================================================
--- trunk/milena/tests/core/t_image.cc (revision 1616)
+++ trunk/milena/tests/core/t_image.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/core/p_priority_queue_fast_with_array.cc
===================================================================
--- trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 0)
+++ trunk/milena/tests/core/p_priority_queue_fast_with_array.cc (revision 1617)
@@ -0,0 +1,105 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena 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.
+
+/*! \file tests/core/p_priority_queue_fast_with_array.cc
+ *
+ * \brief Tests on mln::p_priority_queue_fast_with_array.
+ */
+
+#include <mln/core/point2d.hh>
+#include <mln/core/p_priority_queue_fast_with_array.hh>
+
+int main ()
+{
+ using namespace mln;
+
+ p_priority_queue_fast_with_array<point2d, unsigned, 20> q;
+ point2d p1 (6, 9);
+ point2d p2 (5, 1);
+ point2d p3 (4, 2);
+
+ mln_assertion (q.is_empty ());
+ mln_assertion (q.npoints () == 0);
+
+ q.push_force (p3);
+ mln_assertion (!q.is_empty ());
+ mln_assertion (q.npoints () == 1);
+
+ q.push_force (p1, 3);
+ mln_assertion (!q.is_empty ());
+ mln_assertion (q.npoints () == 2);
+
+ q.push_force (p2, 5);
+ mln_assertion (!q.is_empty ());
+ mln_assertion (q.npoints () == 3);
+
+ std::cout << q.bbox () << std::endl;
+ std::cout << q << std::endl;
+
+ mln_assertion (!q.is_empty ());
+
+ mln_assertion (q.has (p1));
+ mln_assertion (q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 3);
+ mln_assertion (q.front () == p2);
+ q.pop ();
+
+ mln_assertion (q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 2);
+ mln_assertion (q.front () == p1);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 1);
+ mln_assertion (q.front () == p3);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (!q.has (p3));
+ mln_assertion (q.npoints () == 0);
+
+ mln_assertion (q.is_empty ());
+
+ q.push_force (p3);
+ q.push_force (p2, 5);
+ q.push_force (p1, 3);
+
+ mln_assertion (q[2] == p3);
+ mln_assertion (q[1] == p1);
+ mln_assertion (q[0] == p2);
+ q.clear ();
+ mln_assertion (q.is_empty ());
+}
Index: trunk/milena/tests/core/p_queue_fast.cc
===================================================================
--- trunk/milena/tests/core/p_queue_fast.cc (revision 0)
+++ trunk/milena/tests/core/p_queue_fast.cc (revision 1617)
@@ -0,0 +1,57 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena 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.
+
+/*! \file tests/core/p_queue_fast.cc
+ *
+ * \brief Tests on mln::p_queue_fast.
+ */
+
+#include <mln/core/point2d.hh>
+#include <mln/core/p_queue_fast.hh>
+
+
+
+int main()
+{
+ using namespace mln;
+
+ p_queue_fast<point2d> q;
+ q
+ .push(make::point2d(6, 9))
+ .push(make::point2d(5, 1))
+ .push(make::point2d(4, 2));
+ mln_assertion(q.npoints() == 3);
+
+ std::cout << q.bbox() << std::endl;
+ std::cout << q << std::endl;
+
+ q.pop();
+ mln_assertion(q.npoints() == 2);
+ point2d p = q.front();
+ mln_assertion(q.npoints() == 2);
+ mln_assertion(p == make::point2d(5, 1));
+}
Index: trunk/milena/tests/core/p_priority_queue_fast.cc
===================================================================
--- trunk/milena/tests/core/p_priority_queue_fast.cc (revision 0)
+++ trunk/milena/tests/core/p_priority_queue_fast.cc (revision 1617)
@@ -0,0 +1,98 @@
+// Copyright (C) 2007 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena 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.
+
+/*! \file tests/core/p_priority_queue_fast.cc
+ *
+ * \brief Tests on mln::p_priority_queue_fast.
+ */
+
+#include <mln/core/point2d.hh>
+#include <mln/core/p_priority_queue_fast.hh>
+
+int main ()
+{
+ using namespace mln;
+
+ mln::p_priority_queue_fast<point2d, unsigned> q;
+ point2d p1 (6, 9);
+ point2d p2 (5, 1);
+ point2d p3 (4, 2);
+
+ mln_assertion (q.is_empty ());
+
+ mln_assertion (q.npoints () == 0);
+
+ q.push_force (p3);
+ q.push_force (p1, 3);
+ q.push_force (p2, 5);
+
+ std::cout << q.bbox () << std::endl;
+ std::cout << q << std::endl;
+
+ mln_assertion (!q.is_empty ());
+
+ mln_assertion (q.has (p1));
+ mln_assertion (q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 3);
+ mln_assertion (q.front () == p2);
+ q.pop ();
+
+ mln_assertion (q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 2);
+ mln_assertion (q.front () == p1);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (q.has (p3));
+
+ mln_assertion (q.npoints () == 1);
+ mln_assertion (q.front () == p3);
+ q.pop ();
+
+ mln_assertion (!q.has (p1));
+ mln_assertion (!q.has (p2));
+ mln_assertion (!q.has (p3));
+ mln_assertion (q.npoints () == 0);
+
+ mln_assertion (q.is_empty ());
+
+ q.push_force (p3);
+ q.push_force (p2, 5);
+ q.push_force (p1, 3);
+
+ mln_assertion (q[2] == p3);
+ mln_assertion (q[1] == p1);
+ mln_assertion (q[0] == p2);
+ q.clear ();
+ mln_assertion (q.is_empty ());
+}
Index: trunk/milena/tests/core/Makefile.am
===================================================================
--- trunk/milena/tests/core/Makefile.am (revision 1616)
+++ trunk/milena/tests/core/Makefile.am (revision 1617)
@@ -15,7 +15,12 @@
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 @@
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)
Index: trunk/milena/tests/core/mesh_elt_window.cc
===================================================================
--- trunk/milena/tests/core/mesh_elt_window.cc (revision 1616)
+++ trunk/milena/tests/core/mesh_elt_window.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/io/pgm/pgm27.cc
===================================================================
--- trunk/milena/tests/io/pgm/pgm27.cc (revision 1616)
+++ trunk/milena/tests/io/pgm/pgm27.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_pgm27.cc
+/*! \file tests/io/pgm/pgm27.cc
*
* \brief Test on mln::io::pgm::load and mln::io::pgm::save.
*/
Index: trunk/milena/tests/io/pgm/pgm19.cc
===================================================================
--- trunk/milena/tests/io/pgm/pgm19.cc (revision 1616)
+++ trunk/milena/tests/io/pgm/pgm19.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_pgm19.cc
+/*! \file tests/io/pgm/pgm19.cc
*
* \brief Test on mln::io::pgm::load and mln::io::pgm::save.
*/
Index: trunk/milena/tests/io/pgm/pgm.cc
===================================================================
--- trunk/milena/tests/io/pgm/pgm.cc (revision 1616)
+++ trunk/milena/tests/io/pgm/pgm.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_pgm.cc
+/*! \file tests/io/pgm/pgm.cc
*
* \brief Test on mln::io::pgm::load and mln::io::pgm::save.
*/
Index: trunk/milena/tests/io/pgm/pgm16.cc
===================================================================
--- trunk/milena/tests/io/pgm/pgm16.cc (revision 1616)
+++ trunk/milena/tests/io/pgm/pgm16.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_pgm16.cc
+/*! \file tests/io/pgm/pgm16.cc
*
* \brief Test on mln::io::pgm::load and mln::io::pgm::save.
*/
Index: trunk/milena/tests/io/fits/fits.cc
===================================================================
--- trunk/milena/tests/io/fits/fits.cc (revision 1616)
+++ trunk/milena/tests/io/fits/fits.cc (revision 1617)
@@ -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.
*/
Index: trunk/milena/tests/io/ppm/ppm.cc
===================================================================
--- trunk/milena/tests/io/ppm/ppm.cc (revision 1616)
+++ trunk/milena/tests/io/ppm/ppm.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_ppm.cc
+/*! \file tests/io/ppm/ppm.cc
*
* \brief Test on mln::io::ppm::load and mln::io::ppm::save.
*/
Index: trunk/milena/tests/io/ppm/ppm23.cc
===================================================================
--- trunk/milena/tests/io/ppm/ppm23.cc (revision 1616)
+++ trunk/milena/tests/io/ppm/ppm23.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_ppm23.cc
+/*! \file tests/io/ppm/ppm23.cc
*
* \brief Test on mln::io::ppm::load and mln::io::ppm::save.
*/
Index: trunk/milena/tests/io/ppm/ppm16.cc
===================================================================
--- trunk/milena/tests/io/ppm/ppm16.cc (revision 1616)
+++ trunk/milena/tests/io/ppm/ppm16.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/io_ppm16.cc
+/*! \file tests/io/ppm/ppm16.cc
*
* \brief Test on mln::io::ppm::load and mln::io::ppm::save.
*/
Index: trunk/milena/tests/io/pbm/pbm.cc
===================================================================
--- trunk/milena/tests/io/pbm/pbm.cc (revision 1616)
+++ trunk/milena/tests/io/pbm/pbm.cc (revision 1617)
@@ -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::.
*/
Index: trunk/milena/tests/norm/l1.cc
===================================================================
--- trunk/milena/tests/norm/l1.cc (revision 1616)
+++ trunk/milena/tests/norm/l1.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/norm/l1.hh
+/*! \file tests/norm/l1.cc
*
* \brief Test the L1-norm.
*/
Index: trunk/milena/tests/norm/l2.cc
===================================================================
--- trunk/milena/tests/norm/l2.cc (revision 1616)
+++ trunk/milena/tests/norm/l2.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/norm/l2.hh
+/*! \file tests/norm/l2.cc
*
* \brief Test the L2-norm.
*/
Index: trunk/milena/tests/norm/linfty.cc
===================================================================
--- trunk/milena/tests/norm/linfty.cc (revision 1616)
+++ trunk/milena/tests/norm/linfty.cc (revision 1617)
@@ -25,7 +25,7 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-/*! \file tests/norm/linfty.hh
+/*! \file tests/norm/linfty.cc
*
* \brief Test the L-infinity-norm.
*/
Index: trunk/milena/mln/core/p_priority_queue_fast.hh
===================================================================
--- trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1616)
+++ trunk/milena/mln/core/p_priority_queue_fast.hh (revision 1617)
@@ -53,13 +53,11 @@
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.
Index: trunk/milena/mln/core/p_priority_queue.hh
===================================================================
--- trunk/milena/mln/core/p_priority_queue.hh (revision 1616)
+++ trunk/milena/mln/core/p_priority_queue.hh (revision 1617)
@@ -53,13 +53,11 @@
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.
Index: trunk/milena/mln/core/p_priority_queue_fast_with_array.hh
===================================================================
--- trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1616)
+++ trunk/milena/mln/core/p_priority_queue_fast_with_array.hh (revision 1617)
@@ -53,13 +53,11 @@
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.
Index: trunk/milena/mln/core/p_queue_fast.hh
===================================================================
--- trunk/milena/mln/core/p_queue_fast.hh (revision 1616)
+++ trunk/milena/mln/core/p_queue_fast.hh (revision 1617)
@@ -57,8 +57,6 @@
* 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.
URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena
ChangeLog:
2007-12-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr>
Add main page for Doxygen documentation.
* mln/convert/all.hh,
* mln/level/all.hh,
* mln/level/paste.hh,
* tests/level/paste_full.cc: Fix typo.
* mln/core/concept/object.hh: Add main page for Doxygen.
---
mln/convert/all.hh | 2 -
mln/core/concept/object.hh | 78 +++++++++++++++++++++++++++++++++++++++++++++
mln/level/all.hh | 2 -
mln/level/paste.hh | 4 +-
tests/level/paste_full.cc | 3 +
5 files changed, 86 insertions(+), 3 deletions(-)
Index: trunk/milena/tests/level/paste_full.cc
===================================================================
--- trunk/milena/tests/level/paste_full.cc (revision 1613)
+++ trunk/milena/tests/level/paste_full.cc (revision 1614)
@@ -142,6 +142,7 @@
chck(input, output);
}
+ /// FIXME : Uncomment this when it will be possible
// {
// image1d<I> in (cols);
// image_if<image1d<I>, f_box1d_t> input(in, f_b1);
@@ -173,6 +174,7 @@
chck(input, output);
}
+ /// FIXME : Uncomment this when it will be possible
// {
// image2d<I> in (rows, cols);
// image_if<image2d<I>, f_box2d_t> input(in, f_b2);
@@ -204,6 +206,7 @@
chck(input, output);
}
+ /// FIXME : Uncomment this when it will be possible
// {
// image3d<I> in (slis, rows, cols);
// image_if<image3d<I>, f_box3d_t> input(in, f_b3);
Index: trunk/milena/mln/core/concept/object.hh
===================================================================
--- trunk/milena/mln/core/concept/object.hh (revision 1613)
+++ trunk/milena/mln/core/concept/object.hh (revision 1614)
@@ -46,6 +46,84 @@
# include <mln/metal/ret.hh>
+/*! \mainpage Documentation of milena
+ *
+ * \section intro_sec Introduction
+ *
+ * This is the documentation of milena.
+ *
+ * \section tools_subsec Tools required.
+ * FIXME.
+ *
+ * \section mln_sec Overview of milena.
+ *
+ * <UL>
+ * <LI> \ref mln
+ * <LI> \ref mln::accu
+ * <LI> \ref mln::arith
+ * <LI> \ref mln::border
+ * <LI> \ref mln::canvas
+ * <LI> \ref mln::convert
+ * <LI> \ref mln::debug
+ * <LI> \ref mln::display
+ * <LI> \ref mln::draw
+ * <LI> \ref mln::estim
+ * <LI> \ref mln::fun
+ * <LI> \ref mln::geom
+ * <LI> \ref mln::histo
+ * <LI> \ref mln::io
+ * <LI> \ref mln::labeling
+ * <LI> \ref mln::level
+ * <LI> \ref mln::linear
+ * <LI> \ref mln::literal
+ * <LI> \ref mln::logical
+ * <LI> \ref mln::make
+ * <LI> \ref mln::math
+ * <LI> \ref mln::metal
+ * <LI> \ref mln::morpho
+ * <LI> \ref mln::norm
+ * <LI> \ref mln::pw
+ * <LI> \ref mln::set
+ * <LI> \ref mln::tag
+ * <LI> \ref mln::test
+ * <LI> \ref mln::trace
+ * <LI> \ref mln::trait
+ * <LI> \ref mln::util
+ * <LI> \ref mln::value
+ * <LI> \ref mln::win
+ *
+ * \section copyright Copyright and License.
+ * Copyright (C) 2007 EPITA Research and Development Laboratory
+ *
+ * This file is part of the Olena 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.
+ *
+ */
+
+
+
/*! \namespace mln
* \brief The namespace mln corresponds to the Milena (mini-Olena) project.
*
Index: trunk/milena/mln/level/all.hh
===================================================================
--- trunk/milena/mln/level/all.hh (revision 1613)
+++ trunk/milena/mln/level/all.hh (revision 1614)
@@ -31,6 +31,7 @@
/*! \file mln/level/all.hh
*
* \brief File that includes all level-related routines.
+ *
*/
@@ -66,7 +67,6 @@
# include <mln/level/memset_.hh>
# include <mln/level/naive/all.hh>
# include <mln/level/paste.hh>
-# include <mln/level/paste.spe.hh>
# include <mln/level/saturate.hh>
# include <mln/level/sort_points.hh>
# include <mln/level/stretch.hh>
Index: trunk/milena/mln/level/paste.hh
===================================================================
--- trunk/milena/mln/level/paste.hh (revision 1613)
+++ trunk/milena/mln/level/paste.hh (revision 1614)
@@ -31,6 +31,7 @@
/*! \file mln/level/paste.hh
*
* \brief Paste the contents of an image into another one.
+ *
*/
# include <mln/core/concept/image.hh>
@@ -48,7 +49,8 @@
namespace level
{
- /*! Paste the contents of image \p data into the image \p
+ /*!
+ * \brief Paste the contents of image \p data into the image \p
* destination.
*
* \param[in] data The input image providing pixels values.
Index: trunk/milena/mln/convert/all.hh
===================================================================
--- trunk/milena/mln/convert/all.hh (revision 1613)
+++ trunk/milena/mln/convert/all.hh (revision 1614)
@@ -36,7 +36,7 @@
namespace mln
{
- /// \internal Namespace of convertion routines.
+ /// Namespace of convertion routines.
namespace convert {}
}
#70: Complete the definition of the legend of the synthetic progression views
for the release of Olena 1.0ß
-----------------------+----------------------------------------------------
Reporter: levill_r | Owner: Olena Team
Type: defect | Status: closed
Priority: critical | Milestone: Olena 1.0ß
Component: other | Version: 1.0
Resolution: fixed | Keywords: Trac
-----------------------+----------------------------------------------------
Changes (by levill_r):
* status: new => closed
* resolution: => fixed
Comment:
Done two weeks before in these revisions of these Wiki pages:
* https://trac.lrde.org/olena/wiki/Olena/Release1.0beta?version=29
*
https://trac.lrde.org/olena/wiki/Olena/Release1.0beta/DetailedView?version=…
--
Ticket URL: <https://trac.lrde.org/olena/ticket/70#comment:1>
Olena <http://olena.lrde.epita.fr>
Olena, a generic and efficient C++ image library.