October 2008 - Olena-patches

2502: Fix paths in milena/sandbox/ChangeLog.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/sandbox/ChangeLog | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 0e0a314..cec1786 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -470,13 +470,13 @@ Add a 2D simplicial complex (toy code) + a double-window type. - * sandbox/geraud/cs2d: New directory. - * sandbox/geraud/cs2d/cs2d.cc: New. - * sandbox/geraud/cs2d/dbl_neighb.cc: New. - * sandbox/geraud/cs2d/cs2d.hh: New. - * sandbox/geraud/cs2d/cs2d_utils.hh: New. - * sandbox/geraud/cs2d/dbl_neighb.hh: New. - * sandbox/geraud/cs2d/cs2d_morpho.hh: New. + * geraud/cs2d: New directory. + * geraud/cs2d/cs2d.cc: New. + * geraud/cs2d/dbl_neighb.cc: New. + * geraud/cs2d/cs2d.hh: New. + * geraud/cs2d/cs2d_utils.hh: New. + * geraud/cs2d/dbl_neighb.hh: New. + * geraud/cs2d/cs2d_morpho.hh: New. 2008-06-04 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0

2501: Fix paths in milena/ChangeLog.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 210 +++++++++++++++++++++++++++--------------------------- 1 files changed, 105 insertions(+), 105 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8a149f5..8a3620e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -807,8 +807,8 @@ (mln::topo::face_fwd_iter<D>) (mln::topo::face_bkd_iter<D>): ...these. - * milena/mln/topo/complex.hh: Adjust. - * milena/tests/topo/complex.cc: Update documentation. + * mln/topo/complex.hh: Adjust. + * tests/topo/complex.cc: Update documentation. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> @@ -817,52 +817,52 @@ * mln/topo/internal/complex_iter_base.hh (mln::topo::internal::complex_iter_base_<F, E>): Rename as... (mln::topo::internal::complex_iter_base<F, E>): ...this. - * milena/mln/topo/attic/complex_faces_iter.hh, - * milena/mln/topo/attic/faces_iter.hh, - * milena/mln/topo/complex_iter.hh: + * mln/topo/attic/complex_faces_iter.hh, + * mln/topo/attic/faces_iter.hh, + * mln/topo/complex_iter.hh: Adjust clients. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> Disable old iterators on n-faces (with n statically known). - * milena/mln/core/site_set/p_complex_faces_piter.hh, - * milena/mln/core/site_set/p_faces_piter.hh, - * milena/mln/topo/complex_faces_iter.hh, - * milena/mln/topo/faces_iter.hh: + * mln/core/site_set/p_complex_faces_piter.hh, + * mln/core/site_set/p_faces_piter.hh, + * mln/topo/complex_faces_iter.hh, + * mln/topo/faces_iter.hh: Move... - * milena/mln/core/site_set/attic/p_complex_faces_piter.hh, - * milena/mln/core/site_set/attic/p_faces_piter.hh, - * milena/mln/topo/attic/complex_faces_iter.hh, - * milena/mln/topo/attic/faces_iter.hh: + * mln/core/site_set/attic/p_complex_faces_piter.hh, + * mln/core/site_set/attic/p_faces_piter.hh, + * mln/topo/attic/complex_faces_iter.hh, + * mln/topo/attic/faces_iter.hh: ...here. Disable these iterators... - * milena/mln/core/site_set/p_complex.hh, - * milena/mln/core/site_set/p_faces.hh, - * milena/mln/topo/complex.hh, - * milena/tests/core/image/complex_image.cc, - * milena/tests/topo/complex.cc: + * mln/core/site_set/p_complex.hh, + * mln/core/site_set/p_faces.hh, + * mln/topo/complex.hh, + * tests/core/image/complex_image.cc, + * tests/topo/complex.cc: ...in those files. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> Split mln/topo/face.hh. - * milena/mln/topo/face.hh + * mln/topo/face.hh (mln::topo::face_data<N, D>) (mln::topo::n_face<N, D>) (mln::topo::n_faces_set<N, D>): Move... - * milena/mln/topo/face_data.hh, - * milena/mln/topo/n_face.hh, - * milena/mln/topo/n_faces_set.hh: + * mln/topo/face_data.hh, + * mln/topo/n_face.hh, + * mln/topo/n_faces_set.hh: ...here (new files). - * milena/mln/topo/complex.hh, - * milena/mln/topo/complex_faces_iter.hh, - * milena/mln/topo/complex_iter.hh, - * milena/mln/topo/faces_iter.hh: + * mln/topo/complex.hh, + * mln/topo/complex_faces_iter.hh, + * mln/topo/complex_iter.hh, + * mln/topo/faces_iter.hh: Adjust. - * milena/tests/topo/complex.cc: Update documentation. + * tests/topo/complex.cc: Update documentation. 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> @@ -2184,14 +2184,14 @@ 2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> Fix some tests. - * milena/tests/convert/to_p_set.cc, - * milena/tests/convert/to_window.cc: Use the proper comparison operator. + * tests/convert/to_p_set.cc, + * tests/convert/to_window.cc: Use the proper comparison operator. - * milena/tests/core/alias/point1d.cc: use point1d::ind(). + * tests/core/alias/point1d.cc: use point1d::ind(). - * milena/tests/core/alias/w_window1d_int.cc: use convert::to(). + * tests/core/alias/w_window1d_int.cc: use convert::to(). - * milena/tests/core/image/value_enc_image.cc: + * tests/core/image/value_enc_image.cc: use the proper p_runs2d type. 2008-09-17 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> @@ -2318,33 +2318,33 @@ 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> make seed2tiling_roundness test compile. - * milena/mln/convert/to_image.hh: + * mln/convert/to_image.hh: use operator(point1d p) instead of operator(int index). - * milena/mln/display/color_pretty.hh: add missing header. + * mln/display/color_pretty.hh: add missing header. - * milena/mln/geom/chamfer.hh: Use pw::cst(bool) with operator |. + * mln/geom/chamfer.hh: Use pw::cst(bool) with operator |. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Make w_window compile. - * milena/mln/core/site_set/p_priority.hh: + * mln/core/site_set/p_priority.hh: Add missing comparison operator. - * milena/mln/core/w_window.hh, - * milena/mln/core/concept/weighted_window.hh: + * mln/core/w_window.hh, + * mln/core/concept/weighted_window.hh: Update typedefs. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Rename owns_() to has(). - * milena/mln/core/image/lazy_image.hh, - * milena/mln/morpho/dilation.hh: here. + * mln/core/image/lazy_image.hh, + * mln/morpho/dilation.hh: here. 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Do not exclude the concept directory from doc generation. - * milena/doc/Doxyfile.in: do it. + * doc/Doxyfile.in: do it. 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> @@ -3041,13 +3041,13 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_(). - * milena/mln/core/image/interpolated.hh, - * milena/mln/core/image/plain.hh, - * milena/mln/core/image/safe.hh, - * milena/mln/core/image/sparse_image.hh: + * mln/core/image/interpolated.hh, + * mln/core/image/plain.hh, + * mln/core/image/safe.hh, + * mln/core/image/sparse_image.hh: Add missing init_() here . - * milena/mln/core/image/status.txt: Update cast_image status. + * mln/core/image/status.txt: Update cast_image status. 2008-09-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3237,7 +3237,7 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Temporary fix doc compilation. - * milena/doc/Doxyfile.in: + * doc/Doxyfile.in: Temporary excludes core/concept from the doc generation. The doc can now be generated. Due to core/concept the doc generation never ended. @@ -3245,17 +3245,17 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove deprecated tests. - * milena/tests/core/image/Makefile.am: + * tests/core/image/Makefile.am: Remove deprecated tests and comments few others. 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix fill_with_image. - * milena/mln/level/fill_with_image.hh: Use exact(). - * milena/mln/level/fill_with_image.spe.hh: + * mln/level/fill_with_image.hh: Use exact(). + * mln/level/fill_with_image.spe.hh: Fix fill_with_image prototype. - * milena/mln/level/memcpy_.hh: Use full namespace name. + * mln/level/memcpy_.hh: Use full namespace name. 2008-09-15 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3490,32 +3490,32 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_(). - * milena/mln/core/image/cast_image.hh, - * milena/mln/core/image/decorated_image.hh: add missing init_(). + * mln/core/image/cast_image.hh, + * mln/core/image/decorated_image.hh: add missing init_(). 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Fix few tests. - * milena/mln/core/site_set/p_complex.hh, - * milena/mln/core/site_set/p_complex_piter.hh, - * milena/mln/core/site_set/p_faces.hh, - * milena/mln/core/site_set/p_bgraph_piter.hh, - * milena/mln/core/site_set/p_graph_piter.hh: + * mln/core/site_set/p_complex.hh, + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_faces.hh, + * mln/core/site_set/p_bgraph_piter.hh, + * mln/core/site_set/p_graph_piter.hh: remove useless '_' in class names. - * milena/tests/canvas/browsing/directional.cc, - * milena/tests/canvas/browsing/fwd.cc, - * milena/tests/canvas/browsing/snake_fwd.cc: rename point to site. + * tests/canvas/browsing/directional.cc, + * tests/canvas/browsing/fwd.cc, + * tests/canvas/browsing/snake_fwd.cc: rename point to site. - * milena/mln/core/alias/dpoint2d_h.hh, - * milena/mln/core/alias/point2d_h.hh, - * milena/tests/algebra/h_vec.cc, - * milena/tests/core/alias/point2d.cc, - * milena/tests/core/alias/point1d.cc: Use def::coord instead of int. + * mln/core/alias/dpoint2d_h.hh, + * mln/core/alias/point2d_h.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point2d.cc, + * tests/core/alias/point1d.cc: Use def::coord instead of int. - * milena/tests/set/diff.cc, - * milena/tests/core/site_set/p_image2d.cc: Update. + * tests/set/diff.cc, + * tests/core/site_set/p_image2d.cc: Update. 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3788,7 +3788,7 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Add at() and remove operator[] from image1d. - * milena/mln/core/image/image1d.hh: add at() and remove operator[]. + * mln/core/image/image1d.hh: add at() and remove operator[]. 2008-09-12 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -3825,19 +3825,19 @@ 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Propagate few renamings. - * milena/mln/canvas/browsing/snake_fwd.hh, - * milena/mln/debug/println.spe.hh: Use def::coord instead of int. + * mln/canvas/browsing/snake_fwd.hh, + * mln/debug/println.spe.hh: Use def::coord instead of int. - * milena/mln/convert/to_image.hh: Rename mln_point to mln_site. + * mln/convert/to_image.hh: Rename mln_point to mln_site. - * milena/mln/geom/shift.hh: + * mln/geom/shift.hh: Use convert::to instead of convert::to_dpoint(). - * milena/mln/level/median.hh: Update the use of io property. + * mln/level/median.hh: Update the use of io property. - * milena/mln/pw/image.hh: Fix typo. + * mln/pw/image.hh: Fix typo. - * milena/mln/win/line.hh: remove useless '_' in type name. + * mln/win/line.hh: remove useless '_' in type name. 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -3880,40 +3880,40 @@ 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Fix most of Doxygen's warnings. - * milena/mln/core/image/flat_image.hh, - * milena/mln/core/internal/site_relative_iterator_base.hh, - * milena/mln/core/site_set/line2d.hh, - * milena/mln/core/site_set/p_if_piter.hh, - * milena/mln/core/site_set/p_priority.hh, - * milena/mln/trait/image/props.hh, - * milena/mln/util/internal/boost_graph_structure.hh, - * milena/mln/util/internal/graph_base.hh, - * milena/tests/algebra/h_vec.cc, - * milena/tests/binarization/threshold.cc, - * milena/tests/core/image/flat_image.cc, - * milena/tests/core/image/tr_image.cc, - * milena/tests/core/other/dpoints_pixter.cc, - * milena/tests/core/site_set/p_priority_queue.cc, - * milena/tests/core/site_set/p_priority_queue_fast.cc, - * milena/tests/core/site_set/p_priority_queue_fast_with_array.cc, - * milena/tests/core/site_set/pset_array.cc, - * milena/tests/core/site_set/pset_if.cc, - * milena/tests/level/sort_psites_full.cc, - * milena/tests/morpho/line_graph_image_wst.cc, - * milena/tests/morpho/meyer_wst.cc, - * milena/tests/morpho/meyer_wst_long.cc, - * milena/tests/test/positive.cc, - * milena/tests/value/builtin/builtin.cc: + * mln/core/image/flat_image.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/core/site_set/line2d.hh, + * mln/core/site_set/p_if_piter.hh, + * mln/core/site_set/p_priority.hh, + * mln/trait/image/props.hh, + * mln/util/internal/boost_graph_structure.hh, + * mln/util/internal/graph_base.hh, + * tests/algebra/h_vec.cc, + * tests/binarization/threshold.cc, + * tests/core/image/flat_image.cc, + * tests/core/image/tr_image.cc, + * tests/core/other/dpoints_pixter.cc, + * tests/core/site_set/p_priority_queue.cc, + * tests/core/site_set/p_priority_queue_fast.cc, + * tests/core/site_set/p_priority_queue_fast_with_array.cc, + * tests/core/site_set/pset_array.cc, + * tests/core/site_set/pset_if.cc, + * tests/level/sort_psites_full.cc, + * tests/morpho/line_graph_image_wst.cc, + * tests/morpho/meyer_wst.cc, + * tests/morpho/meyer_wst_long.cc, + * tests/test/positive.cc, + * tests/value/builtin/builtin.cc: Fix \file tag with the proper file name. - * milena/doc/Doxyfile.in: Add new macro expansions. - * milena/doc/Makefile.am: set EXCLUDE_SYMBOLS properly when + * doc/Doxyfile.in: Add new macro expansions. + * doc/Makefile.am: set EXCLUDE_SYMBOLS properly when making the user doc. 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_() to pw::image. - * milena/mln/pw/image.hh: Add missing init_(). + * mln/pw/image.hh: Add missing init_(). 2008-09-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -8969,8 +8969,8 @@ Add a test on regular neighborhoods. - * milena/tests/core/neighb.cc: New. - * milena/tests/core/Makefile.am (check_PROGRAMS): Add neighb. + * tests/core/neighb.cc: New. + * tests/core/Makefile.am (check_PROGRAMS): Add neighb. (neighb_SOURCES): New. 2008-04-09 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0

2500: Move back an entry from milena/sandbox/ChangeLog at the right place.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/sandbox/ChangeLog | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index c81fd7d..0e0a314 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -211,12 +211,6 @@ * jardonnet/test/icp.cc: . * jardonnet/registration/tools.hh: . -2008-06-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add kruskal algorithm in a sample morphological chain. - - * geraud/cs2d/kruskal.cc: New. - 2008-09-01 Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Sandbox: Start working on metal::array. @@ -332,6 +326,12 @@ * jardonnet/registration/quat7.hh: Fix: signed -> unsigned. * jardonnet/registration/icp_ref.hh: Add saving before start. +2008-06-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add kruskal algorithm in a sample morphological chain. + + * geraud/cs2d/kruskal.cc: New. + 2008-06-18 Matthieu Garrigues <garrigues(a)lrde.epita.fr> -- 1.6.0.1

1 0

2499: Move sandbox-only-related entries from milena/ChangeLog into milena/sandbox/ChangeLog (cont.).
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 19 ------------------- milena/sandbox/ChangeLog | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ded75fb..8a149f5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -7586,13 +7586,6 @@ * mln/trait/site_set/props.hh: Add some doc. * mln/trait/site_sets.hh: Likewise. -2008-06-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add some tutorial-like files about cubical complex. - - * sandbox/geraud/cs2d/tuto.cc: New. - * sandbox/geraud/cs2d/tuto_bis.cc: New. - 2008-06-09 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Deactivate site set inclusion tests. @@ -7612,18 +7605,6 @@ (operator <): Likewise. * doc/tutorial/examples/p_array.cc: Add a test of inclusion. -2008-06-06 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add a 2D simplicial complex (toy code) + a double-window type. - - * sandbox/geraud/cs2d: New directory. - * sandbox/geraud/cs2d/cs2d.cc: New. - * sandbox/geraud/cs2d/dbl_neighb.cc: New. - * sandbox/geraud/cs2d/cs2d.hh: New. - * sandbox/geraud/cs2d/cs2d_utils.hh: New. - * sandbox/geraud/cs2d/dbl_neighb.hh: New. - * sandbox/geraud/cs2d/cs2d_morpho.hh: New. - 2008-05-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Clean Site_Iterator design and propagate to p_array and box. diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 645ba74..c81fd7d 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -431,6 +431,13 @@ * jardonnet/test/img/c10.pbm, * jardonnet/test/img/c11.pbm: New test images. +2008-06-10 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add some tutorial-like files about cubical complex. + + * geraud/cs2d/tuto.cc: New. + * geraud/cs2d/tuto_bis.cc: New. + 2008-06-09 Aroune Aroumougame <aroune.aroumougame(a)gmail.com> Thinning test files. @@ -459,6 +466,18 @@ * jardonnet/registration/icp_ref.hh (impl::icp) : Update : Stop if e_k < d_k. +2008-06-06 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add a 2D simplicial complex (toy code) + a double-window type. + + * sandbox/geraud/cs2d: New directory. + * sandbox/geraud/cs2d/cs2d.cc: New. + * sandbox/geraud/cs2d/dbl_neighb.cc: New. + * sandbox/geraud/cs2d/cs2d.hh: New. + * sandbox/geraud/cs2d/cs2d_utils.hh: New. + * sandbox/geraud/cs2d/dbl_neighb.hh: New. + * sandbox/geraud/cs2d/cs2d_morpho.hh: New. + 2008-06-04 Roland Levillain <roland(a)lrde.epita.fr> Finish the computation of the fusion graph test. -- 1.6.0.1

1 0

2498: Move Milena-related entries from ChangeLog to milena/ChangeLog, and adjust paths.
by Roland Levillain 03 Oct '08

03 Oct '08

--- ChangeLog | 405 ------------------------------------------------------ milena/ChangeLog | 405 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 405 insertions(+), 405 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4e58c0..77e305b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,422 +1,17 @@ -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add p_edges. - - * milena/mln/core/site_set/p_edges.hh: - The site set p_edges. - - * milena/mln/util/internal/graph_edge_psite.hh: - The associated psite. - - * milena/tests/core/site_set/Makefile.am, - * milena/tests/core/site_set/p_edges.cc: - Add a basic test. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Refactor graph_vertex_psite. - - * milena/mln/util/internal/graph_vertex_psite.hh: - Refactor this class... - * milena/mln/util/internal/graph_psite_base.hh: - ... here. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix util::graph<G>::is_subgraph_of(). - - * milena/mln/util/graph.hh: here. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add missing methods to vertex and edge. - - * milena/mln/util/internal/graph_edge.hh: - Add change_graph(). - * milena/mln/util/internal/graph_vertex.hh: - Add invalidate(). - - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add p_vertices. - - * milena/mln/core/site_set/p_vertices.hh: - The site set p_vertices. - - * milena/mln/util/internal/graph_vertex_psite.hh: - The psite associated to p_vertices. - - * milena/tests/core/site_set/p_vertices.cc, - * milena/tests/core/site_set/Makefile.am: - Add a small test. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add a missing method to graph_vertex_iter. - - * milena/mln/util/internal/graph_vertex_iter.hh: - Add a missing update_graph() method. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix invalid compilation of graph_vertex. - - * milena/mln/util/internal/graph_vertex.hh: - Remove useless const and a wrong precondition. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix missing methods in graph_base. - - * milena/mln/util/internal/graph_base.hh: - Add new has() overload for convenience. - -2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> - - Update p_graph_piter. - - * milena/mln/core/site_set/p_graph_piter.hh: - update in order to make it work with the new graph structure. - -2008-09-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Update reconstruction algorithms in theo's sandbox. - - * milena/mln/level/paste.hh: Fix warning. - * milena/sandbox/geraud/Rd/hybrid.hh, - * milena/sandbox/geraud/Rd/queue_based.hh, - * milena/sandbox/geraud/Rd/parallel.cc, - * milena/sandbox/geraud/Rd/union_find.hh, - * milena/sandbox/geraud/Rd/parallel.hh, - * milena/sandbox/geraud/Rd/sequential.cc, - * milena/sandbox/geraud/Rd/utils.hh, - * milena/sandbox/geraud/Rd/hybrid.cc, - * milena/sandbox/geraud/Rd/queue_based.cc, - * milena/sandbox/geraud/Rd/min.cc, - * milena/sandbox/geraud/Rd/sequential.hh, - * milena/sandbox/geraud/Rd/union_find.cc: Update. - 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/tests/topo/Makefile. -2008-09-22 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Update test on extension fill. - - * milena/tests/extension/fill.cc (println_with_border): Remove. - Use 'extended' instead. - * milena/mln/core/image/extended.hh: Fix missing arg name. - -2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix many errors in core/image tests. - * milena/mln/convert/to_p_set.hh: Update doc. - - * milena/mln/make/w_window.hh, - * milena/mln/convert/to_p_set.hh, - * milena/mln/convert/to_w_window.hh, - * milena/mln/convert/to_window.hh: rename mln_dpoint to mln_dpsite. - - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/obased_rle_image.hh: - Rename size_mem() to memory_size(). - Rename p_of_run() to index(). - - * milena/mln/core/image/plain.hh: add missing init_(). - - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/value_enc_image.hh: - Use p_set_of and p_run instead of p_runs_. - - - * milena/mln/estim/sum.hh: - Fully specify the types in template parameters. - - * milena/mln/geom/bbox.hh: Add support for weighted_windows. - -2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> - - Remove \internal tag. - * milena/mln/accu/all.hh, - * milena/mln/accu/internal/base.hh, - * milena/mln/arith/all.hh, - * milena/mln/border/all.hh, - * milena/mln/canvas/all.hh, - * milena/mln/core/concept/doc/image_fastest.hh, - * milena/mln/core/concept/object.hh, - * milena/mln/core/image/bgraph_image.hh, - * milena/mln/core/image/cast_image.hh, - * milena/mln/core/image/complex_image.hh, - * milena/mln/core/image/decorated_image.hh, - * milena/mln/core/image/extension_fun.hh, - * milena/mln/core/image/extension_ima.hh, - * milena/mln/core/image/extension_val.hh, - * milena/mln/core/image/fi_adaptor.hh, - * milena/mln/core/image/flat_image.hh, - * milena/mln/core/image/graph_image.hh, - * milena/mln/core/image/hexa.hh, - * milena/mln/core/image/image1d.hh, - * milena/mln/core/image/image2d.hh, - * milena/mln/core/image/image3d.hh, - * milena/mln/core/image/image_if.hh, - * milena/mln/core/image/instant.hh, - * milena/mln/core/image/interpolated.hh, - * milena/mln/core/image/line_graph_image.hh, - * milena/mln/core/image/mono_obased_rle_image.hh, - * milena/mln/core/image/mono_rle_image.hh, - * milena/mln/core/image/obased_rle_image.hh, - * milena/mln/core/image/plain.hh, - * milena/mln/core/image/rle_image.hh, - * milena/mln/core/image/safe.hh, - * milena/mln/core/image/sparse_image.hh, - * milena/mln/core/image/sub_image.hh, - * milena/mln/core/image/sub_image_if.hh, - * milena/mln/core/image/t_image.hh, - * milena/mln/core/image/tr_image.hh, - * milena/mln/core/image/translate_image.hh, - * milena/mln/core/image/value_enc_image.hh, - * milena/mln/core/internal/box_impl.hh, - * milena/mln/core/internal/check/image_all.hh, - * milena/mln/core/internal/check/image_fastest.hh, - * milena/mln/core/internal/coord_impl.hh, - * milena/mln/core/internal/data.hh, - * milena/mln/core/internal/dpoints_base.hh, - * milena/mln/core/internal/fixme.hh, - * milena/mln/core/internal/force_exact.hh, - * milena/mln/core/internal/image_base.hh, - * milena/mln/core/internal/image_domain_morpher.hh, - * milena/mln/core/internal/image_identity.hh, - * milena/mln/core/internal/image_if_base.hh, - * milena/mln/core/internal/image_morpher.hh, - * milena/mln/core/internal/image_primary.hh, - * milena/mln/core/internal/image_value_morpher.hh, - * milena/mln/core/internal/morpher_lvalue.hh, - * milena/mln/core/internal/neighborhood_base.hh, - * milena/mln/core/internal/piter_adaptor.hh, - * milena/mln/core/internal/pixel_impl.hh, - * milena/mln/core/internal/pixel_iterator_base.hh, - * milena/mln/core/internal/pseudo_site_base.hh, - * milena/mln/core/internal/run_image.hh, - * milena/mln/core/internal/set_of.hh, - * milena/mln/core/internal/site_iterator_base.hh, - * milena/mln/core/internal/site_set_base.hh, - * milena/mln/core/internal/site_set_impl.hh, - * milena/mln/core/internal/site_set_iterator_base.hh, - * milena/mln/core/internal/window_base.hh, - * milena/mln/debug/all.hh, - * milena/mln/display/all.hh, - * milena/mln/fun/all.hh, - * milena/mln/fun/x2x/all.hh, - * milena/mln/fun/x2x/composed.hh, - * milena/mln/geom/all.hh, - * milena/mln/geom/seeds2tiling_roundness.hh, - * milena/mln/histo/all.hh, - * milena/mln/io/all.hh, - * milena/mln/io/pbm/all.hh, - * milena/mln/io/pfm/all.hh, - * milena/mln/io/pnm/all.hh, - * milena/mln/labeling/all.hh, - * milena/mln/level/all.hh, - * milena/mln/level/approx/all.hh, - * milena/mln/level/naive/all.hh, - * milena/mln/linear/all.hh, - * milena/mln/logical/all.hh, - * milena/mln/metal/all.hh, - * milena/mln/metal/math/all.hh, - * milena/mln/morpho/all.hh, - * milena/mln/neighb/image.hh, - * milena/mln/norm/all.hh, - * milena/mln/pw/image.hh, - * milena/mln/test/all.hh, - * milena/mln/trait/all.hh, - * milena/mln/util/all.hh, - * milena/mln/util/array.hh, - * milena/mln/util/greater_point.hh, - * milena/mln/util/greater_psite.hh, - * milena/mln/util/lazy_set.hh, - * milena/mln/util/set.hh, - * milena/mln/value/all.hh, - * milena/mln/value/float01_.hh, - * milena/mln/value/graylevel.hh, - * milena/mln/value/internal/convert.hh, - * milena/mln/value/internal/encoding.hh, - * milena/mln/value/internal/gray_.hh, - * milena/mln/value/internal/gray_f.hh, - * milena/mln/value/internal/iterable_set.hh, - * milena/mln/value/internal/value_like.hh, - * milena/mln/value/label.hh, - * milena/mln/value/set.hh, - * milena/mln/value/stack.hh: here. - 2008-09-17 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * configure.ac: Add tests/extension to configure.ac. -2008-09-16 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix various test related files (again). - * milena/tests/convert/to_image.cc, - * milena/tests/convert/to_window.cc, - * milena/tests/histo/compute.cc, - * milena/tests/histo/to_image1d.cc, - * milena/tests/morpho/hit_or_miss.cc, - * milena/tests/morpho/thinning.cc, - * milena/tests/set/inter.cc, - * milena/tests/set/is_subset_of.cc, - * milena/tests/set/sym_diff.cc, - * milena/tests/set/uni.cc: Make the test compile. - - * milena/mln/fun/x2x/rotation.hh, - * milena/mln/set/diff.hh, - * milena/mln/labeling/regional_minima.hh, - * milena/mln/border/resize.hh, - * milena/mln/level/fill.hh, - * milena/mln/level/fill_with_image.hh, - * milena/mln/level/fill_with_value.hh: - Avoid compilation warning when compiled with -DNDEBUG. - - * milena/mln/convert/to_p_array.hh: Add a missing exact(). - - * milena/mln/set/inter.hh, - * milena/mln/convert/to_image.hh, - * milena/mln/convert/to_p_set.hh, - * milena/mln/convert/to_std_set.hh, - * milena/mln/convert/to_window.hh: Rename mln_point. - - * milena/mln/core/alias/box1d.hh: Add full namespace name. - - * milena/mln/draw/label.hh: Use sub_image instead of image_if_value. - - * milena/mln/level/transform.spe.hh, - * milena/mln/level/median.hh: use values_eligible() instead of values(). - - * milena/mln/morpho/Rd.hh: Use greater_point instead of operator<. - - * milena/mln/morpho/erosion.spe.hh: Add a missing include. - - * milena/tests/morpho/Makefile.am: Disable graph related tests. - -2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> - - Improve user doc generation. - * milena/doc/Doxyfile.in: Exclude the proper file. - * milena/doc/Makefile.am: Exclude the proper symbols for the user doc. - -2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix various test related files. - * milena/tests/core/routine/exact.cc: Write test. - - * milena/tests/canvas/chamfer.cc: Fix includes. - - * milena/tests/convert/to_p_set.cc: Fix a method call. - - * milena/mln/trait/op/all.hh: remove guards. - - * milena/mln/core/internal/exact.hh: Add a forward declaration. - - * milena/mln/core/routine/exact.hh: Move an include. - - * milena/mln/level/median.hh, - * milena/mln/level/naive/median.hh, - * milena/mln/level/was.median.hh: Use median_h. - - * milena/mln/level/memset_.hh: Use full namespace name to call - force_exact (g++ does not look at the right namespace if the full name - is not given). - - * milena/mln/convert/to_image.hh: use geom::bbox(). - - * milena/mln/geom/chamfer.hh, - * milena/mln/geom/pmin_pmax.hh: Rename mln_point to mln_site. - - - * milena/mln/geom/seeds2tiling.hh, - * milena/mln/geom/seeds2tiling_roundness.hh: Use exact(). - - * milena/mln/value/hsi.hh: Add missing copyright header. - -2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> - - Fix Changelog and comments. - * ChangeLog: Add missing entries. - * milena/tests/core/site_set/p_image.cc: Fix comments. - -2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> - - Remove deprecated tests. - * milena/tests/core/site_set/p_priority_queue_fast.cc, - * milena/tests/core/site_set/p_priority_queue_fast_with_array.cc, - * milena/tests/core/site_set/p_runs.cc, - * milena/tests/core/site_set/pset_array.cc: - Remove these tests according to core/site_set/status.txt. - - * milena/mln/level/fill_with_value.hh: fix a compilation warning - (unused variable). - - * milena/mln/set/get.hh: new algorithm to get the ith element in a - site set. - - * milena/tests/core/image/Makefile.am, - * milena/tests/core/site_set/Makefile.am: disable few tests. - - * milena/tests/core/site_set/p_image2d.cc: rename as... - * milena/tests/core/site_set/p_image.cc: ...this file. - - * milena/tests/core/site_set/p_priority_queue.cc, - * milena/tests/core/site_set/p_set.cc, - * milena/tests/core/site_set/pset_if.cc: - update assertions and make the test compile. - - -2008-09-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Add a window-to-neighborhood adapter. - - * milena/mln/core/internal/window_base.hh - (is_neighbable_): New. - * milena/mln/core/neighb.hh: Revamp. - -2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> - - Add a section about graph images in tutorial. - * milena/doc/tutorial/tutorial.tex: Add a section about graph images and fix - few mistakes all along the tutorial. - -2008-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> - - Improve tutorial. - * milena/doc/tutorial/tutorial.tex: improve explanations. - 2008-09-05 Nicolas Ballas <ballas(a)lrde.epita.fr> Update configure.ac. * configure.ac: add the new Makefiles present in tests/core/.... -2008-09-05 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - - Augment tutorial example for Z. - - * milena/doc/tutorial/examples/for_Z.cc: Augment. - * milena/mln/debug/println.spe.hh (has): Replace ima.has by - ima.domain.has so that we do not print the domain extension. - * milena/mln/core/site_set/p_if.hh (pset, pset_): Rename as... - (s, s_): ...these; more consistent with the other code. - * milena/mln/core/image/image_if.hh (todo): Fix typo. - * milena/mln/core/internal/image_domain_morpher.hh - (operator()): Fix missing preconditions. - * milena/mln/value/rgb.hh (operator<<): Remove spaces. - * milena/mln/geom/bbox.hh (bbox): Add overload for images. - 2008-08-11 Roland Levillain <roland(a)lrde.epita.fr> * build-aux/with-swilena.m4: Require SWIG 1.3.31. diff --git a/milena/ChangeLog b/milena/ChangeLog index 0c47245..ded75fb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -114,6 +114,87 @@ Don't include header `limits'. Include header `iosfwd'. +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_edges. + + * mln/core/site_set/p_edges.hh: + The site set p_edges. + + * mln/util/internal/graph_edge_psite.hh: + The associated psite. + + * tests/core/site_set/Makefile.am, + * tests/core/site_set/p_edges.cc: + Add a basic test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Refactor graph_vertex_psite. + + * mln/util/internal/graph_vertex_psite.hh: + Refactor this class... + * mln/util/internal/graph_psite_base.hh: + ... here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix util::graph<G>::is_subgraph_of(). + + * mln/util/graph.hh: here. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing methods to vertex and edge. + + * mln/util/internal/graph_edge.hh: + Add change_graph(). + * mln/util/internal/graph_vertex.hh: + Add invalidate(). + + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add p_vertices. + + * mln/core/site_set/p_vertices.hh: + The site set p_vertices. + + * mln/util/internal/graph_vertex_psite.hh: + The psite associated to p_vertices. + + * tests/core/site_set/p_vertices.cc, + * tests/core/site_set/Makefile.am: + Add a small test. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a missing method to graph_vertex_iter. + + * mln/util/internal/graph_vertex_iter.hh: + Add a missing update_graph() method. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid compilation of graph_vertex. + + * mln/util/internal/graph_vertex.hh: + Remove useless const and a wrong precondition. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix missing methods in graph_base. + + * mln/util/internal/graph_base.hh: + Add new has() overload for convenience. + +2008-10-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update p_graph_piter. + + * mln/core/site_set/p_graph_piter.hh: + update in order to make it work with the new graph structure. + 2008-10-02 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start to integrate registration in Milena. @@ -512,6 +593,24 @@ (mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D>): Adjust. +2008-09-30 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Update reconstruction algorithms in theo's sandbox. + + * mln/level/paste.hh: Fix warning. + * sandbox/geraud/Rd/hybrid.hh, + * sandbox/geraud/Rd/queue_based.hh, + * sandbox/geraud/Rd/parallel.cc, + * sandbox/geraud/Rd/union_find.hh, + * sandbox/geraud/Rd/parallel.hh, + * sandbox/geraud/Rd/sequential.cc, + * sandbox/geraud/Rd/utils.hh, + * sandbox/geraud/Rd/hybrid.cc, + * sandbox/geraud/Rd/queue_based.cc, + * sandbox/geraud/Rd/min.cc, + * sandbox/geraud/Rd/sequential.hh, + * sandbox/geraud/Rd/union_find.cc: Update. + 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> Delegate pretty-printing of iterators on faces to mln::topo::face. @@ -1970,6 +2069,14 @@ * mln/canvas/browsing/snake_fwd.hh: Desactivate check of dimension. +2008-09-22 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Update test on extension fill. + + * tests/extension/fill.cc (println_with_border): Remove. + Use 'extended' instead. + * mln/core/image/extended.hh: Fix missing arg name. + 2008-09-18 Roland Levillain <roland(a)lrde.epita.fr> Rename util::ordpair_<T> as util::ord_pair<T>. @@ -2043,6 +2150,39 @@ 2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix many errors in core/image tests. + * mln/convert/to_p_set.hh: Update doc. + + * mln/make/w_window.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_w_window.hh, + * mln/convert/to_window.hh: rename mln_dpoint to mln_dpsite. + + * mln/core/internal/run_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/obased_rle_image.hh: + Rename size_mem() to memory_size(). + Rename p_of_run() to index(). + + * mln/core/image/plain.hh: add missing init_(). + + * mln/core/internal/run_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/value_enc_image.hh: + Use p_set_of and p_run instead of p_runs_. + + + * mln/estim/sum.hh: + Fully specify the types in template parameters. + + * mln/geom/bbox.hh: Add support for weighted_windows. + +2008-09-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix some tests. * milena/tests/convert/to_p_set.cc, * milena/tests/convert/to_window.cc: Use the proper comparison operator. @@ -2063,6 +2203,120 @@ 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove \internal tag. + * mln/accu/all.hh, + * mln/accu/internal/base.hh, + * mln/arith/all.hh, + * mln/border/all.hh, + * mln/canvas/all.hh, + * mln/core/concept/doc/image_fastest.hh, + * mln/core/concept/object.hh, + * mln/core/image/bgraph_image.hh, + * mln/core/image/cast_image.hh, + * mln/core/image/complex_image.hh, + * mln/core/image/decorated_image.hh, + * mln/core/image/extension_fun.hh, + * mln/core/image/extension_ima.hh, + * mln/core/image/extension_val.hh, + * mln/core/image/fi_adaptor.hh, + * mln/core/image/flat_image.hh, + * mln/core/image/graph_image.hh, + * mln/core/image/hexa.hh, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/image/image_if.hh, + * mln/core/image/instant.hh, + * mln/core/image/interpolated.hh, + * mln/core/image/line_graph_image.hh, + * mln/core/image/mono_obased_rle_image.hh, + * mln/core/image/mono_rle_image.hh, + * mln/core/image/obased_rle_image.hh, + * mln/core/image/plain.hh, + * mln/core/image/rle_image.hh, + * mln/core/image/safe.hh, + * mln/core/image/sparse_image.hh, + * mln/core/image/sub_image.hh, + * mln/core/image/sub_image_if.hh, + * mln/core/image/t_image.hh, + * mln/core/image/tr_image.hh, + * mln/core/image/translate_image.hh, + * mln/core/image/value_enc_image.hh, + * mln/core/internal/box_impl.hh, + * mln/core/internal/check/image_all.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/coord_impl.hh, + * mln/core/internal/data.hh, + * mln/core/internal/dpoints_base.hh, + * mln/core/internal/fixme.hh, + * mln/core/internal/force_exact.hh, + * mln/core/internal/image_base.hh, + * mln/core/internal/image_domain_morpher.hh, + * mln/core/internal/image_identity.hh, + * mln/core/internal/image_if_base.hh, + * mln/core/internal/image_morpher.hh, + * mln/core/internal/image_primary.hh, + * mln/core/internal/image_value_morpher.hh, + * mln/core/internal/morpher_lvalue.hh, + * mln/core/internal/neighborhood_base.hh, + * mln/core/internal/piter_adaptor.hh, + * mln/core/internal/pixel_impl.hh, + * mln/core/internal/pixel_iterator_base.hh, + * mln/core/internal/pseudo_site_base.hh, + * mln/core/internal/run_image.hh, + * mln/core/internal/set_of.hh, + * mln/core/internal/site_iterator_base.hh, + * mln/core/internal/site_set_base.hh, + * mln/core/internal/site_set_impl.hh, + * mln/core/internal/site_set_iterator_base.hh, + * mln/core/internal/window_base.hh, + * mln/debug/all.hh, + * mln/display/all.hh, + * mln/fun/all.hh, + * mln/fun/x2x/all.hh, + * mln/fun/x2x/composed.hh, + * mln/geom/all.hh, + * mln/geom/seeds2tiling_roundness.hh, + * mln/histo/all.hh, + * mln/io/all.hh, + * mln/io/pbm/all.hh, + * mln/io/pfm/all.hh, + * mln/io/pnm/all.hh, + * mln/labeling/all.hh, + * mln/level/all.hh, + * mln/level/approx/all.hh, + * mln/level/naive/all.hh, + * mln/linear/all.hh, + * mln/logical/all.hh, + * mln/metal/all.hh, + * mln/metal/math/all.hh, + * mln/morpho/all.hh, + * mln/neighb/image.hh, + * mln/norm/all.hh, + * mln/pw/image.hh, + * mln/test/all.hh, + * mln/trait/all.hh, + * mln/util/all.hh, + * mln/util/array.hh, + * mln/util/greater_point.hh, + * mln/util/greater_psite.hh, + * mln/util/lazy_set.hh, + * mln/util/set.hh, + * mln/value/all.hh, + * mln/value/float01_.hh, + * mln/value/graylevel.hh, + * mln/value/internal/convert.hh, + * mln/value/internal/encoding.hh, + * mln/value/internal/gray_.hh, + * mln/value/internal/gray_f.hh, + * mln/value/internal/iterable_set.hh, + * mln/value/internal/value_like.hh, + * mln/value/label.hh, + * mln/value/set.hh, + * mln/value/stack.hh: here. + +2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> + make seed2tiling_roundness test compile. * milena/mln/convert/to_image.hh: use operator(point1d p) instead of operator(int index). @@ -2519,6 +2773,50 @@ * mln/win/multiple.hh (i_): Fix warning. * doc/examples/tuto_bis.cc: Update. +2008-09-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix various test related files (again). + * tests/convert/to_image.cc, + * tests/convert/to_window.cc, + * tests/histo/compute.cc, + * tests/histo/to_image1d.cc, + * tests/morpho/hit_or_miss.cc, + * tests/morpho/thinning.cc, + * tests/set/inter.cc, + * tests/set/is_subset_of.cc, + * tests/set/sym_diff.cc, + * tests/set/uni.cc: Make the test compile. + + * mln/fun/x2x/rotation.hh, + * mln/set/diff.hh, + * mln/labeling/regional_minima.hh, + * mln/border/resize.hh, + * mln/level/fill.hh, + * mln/level/fill_with_image.hh, + * mln/level/fill_with_value.hh: + Avoid compilation warning when compiled with -DNDEBUG. + + * mln/convert/to_p_array.hh: Add a missing exact(). + + * mln/set/inter.hh, + * mln/convert/to_image.hh, + * mln/convert/to_p_set.hh, + * mln/convert/to_std_set.hh, + * mln/convert/to_window.hh: Rename mln_point. + + * mln/core/alias/box1d.hh: Add full namespace name. + + * mln/draw/label.hh: Use sub_image instead of image_if_value. + + * mln/level/transform.spe.hh, + * mln/level/median.hh: use values_eligible() instead of values(). + + * mln/morpho/Rd.hh: Use greater_point instead of operator<. + + * mln/morpho/erosion.spe.hh: Add a missing include. + + * tests/morpho/Makefile.am: Disable graph related tests. + 2008-09-16 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment the documentation example on a 2D complex. @@ -2691,6 +2989,12 @@ * mln/core/macros.hh (mln_vset, mln_vset_): s/t_eligible_value_set/t_eligible_values_set/ +2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve user doc generation. + * doc/Doxyfile.in: Exclude the proper file. + * doc/Makefile.am: Exclude the proper symbols for the user doc. + 2008-09-15 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Move and update line_piter as box_runstart_piter. @@ -2702,6 +3006,40 @@ 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix various test related files. + * tests/core/routine/exact.cc: Write test. + + * tests/canvas/chamfer.cc: Fix includes. + + * tests/convert/to_p_set.cc: Fix a method call. + + * mln/trait/op/all.hh: remove guards. + + * mln/core/internal/exact.hh: Add a forward declaration. + + * mln/core/routine/exact.hh: Move an include. + + * mln/level/median.hh, + * mln/level/naive/median.hh, + * mln/level/was.median.hh: Use median_h. + + * mln/level/memset_.hh: Use full namespace name to call + force_exact (g++ does not look at the right namespace if the full name + is not given). + + * mln/convert/to_image.hh: use geom::bbox(). + + * mln/geom/chamfer.hh, + * mln/geom/pmin_pmax.hh: Rename mln_point to mln_site. + + + * mln/geom/seeds2tiling.hh, + * mln/geom/seeds2tiling_roundness.hh: Use exact(). + + * mln/value/hsi.hh: Add missing copyright header. + +2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing init_(). * milena/mln/core/image/interpolated.hh, * milena/mln/core/image/plain.hh, @@ -3065,6 +3403,39 @@ * mln/core/internal/site_relative_iterator_base.hh: . * mln/win/multiple.hh: New. +2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix Changelog and comments. + * ChangeLog: Add missing entries. + * tests/core/site_set/p_image.cc: Fix comments. + +2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove deprecated tests. + * tests/core/site_set/p_priority_queue_fast.cc, + * tests/core/site_set/p_priority_queue_fast_with_array.cc, + * tests/core/site_set/p_runs.cc, + * tests/core/site_set/pset_array.cc: + Remove these tests according to core/site_set/status.txt. + + * mln/level/fill_with_value.hh: fix a compilation warning + (unused variable). + + * mln/set/get.hh: new algorithm to get the ith element in a + site set. + + * tests/core/image/Makefile.am, + * tests/core/site_set/Makefile.am: disable few tests. + + * tests/core/site_set/p_image2d.cc: rename as... + * tests/core/site_set/p_image.cc: ...this file. + + * tests/core/site_set/p_priority_queue.cc, + * tests/core/site_set/p_set.cc, + * tests/core/site_set/pset_if.cc: + update assertions and make the test compile. + + 2008-09-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add an 'estim nsites' routine for Z. @@ -3555,6 +3926,14 @@ * mln/win/rectangle2d.hh: Update an old include +2008-09-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add a window-to-neighborhood adapter. + + * mln/core/internal/window_base.hh + (is_neighbable_): New. + * mln/core/neighb.hh: Revamp. + 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> Factor iterators on p_complexes with iterator on complexes. @@ -3609,6 +3988,12 @@ (mln::complex_bkd_iter_<D>::set_cplx): New. +2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a section about graph images in tutorial. + * doc/tutorial/tutorial.tex: Add a section about graph images and fix + few mistakes all along the tutorial. + 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> * tests/core/complex_image.cc: Fix comment about complex windows. @@ -3678,6 +4063,11 @@ * mln/core/alias/dpoint3d.hh: remove underscore to dpoint_. * mln/core/alias/point3d.hh: remove underscore to point_. +2008-09-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve tutorial. + * doc/tutorial/tutorial.tex: improve explanations. + 2008-09-09 Nicolas Ballas <ballas(a)lrde.epita.fr> Add the sign value type (subset of the int value type). @@ -3896,6 +4286,21 @@ * mln/fun/x2x/rotation.hh: Fix wrong namespaces. * sandbox/jardonnet/virtual/access.hh: Fix concept check. +2008-09-05 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Augment tutorial example for Z. + + * doc/tutorial/examples/for_Z.cc: Augment. + * mln/debug/println.spe.hh (has): Replace ima.has by + ima.domain.has so that we do not print the domain extension. + * mln/core/site_set/p_if.hh (pset, pset_): Rename as... + (s, s_): ...these; more consistent with the other code. + * mln/core/image/image_if.hh (todo): Fix typo. + * mln/core/internal/image_domain_morpher.hh + (operator()): Fix missing preconditions. + * mln/value/rgb.hh (operator<<): Remove spaces. + * mln/geom/bbox.hh (bbox): Add overload for images. + 2008-09-03 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add metal::array (1d,2d,3d). -- 1.6.0.1

1 0

2497: Exercise neighborhood and piters on lower+higher-dim. adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* tests/core/image/complex_image.cc: Here. --- milena/ChangeLog | 6 ++++ milena/tests/core/image/complex_image.cc | 40 ++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 54dde45..0c47245 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise neighborhood and piters on lower+higher-dim. adjacent faces. + + * tests/core/image/complex_image.cc: Here. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood of both lower- and higher-dimension adjacent faces. * mln/core/image/complex_lower_higher_neighborhood.hh: New. diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 76f55db..d30ccc4 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -39,8 +39,13 @@ // FIXME: Include these elsewhere? (In complex_image.hh?) #include <mln/core/image/complex_lower_neighborhood.hh> #include <mln/core/image/complex_higher_neighborhood.hh> +#include <mln/core/image/complex_lower_higher_neighborhood.hh> #include <mln/core/image/complex_neighborhood_piter.hh> +/* FIXME: Split this test (and maybe factor common parts, like the + construction of the complex), since it exercises too many features + in a single file. */ + int main() { @@ -201,7 +206,8 @@ int main() // Iterators on windows and neighborhoods. // // ---------------------------------------- // - // FIXME: Factor: these two test cases only differ by their neighborhood. + // FIXME: Factor: these three test cases only differ by their + // neighborhoods. // Iterate on the lower-dimension faces of each face. { @@ -245,17 +251,35 @@ int main() std::cout << std::endl; } - /* FIXME: Implement windows (and neighborhoods) and corresponding - iterators for complex-based images. + // Iterate on the lower- and higher-dimension faces of each face. + { + typedef complex_lower_higher_neighborhood<D, P> nbh_t; + nbh_t nbh; + mln_fwd_niter_(nbh_t) fn(nbh, fp); + mln_bkd_niter_(nbh_t) bn(nbh, fp); + for_all(fp) + { + std::cout << "Lower- and higer-dimension faces adjacent to " << fp + << std::endl; + for_all_2(fn, bn) + { + mln_assertion((fn.center() == + static_cast<const complex_psite<D, P>&>(fp))); + mln_assertion((bn.center() == + static_cast<const complex_psite<D, P>&>(fp))); + std::cout << " " << fn << '\t' << bn << std::endl; + } + } + std::cout << std::endl; + } + + + /* FIXME: Implement other neighborhoods (and windows) and + corresponding iterators for complex-based images. For a given (fixed) dimension N and a psite P on a N-face, implement windows returning - - the set of (N-1)-faces adjacent to P (using p_faces and - faces_psite?); - - the set of (N+1)-faces adjacent to P (using p_faces and - faces_psite?); - - the set of N-faces sharing a (N-1)-face with P; - the set of N-faces sharing a (N-1)-face or (N-2)-face (by transitivity) with P (is it useful?); -- 1.6.0.1

1 0

2496: Add neighborhood of both lower- and higher-dimension adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/core/image/complex_lower_higher_neighborhood.hh: New. --- milena/ChangeLog | 6 + .../image/complex_lower_higher_neighborhood.hh | 121 ++++++++++++++++++++ 2 files changed, 127 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/image/complex_lower_higher_neighborhood.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 57729ee..54dde45 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood of both lower- and higher-dimension adjacent faces. + + * mln/core/image/complex_lower_higher_neighborhood.hh: New. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise iterators lower+higher-dimension adjacent faces. * tests/topo/complex.cc: Here. diff --git a/milena/mln/core/image/complex_lower_higher_neighborhood.hh b/milena/mln/core/image/complex_lower_higher_neighborhood.hh new file mode 100644 index 0000000..3780709 --- /dev/null +++ b/milena/mln/core/image/complex_lower_higher_neighborhood.hh @@ -0,0 +1,121 @@ +// Copyright (C) 2008 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 +// 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_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH +# define MLN_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH + +/// \file mln/core/complex_lower_higher_neighborhood.hh +/// \brief A neighborhood centered on a n-face of complex returning its +/// adjacent (n-1)-faces and (n+1)-faces. + +# include <mln/core/concept/neighborhood.hh> + +# include <mln/core/site_set/complex_psite.hh> + +# include <mln/topo/adj_lower_higher_face_iter.hh> + +/* FIXME: Factor with complex_lower_neighborhood and + complex_higher_neighborhood (e.g., using an + internal::complex_neighborhood_base common base class). */ + + +namespace mln +{ + // Forward declarations. + template <typename I, typename P, typename N> + class complex_neighborhood_fwd_piter; + template <typename I, typename P, typename N> + class complex_neighborhood_bkd_piter; + + + /// \brief Neighborhood centered on a n-face of complex returning its + /// adjacent (n-1)-faces. + template <unsigned D, typename P> + class complex_lower_higher_neighborhood + : public Neighborhood< complex_lower_higher_neighborhood<D, P> > + { + typedef complex_lower_higher_neighborhood<D, P> self_; + + public: + /// The associated complex iterators. + /// \{ + typedef topo::adj_lower_higher_face_fwd_iter<D> complex_fwd_iter; + typedef topo::adj_lower_higher_face_bkd_iter<D> complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the neighborhood. + typedef complex_psite<D, P> psite; + /// The type of site corresponding to the neighborhood. + typedef mln_site(psite) site; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the ordering of vertices. + typedef + complex_neighborhood_fwd_piter<complex_fwd_iter, P, self_> fwd_niter; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the reverse ordering of vertices. + typedef + complex_neighborhood_bkd_piter<complex_bkd_iter, P, self_> bkd_niter; + + /// The default niter type. + typedef fwd_niter niter; + /// \} + + /// Conversions. + /// \{ + /// The window type corresponding to this neighborhood. + // FIXME: Dummy. + typedef self_ window; + /// Create a window corresponding to this neighborhood. + const window& win() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: Dummy. + template <unsigned D, typename P> + inline + // FIXME: Change (dummy) type. + const typename complex_lower_higher_neighborhood<D, P>::window& + complex_lower_higher_neighborhood<D, P>::win() const + { + // FIXME: Dummy. + return *this; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH -- 1.6.0.1

1 0

2495: Exercise iterators lower+higher-dimension adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* tests/topo/complex.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/topo/complex.cc | 41 +++++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4ebc231..57729ee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Exercise iterators lower+higher-dimension adjacent faces. + + * tests/topo/complex.cc: Here. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on both lower- and higher-dimension adjacent faces. * mln/topo/adj_lower_higher_face_iter.hh: New. diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index f079734..9e559de 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -36,6 +36,9 @@ using namespace mln; +/* FIXME: Split this test (and maybe factor common parts, like the + construction of the complex), since it exercises too many features + in a single file. */ // Forward declarations. template <unsigned N, unsigned D> @@ -207,26 +210,18 @@ int main() milena/tests/core/complex_image.cc) and ticket #162 (https://trac.lrde.org/olena/ticket/162) */ - /* Iterate on the the set of (n-1)- and (n+1)-faces adjacent to the - faces of C. + /* Iterate on the the set of (n-1)- and/or (n+1)-faces adjacent to + the faces of C. Note: this can be solved with iterators where the dimension can - be either static or dynamic. + be either static or dynamic. For the moment, our iterators are + dynamic w.r.t. the dimensions of the faces (both the reference + face and the iterated ones). - Let's start with a dynamic one, as it would allow us to - write something like this: - - mln_fwd_citer_(topo::complex<D>) f(c); - mln_fwd_lower_nciter(topo::complex<D>) n(c); - for_all(c) - for_all(n) - // ... - - (Note: we might want to get rid of the name `citer', and use - `fiter' everywhere.). - - A static version might be useful (and more efficient) too. */ + Static versions might be useful, and more efficient too, when + flexibility is not needed. */ + // Iterate on the the set of (n-1)-faces adjacent to the faces of C. topo::adj_lower_face_fwd_iter<D> fwd_alf(fwd_f); topo::adj_lower_face_bkd_iter<D> bkd_alf(fwd_f); for_all(fwd_f) @@ -238,6 +233,7 @@ int main() } std::cout << std::endl; + // Iterate on the the set of (n+1)-faces adjacent to the faces of C. topo::adj_higher_face_fwd_iter<D> fwd_ahf(fwd_f); topo::adj_higher_face_bkd_iter<D> bkd_ahf(fwd_f); for_all(fwd_f) @@ -249,6 +245,19 @@ int main() } std::cout << std::endl; + // Iterate on the the set of (n+1)-faces *and* (n+1)-faces adjacent + // to the faces of C. + topo::adj_lower_higher_face_fwd_iter<D> fwd_alhf(fwd_f); + topo::adj_lower_higher_face_bkd_iter<D> bkd_alhf(fwd_f); + for_all(fwd_f) + { + std::cout << "Lower- and higher-dimension faces adjacent to " << fwd_f + << ": " << std::endl; + for_all_2(fwd_alhf, bkd_alhf) + std::cout << " " << fwd_alhf << '\t' << bkd_alhf << std::endl; + } + std::cout << std::endl; + /* But first, we need to clarify (existing) names. The one listed in https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages are OK. -- 1.6.0.1

1 0

2494: Add iterators on both lower- and higher-dimension adjacent faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/topo/adj_lower_higher_face_iter.hh: New. Include this header... * mln/topo/complex.hh: ...here. --- milena/ChangeLog | 8 ++ milena/mln/topo/adj_lower_higher_face_iter.hh | 161 +++++++++++++++++++++++++ milena/mln/topo/complex.hh | 1 + 3 files changed, 170 insertions(+), 0 deletions(-) create mode 100644 milena/mln/topo/adj_lower_higher_face_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 755c13d..4ebc231 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on both lower- and higher-dimension adjacent faces. + + * mln/topo/adj_lower_higher_face_iter.hh: New. + Include this header... + * mln/topo/complex.hh: ...here. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add a meta iterator sequencing two complex relative iterators. * mln/topo/internal/complex_relative_iterator_sequence.hh: New. diff --git a/milena/mln/topo/adj_lower_higher_face_iter.hh b/milena/mln/topo/adj_lower_higher_face_iter.hh new file mode 100644 index 0000000..e28b64a --- /dev/null +++ b/milena/mln/topo/adj_lower_higher_face_iter.hh @@ -0,0 +1,161 @@ +// Copyright (C) 2008 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 +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TOPO_ADJ_LOWER_HIGHER_FACE_ITER_HH +# define MLN_TOPO_ADJ_LOWER_HIGHER_FACE_ITER_HH + +/// \file mln/topo/adj_lower_higher_face_iter.hh +/// \brief Definition of forward and backward iterators on all the +/// adjacent (n-1)-faces and (n+1)-faces of a (reference) n-face in a +/// complex. + +# include <mln/topo/internal/complex_relative_iterator_sequence.hh> +# include <mln/topo/adj_lower_face_iter.hh> +# include <mln/topo/adj_higher_face_iter.hh> + +# include <mln/topo/face.hh> + + +namespace mln +{ + + namespace topo + { + + // Forward declaration. + template <unsigned D> class complex; + + + /*------------------------------------------. + | topo::adj_lower_higher_face_fwd_iter<D>. | + `------------------------------------------*/ + + /// \brief Forward iterator on all the adjacent (n-1)-faces and + /// (n+1)-faces of the n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_lower_higher_face_fwd_iter + : public internal::complex_relative_iterator_sequence<adj_lower_face_fwd_iter<D>, + adj_higher_face_fwd_iter<D>, + adj_lower_higher_face_fwd_iter<D> > + { + typedef adj_lower_higher_face_fwd_iter<D> self_; + typedef adj_lower_face_fwd_iter<D> iter1_; + typedef adj_higher_face_fwd_iter<D> iter2_; + typedef internal::complex_relative_iterator_sequence< iter1_, + iter2_, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_lower_higher_face_fwd_iter(); + template <typename Fref> + adj_lower_higher_face_fwd_iter(const Fref& f_ref); + /// \} + }; + + + /*------------------------------------------. + | topo::adj_lower_higher_face_bkd_iter<D>. | + `------------------------------------------*/ + + /// \brief Forward iterator on all the adjacent (n-1)-faces and + /// (n+1)-faces of the n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_lower_higher_face_bkd_iter + : public internal::complex_relative_iterator_sequence<adj_higher_face_bkd_iter<D>, + adj_lower_face_bkd_iter<D>, + adj_lower_higher_face_bkd_iter<D> > + { + typedef adj_lower_higher_face_bkd_iter<D> self_; + typedef adj_higher_face_bkd_iter<D> iter1_; + typedef adj_lower_face_bkd_iter<D> iter2_; + typedef internal::complex_relative_iterator_sequence< iter1_, + iter2_, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_lower_higher_face_bkd_iter(); + template <typename Fref> + adj_lower_higher_face_bkd_iter(const Fref& f_ref); + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*------------------------------------------. + | topo::adj_lower_higher_face_fwd_iter<D>. | + `------------------------------------------*/ + + template <unsigned D> + inline + adj_lower_higher_face_fwd_iter<D>::adj_lower_higher_face_fwd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_lower_higher_face_fwd_iter<D>::adj_lower_higher_face_fwd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + + + /*------------------------------------------. + | topo::adj_lower_higher_face_bkd_iter<D>. | + `------------------------------------------*/ + + template <unsigned D> + inline + adj_lower_higher_face_bkd_iter<D>::adj_lower_higher_face_bkd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_lower_higher_face_bkd_iter<D>::adj_lower_higher_face_bkd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_ADJ_LOWER_HIGHER_FACE_ITER_HH diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index c053879..1291ca7 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -58,6 +58,7 @@ # include <mln/topo/adj_lower_face_iter.hh> # include <mln/topo/adj_higher_face_iter.hh> +# include <mln/topo/adj_lower_higher_face_iter.hh> namespace mln -- 1.6.0.1

1 0

2493: Add a meta iterator sequencing two complex relative iterators.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/topo/internal/complex_relative_iterator_sequence.hh: New. --- milena/ChangeLog | 6 + .../internal/complex_relative_iterator_sequence.hh | 235 ++++++++++++++++++++ 2 files changed, 241 insertions(+), 0 deletions(-) create mode 100644 milena/mln/topo/internal/complex_relative_iterator_sequence.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index be4dc71..755c13d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Add a meta iterator sequencing two complex relative iterators. + + * mln/topo/internal/complex_relative_iterator_sequence.hh: New. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_face, mln_face_): New macros. 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/topo/internal/complex_relative_iterator_sequence.hh b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh new file mode 100644 index 0000000..6725bc0 --- /dev/null +++ b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh @@ -0,0 +1,235 @@ +// Copyright (C) 2008 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 +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TOPO_INTERNAL_COMPLEX_RELATIVE_ITERATOR_SEQUENCE_HH +# define MLN_TOPO_INTERNAL_COMPLEX_RELATIVE_ITERATOR_SEQUENCE_HH + +/// \file mln/topo/internal/complex_relative_iterator_sequence.hh +/// \brief Definition of a meta complex relative iterator using two +/// complex relative iterators sequentially. + +# include <iosfwd> + +# include <mln/metal/equal.hh> + +# include <mln/core/concept/iterator.hh> +# include <mln/topo/complex.hh> + + +namespace mln +{ + + namespace topo + { + + namespace internal + { + /// \brief A meta relative iterator on the faces of a complex + /// using two complex relative iterators sequentially. + /// + /// The first relative iterator is used, and when it becomes + /// invalid, the second one is used. + /// + /// \arg \p I1 The type of the first relative iterator. + /// \arg \p I2 The type of the second relative iterator. + /// \arg \p E The type exact type of the iterator. + template <typename I1, typename I2, typename E> + class complex_relative_iterator_sequence : public Iterator<E> + { + typedef complex_relative_iterator_sequence<I1, I2, E> self_; + + public: + /// The type of the iterated faces. + typedef mln_face(I1) face; + + /// Construction and assignment. + /// \{ + complex_relative_iterator_sequence(); + template <typename Fref> + complex_relative_iterator_sequence(const Fref& f_ref); + /// \} + + /// Manipulation. + /// \{ + /// Change the center face. + void center_at(const face& c); + + /// Test if the iterator is valid. + bool is_valid() const; + /// Invalidate the iterator. + void invalidate(); + + /// Start an iteration. + void start(); + /// Go to the next point. + void next_(); + /// \} + + /// Conversion. + /// \{ + /// Return a reference to the corresponding face handle. + operator const face&() const; + /// \} + + protected: + /// Update the target face. + void update_(); + + protected: + /// The first complex relative iterator. + I1 iter1_; + /// The second complex relative iterator. + I2 iter2_; + + /// The face handle this iterator is pointing to. + face f_; + }; + + + /// Print an mln::topo::internal::complex_relative_iterator_sequence. + template <typename I1, typename I2, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, + const complex_relative_iterator_sequence<I1, I2, E>& p); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I1, typename I2, typename E> + inline + complex_relative_iterator_sequence<I1, I2, E>::complex_relative_iterator_sequence() + { + // Ensure I1 and I2 are compatible. + mlc_equal(mln_face(I1), mln_face(I2))::check(); + + invalidate(); + } + + template <typename I1, typename I2, typename E> + template <typename Fref> + inline + complex_relative_iterator_sequence<I1, I2, E>::complex_relative_iterator_sequence(const Fref& f_ref) + { + // Ensure I1 and I2 are compatible. + mlc_equal(mln_face(I1), mln_face(I2))::check(); + + center_at(f_ref); + } + + template <typename I1, typename I2, typename E> + inline + void + complex_relative_iterator_sequence<I1, I2, E>::center_at(const mln_face(I1)& c) + { + iter1_.center_at(c); + iter2_.center_at(c); + invalidate(); + } + + template <typename I1, typename I2, typename E> + inline + bool + complex_relative_iterator_sequence<I1, I2, E>::is_valid() const + { + return iter1_.is_valid() || iter2_.is_valid(); + } + + template <typename I1, typename I2, typename E> + inline + void + complex_relative_iterator_sequence<I1, I2, E>::invalidate() + { + iter1_.invalidate(); + iter2_.invalidate(); + } + + template <typename I1, typename I2, typename E> + inline + void + complex_relative_iterator_sequence<I1, I2, E>::start() + { + iter1_.start(); + iter2_.start(); + if (is_valid()) + update_(); + } + + template <typename I1, typename I2, typename E> + inline + void + complex_relative_iterator_sequence<I1, I2, E>::next_() + { + /* Iterator<E>::next() ensures that either iter1_ or iter2_ + (or both) are valid before executing this method. */ + if (iter1_.is_valid()) + iter1_.next(); + else + iter2_.next(); + if (is_valid()) + update_(); + } + + template <typename I1, typename I2, typename E> + inline + void + complex_relative_iterator_sequence<I1, I2, E>::update_() + { + mln_precondition(is_valid()); + if (iter1_.is_valid()) + f_ = iter1_; + else + f_ = iter2_; + } + + template <typename I1, typename I2, typename E> + inline + complex_relative_iterator_sequence<I1, I2, E>::operator const mln_face(I1)&() const + { + return f_; + } + + + template <typename I1, typename I2, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, + const complex_relative_iterator_sequence<I1, I2, E>& p) + { + return ostr << mln_face(I1)(p); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo::internal + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_INTERNAL_COMPLEX_RELATIVE_ITERATOR_SEQUENCE_HH -- 1.6.0.1

1 0