Olena-patches April 2008

olena-patches@lrde.epita.fr

11 participants
119 discussions

1826: Enable tests/core/line_graph_elt_neighborhood.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Enable tests/core/line_graph_elt_neighborhood. * tests/core/Makefile.am (check_PROGRAMS): Add line_graph_elt_neighborhood. (line_graph_elt_neighborhood_SOURCES): New. Makefile.am | 2 ++ 1 file changed, 2 insertions(+) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 1825) +++ tests/core/Makefile.am (working copy) @@ -11,6 +11,7 @@ graph_elt_neighborhood \ graph_elt_window \ graph_image \ + line_graph_elt_neighborhood \ line_graph_elt_window \ line_graph_image \ line_graph_image_wst \ @@ -37,6 +38,7 @@ graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc graph_elt_window_SOURCES = graph_elt_window.cc graph_image_SOURCES = graph_image.cc +line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc line_graph_elt_window_SOURCES = line_graph_elt_window.cc line_graph_image_SOURCES = line_graph_image.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc

16 years, 11 months

1825: Fix mln/morpho/line_gradient.hh.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/morpho/line_gradient.hh: Add a missing header inclusion. line_gradient.hh | 1 + 1 file changed, 1 insertion(+) Index: mln/morpho/line_gradient.hh --- mln/morpho/line_gradient.hh (revision 1824) +++ mln/morpho/line_gradient.hh (working copy) @@ -35,6 +35,7 @@ # include <vector> # include <mln/core/image2d.hh> +# include <mln/core/window2d.hh> # include <mln/core/line_graph_image.hh> // FIXME: Generalize to other (input) images as well (image1d,

16 years, 11 months

1824: Fix the interface of some graph-related piters.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the interface of some graph-related piters. * mln/core/graph_window_piter.hh (graph_window_fwd_piter::graph_window_fwd_piter) (graph_window_bkd_piter::graph_window_bkd_piter): Fix the signatures of these ctors w.r.t. the Window concept. * mln/core/graph_neighborhood_piter.hh: (graph_neighborhood_fwd_piter::graph_neighborhood_fwd_piter) (graph_neighborhood_bkd_piter::graph_neighborhood_bkd_piter): Likewise, w.r.t. the Neighborhood concept. (graph_neighborhood_bkd_piter::graph_neighborhood_bkd_piter): Fix the initialization of nbh_. * mln/core/graph_elt_window.hh: Fix comments. * mln/core/graph_elt_neighborhood.hh: Likewise. Use `N' instead of `W' for the parameter representing the neighborhood type. graph_elt_neighborhood.hh | 24 ++++++++++-------------- graph_elt_window.hh | 21 ++++++++------------- graph_neighborhood_piter.hh | 12 +++++++----- graph_window_piter.hh | 8 ++++---- 4 files changed, 29 insertions(+), 36 deletions(-) Index: mln/core/graph_window_piter.hh --- mln/core/graph_window_piter.hh (revision 1823) +++ mln/core/graph_window_piter.hh (working copy) @@ -84,7 +84,7 @@ /// Construction. /// \{ template <typename Pref> - graph_window_fwd_piter(const W& win, const Point_Site<Pref>& p_ref); + graph_window_fwd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref); /// \} /// Manipulation. @@ -168,7 +168,7 @@ /// Construction. /// \{ template <typename Pref> - graph_window_bkd_piter(const W& win, const Point_Site<Pref>& p_ref); + graph_window_bkd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref); /// \} /// Manipulation. @@ -235,7 +235,7 @@ template <typename P, typename W> template <typename Pref> inline - graph_window_fwd_piter<P, W>::graph_window_fwd_piter(const W& win, + graph_window_fwd_piter<P, W>::graph_window_fwd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref) : win_(exact(win)), p_ref_(exact(p_ref).to_psite()), @@ -360,7 +360,7 @@ template <typename P, typename W> template <typename Pref> inline - graph_window_bkd_piter<P, W>::graph_window_bkd_piter(const W& win, + graph_window_bkd_piter<P, W>::graph_window_bkd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref) : win_(exact(win)), p_ref_(exact(p_ref).to_psite()), Index: mln/core/graph_elt_neighborhood.hh --- mln/core/graph_elt_neighborhood.hh (revision 1823) +++ mln/core/graph_elt_neighborhood.hh (working copy) @@ -28,13 +28,11 @@ #ifndef MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH # define MLN_CORE_GRAPH_ELT_NEIGHBORHOOD_HH -/*! \file mln/core/graph_elt_neighborhood.hh - * - * \brief Definition of the elementary ``neighborhood'' on a graph. - * - * \todo Make naming coherent: we have neighborhood (without '_') but - * point_, neighb_, etc. - */ +/// \file mln/core/graph_elt_neighborhood.hh +/// \brief Definition of the elementary ``neighborhood'' on a graph. + +/* FIXME: Have a consistent naming: we have neighborhood (without '_') + but point_, neighb_, etc. */ /* FIXME: Factor those classes: - mln::graph_elt_window @@ -50,14 +48,11 @@ namespace mln { // Fwd decls. - template <typename P, typename W> class graph_neighborhood_fwd_piter; - template <typename P, typename W> class graph_neighborhood_bkd_piter; + template <typename P, typename N> class graph_neighborhood_fwd_piter; + template <typename P, typename N> class graph_neighborhood_bkd_piter; - /*! \brief Elementary neighborhood on graph class. - * - * FIXME: Doc. - */ + /// Elementary neighborhood on graph class. template <typename P> class graph_elt_neighborhood : public Neighborhood< graph_elt_neighborhood > @@ -80,7 +75,7 @@ typedef graph_neighborhood_fwd_piter<P, self_> fwd_niter; /// \brief Point_Iterator type to browse the psites of the - /// neighborhood w.r.t. the ordering of vertices. + /// neighborhood w.r.t. the reverse ordering of vertices. typedef graph_neighborhood_bkd_piter<P, self_> bkd_niter; /// The default niter type. @@ -98,6 +93,7 @@ /// \} }; + # ifndef MLN_INCLUDE_ONLY template <typename P> Index: mln/core/graph_neighborhood_piter.hh --- mln/core/graph_neighborhood_piter.hh (revision 1823) +++ mln/core/graph_neighborhood_piter.hh (working copy) @@ -83,7 +83,8 @@ /// Construction. /// \{ template <typename Pref> - graph_neighborhood_fwd_piter(const N& nbh, const Point_Site<Pref>& p_ref); + graph_neighborhood_fwd_piter(const Neighborhood<N>& nbh, + const Point_Site<Pref>& p_ref); /// \} /// Manipulation. @@ -164,7 +165,8 @@ /// Construction. /// \{ template <typename Pref> - graph_neighborhood_bkd_piter(const N& nbh, const Point_Site<Pref>& p_ref); + graph_neighborhood_bkd_piter(const Neighborhood<N>& nbh, + const Point_Site<Pref>& p_ref); /// \} /// Manipulation. @@ -229,7 +231,7 @@ template <typename P, typename N> template <typename Pref> inline - graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter(const N& nbh, + graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter(const Neighborhood<N>& nbh, const Point_Site<Pref>& p_ref) : nbh_(exact(nbh)), p_ref_(exact(p_ref).to_psite()), @@ -357,9 +359,9 @@ template <typename P, typename N> template <typename Pref> inline - graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter(const N& nbh, + graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter(const Neighborhood<N>& nbh, const Point_Site<Pref>& p_ref) - : nbh_(nbh), + : nbh_(exact(nbh)), p_ref_(exact(p_ref).to_psite()), // Initialize psite_ to a dummy value. psite_(), Index: mln/core/graph_elt_window.hh --- mln/core/graph_elt_window.hh (revision 1823) +++ mln/core/graph_elt_window.hh (working copy) @@ -28,13 +28,11 @@ #ifndef MLN_CORE_GRAPH_ELT_WINDOW_HH # define MLN_CORE_GRAPH_ELT_WINDOW_HH -/*! \file mln/core/graph_elt_window.hh - * - * \brief Definition of the elementary ``window'' on a graph. - * - * \todo Make naming coherent: we have window (without '_') but - * point_, neighb_, etc. - */ +/// \file mln/core/graph_elt_window.hh +/// \brief Definition of the elementary ``window'' on a graph. + +/* FIXME: Have a consistent naming: we have window (without '_') but + point_, neighb_, etc. */ /* FIXME: Factor those classes: - mln::graph_elt_window @@ -54,10 +52,7 @@ template <typename P, typename W> class graph_window_bkd_piter; - /*! \brief Elementary window on graph class. - * - * FIXME: Doc. - */ + /// \brief Elementary window on graph class. template <typename P> class graph_elt_window : public Window< graph_elt_window > { @@ -79,7 +74,7 @@ typedef graph_window_fwd_piter<P, self_> fwd_qiter; /// \brief Point_Iterator type to browse the psites of the window - /// w.r.t. the ordering of vertices. + /// w.r.t. the reverse ordering of vertices. typedef graph_window_bkd_piter<P, self_> bkd_qiter; /// The default qiter type. @@ -106,7 +101,7 @@ /// Is the window centered? bool is_centered() const; /// Is the window symmetric? - // FIXME: We should defin this more precisely. + // FIXME: We should define this more precisely. bool is_symmetric() const; /// Return the maximum coordinate gap between the window center /// and a window point.

16 years, 11 months

1823: Remove outdated comments about neighborhoods.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Remove outdated comments about neighborhoods. * mln/geom/seeds2tiling_roundness.hh, * mln/labeling/background.hh, * mln/labeling/blobs.hh, * mln/labeling/flat_zones.hh, * mln/labeling/foreground.hh, * mln/labeling/level.hh, * mln/labeling/level.spe.hh, * mln/labeling/regional_maxima.hh, * mln/labeling/regional_minima.hh, * mln/make/voronoi.hh, * mln/morpho/Rd.hh: Remove outdated FIXME. geom/seeds2tiling_roundness.hh | 5 ----- labeling/background.hh | 3 --- labeling/blobs.hh | 3 --- labeling/flat_zones.hh | 3 --- labeling/foreground.hh | 3 --- labeling/level.hh | 3 --- labeling/level.spe.hh | 3 --- labeling/regional_maxima.hh | 3 --- labeling/regional_minima.hh | 3 --- make/voronoi.hh | 5 ----- morpho/Rd.hh | 5 ----- 11 files changed, 39 deletions(-) Index: mln/geom/seeds2tiling_roundness.hh --- mln/geom/seeds2tiling_roundness.hh (revision 1822) +++ mln/geom/seeds2tiling_roundness.hh (working copy) @@ -50,11 +50,6 @@ namespace geom { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. We can also optionnaly provide a - version of this function for regular-grid-based images where - the neighborhood is replaced by a (user-provided) window. */ - /*! Take a labeled image \p ima_ with seeds and extend them until * creating tiles rounder than the primary version. * Index: mln/labeling/background.hh --- mln/labeling/background.hh (revision 1822) +++ mln/labeling/background.hh (working copy) @@ -43,9 +43,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the background part in a * binary image. * Index: mln/labeling/blobs.hh --- mln/labeling/blobs.hh (revision 1822) +++ mln/labeling/blobs.hh (working copy) @@ -47,9 +47,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the binary objects of a binary * image. * Index: mln/labeling/flat_zones.hh --- mln/labeling/flat_zones.hh (revision 1822) +++ mln/labeling/flat_zones.hh (working copy) @@ -44,9 +44,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the flat zones of an image. * * \param[in] input The input image. Index: mln/labeling/foreground.hh --- mln/labeling/foreground.hh (revision 1822) +++ mln/labeling/foreground.hh (working copy) @@ -43,9 +43,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the object part in a binary * image. * Index: mln/labeling/level.hh --- mln/labeling/level.hh (revision 1822) +++ mln/labeling/level.hh (working copy) @@ -50,9 +50,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the image objects at a given * level. * Index: mln/labeling/level.spe.hh --- mln/labeling/level.spe.hh (revision 1822) +++ mln/labeling/level.spe.hh (working copy) @@ -49,9 +49,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the image objects at a given * level. * Index: mln/labeling/regional_maxima.hh --- mln/labeling/regional_maxima.hh (revision 1822) +++ mln/labeling/regional_maxima.hh (working copy) @@ -47,9 +47,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the regional maxima of an * image. * Index: mln/labeling/regional_minima.hh --- mln/labeling/regional_minima.hh (revision 1822) +++ mln/labeling/regional_minima.hh (working copy) @@ -47,9 +47,6 @@ namespace labeling { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. */ - /*! Connected component labeling of the regional minima of an * image. * Index: mln/make/voronoi.hh --- mln/make/voronoi.hh (revision 1822) +++ mln/make/voronoi.hh (working copy) @@ -47,11 +47,6 @@ namespace make { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. We can also optionnaly provide a - version of this function for regular-grid-based images where - the neighborhood is replaced by a (user-provided) window. */ - /*! * \brief Apply the Voronoi algorithm on \p ima_ with the original * image \p orig_ for node computing with neighborhood \p nbh. Index: mln/morpho/Rd.hh --- mln/morpho/Rd.hh (revision 1822) +++ mln/morpho/Rd.hh (working copy) @@ -55,11 +55,6 @@ namespace morpho { - /* FIXME: The neighborhood shall not be passed as argument, but - bound to the input image. We can also optionnaly provide a - version of this function for regular-grid-based images where - the neighborhood is replaced by a (user-provided) window. */ - template <typename I, typename N> I Rd(const Image& f, const Image& g, const Neighborhood<N>& nbh);

16 years, 11 months

1822: Clean up some ChangeLog entries.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog =================================================================== --- ChangeLog (revision 1821) +++ ChangeLog (revision 1822) @@ -6,20 +6,24 @@ * sandbox/jardonnet/test/bin: New Bin directory. * sandbox/jardonnet/test/Makefile: Update for testes. - * sandbox/jardonnet/test/icp_lazy.cc: New dedicated to lazy_map. - * sandbox/jardonnet/registration/icp_lazy.hh: New dedicated to lazy map. + * sandbox/jardonnet/test/icp_lazy.cc: New dedicated to lazy_map. + * sandbox/jardonnet/registration/icp_lazy.hh: New dedicated to + lazy map. * sandbox/jardonnet/registration/quat7.hh: Update. * sandbox/jardonnet/registration/chamfer.hh: Update. - * sandbox/jardonnet/registration/icp.hh: Update (dedicated to distance_map). + * sandbox/jardonnet/registration/icp.hh: Update (dedicated to + distance_map). - * sandbox/jardonnet/registration/misc.hh: Move outside quat/ (removed). - * sandbox/jardonnet/registration/rotation.hh: Move outside quat/ (removed). + * sandbox/jardonnet/registration/misc.hh: Move outside quat/ + (removed). + * sandbox/jardonnet/registration/rotation.hh: Move outside quat/ + (removed). * sandbox/jardonnet/test/check: Remove old test script. 2008-04-02 Caroline Vigouroux <vigour_c(a)epita.fr> - change RGB encoding from int_u to float01_. + Change RGB encoding from int_u to float01_. * sandbox/vigouroux/color/my_hsi.hh: plug HSI on value. * sandbox/vigouroux/color/rgb_to_hsi.hh: . * sandbox/vigouroux/moyenne.cc: test new HSI and RGB. @@ -30,7 +34,9 @@ * mln/algebra/vec.hh: Add check for dimension in to_point(). * sandbox/jardonnet/test/plotscript: Add gnuplot script. - * sandbox/jardonnet/test/Makefile: Add g++ flags: Unexpected behavior disappear with -ffloat-store (float are not stored in register). + * sandbox/jardonnet/test/Makefile: Add g++ flags: Unexpected + behavior disappear with -ffloat-store (float are not stored in + register). * sandbox/jardonnet/test/check: Update test script. * sandbox/jardonnet/registration/quat7.hh: . * sandbox/jardonnet/registration/icp.hh: . @@ -43,11 +49,13 @@ * sandbox/abraham: New. * sandbox/abraham/morpho: New. - * sandbox/abraham/morpho/basic_najman.hh: New, contains Najman component tree. + * sandbox/abraham/morpho/basic_najman.hh: New, contains Najman + component tree. * sandbox/abraham/morpho/test.cc: New. * sandbox/abraham/morpho/images: New. * sandbox/abraham/morpho/images/test_component_tree.pgm: New. - * sandbox/abraham/morpho/topo_wst.hh: New, draft of topological watershed. + * sandbox/abraham/morpho/topo_wst.hh: New, draft of topological + watershed. * sandbox/abraham/morpho/Makefile: New. 2008-03-31 Nicolas Ballas <ballas(a)lrde.epita.fr> @@ -65,9 +73,11 @@ * sandbox/jardonnet/test/reduce.cc: New: image scaling. * sandbox/jardonnet/test/01.pbm, * sandbox/jardonnet/test/02.pbm: New: test images. - * sandbox/jardonnet/registration/icp.hh: Use type lazy_map instead of std::pair, in order to use spécific constructors. + * sandbox/jardonnet/registration/icp.hh: Use type lazy_map instead + of std::pair, in order to use spécific constructors. * sandbox/jardonnet/registration/projection.hh: update. - * sandbox/jardonnet/registration/tools.hh: Add tools for boxes (to include in Milena?). + * sandbox/jardonnet/registration/tools.hh: Add tools for boxes (to + include in Milena?). 2008-03-29 Ugo Jardonnet <jardonnet(a)lrde.epita.fr> @@ -80,8 +90,10 @@ * sandbox/jardonnet/registration/cloud.hh: Correction. * sandbox/jardonnet/registration/jacobi.hh: Add FIXME (nD). * sandbox/jardonnet/registration/icp.hh: Improvment. - * sandbox/jardonnet/registration/projection.hh: Add a projection technique "memo" computing closest point only if needed. - * sandbox/jardonnet/registration/tools.hh: Gather together tools to add to milena. + * sandbox/jardonnet/registration/projection.hh: Add a projection + technique "memo" computing closest point only if needed. + * sandbox/jardonnet/registration/tools.hh: Gather together tools + to add to milena. 2008-03-28 Roland Levillain <roland(a)lrde.epita.fr> @@ -500,10 +512,11 @@ * sandbox/jardonnet/registration/icp.hh, * sandbox/jardonnet/registration/projection.hh, * sandbox/jardonnet/registration/quat/all.hh, - * sandbox/jardonnet/registration/quat/rotation.hh: Update for p_array and n dim (not ready yet). + * sandbox/jardonnet/registration/quat/rotation.hh: Update for + p_array and n dim (not ready yet). + * sandbox/jardonnet/registration/quat/interpol.hh: Remove. + Provided by qut.hh - * sandbox/jardonnet/registration/quat/interpol.hh: Remove. Provided by qut.hh - 2008-03-19 Michel Pellegrin <pellegrin(a)lrde.epita.fr> Fix some mistakes, Add. @@ -590,7 +603,8 @@ * mln/value/internal/gray_f.hh, * mln/value/int_u.hh, * mln/value/int_u_sat.hh, - * mln/value/label.hh: metal/math had been wrongly substitute by algebra/math. + * mln/value/label.hh: metal/math had been wrongly substitute by + algebra/math. * mln/trait/ch_value.hh, * mln/core/h_vec.hh: wrong namespace for vec. @@ -1087,7 +1101,7 @@ (mln::line_graph_image<P, V>::init_): Ensure there are no data before initializing new ones. * mln/core/internal/image_morpher.hh: Remove spurious FIXMEs. - * mln/core/line_graph_psite.hh + * mln/core/line_graph_psite.hh (mln::line_graph_psite::point): Set typedef to P. (mln::line_graph_psite::operator[]): Adjust return type. (mln::line_graph_psite::line_graph_psite): New ctor. @@ -1260,9 +1274,11 @@ Split fllt.hh in my sanbox. - * sandbox/garrigues/fllt/compute_level_set.hh: New, compute the level sets. + * sandbox/garrigues/fllt/compute_level_set.hh: New, compute the + level sets. * sandbox/garrigues/fllt/debug.hh: New, debug routines for FLLT. - * sandbox/garrigues/fllt/doc.hh: New, some comments from the monasse's paper. + * sandbox/garrigues/fllt/doc.hh: New, some comments from + Monasse's paper. * sandbox/garrigues/fllt/lower.hh: New, the struct used to compute the lower level set. * sandbox/garrigues/fllt/upper.hh: New, the struct used to compute the @@ -1277,7 +1293,7 @@ Chamfer DT visual tests (beautiful images inside !). * sandbox/folio/chamfer_dt.cc: New visual tests inside - (Beware! There's a picasso painting here !). + (Beware! There's a picasso painting here !). 2008-02-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -1492,7 +1508,8 @@ * mln/binarization/includes.hh: include for binarization. * mln/binarization/binarization.hh: generic binarization (v2b for now). * mln/binarization/thresholding.hh: thresholding. - * mln/io/pnm/save.hh: Comments for dummy (me) users who try to save binary as pgm. + * mln/io/pnm/save.hh: Comments for dummy (me) users who try to + save binary as pgm. * tests/binarization: New test directory. * tests/binarization/thresholding.cc: New test file. @@ -1573,7 +1590,7 @@ Ressurect and adjust those files from a revision 1700, since mln::labeling::regional_minima (needed by Meyer's WST) doesn't work (yet) on image which are not point-wise accessible. - * mln/util/greater_psite.hh: New. + * mln/util/greater_psite.hh: New. Clone and modified from mln/util/greater_point.hh. * mln/morpho/meyer_wst.hh (morpho::meyer_wst): s/point/psite/. Use morpho::minima_components instead of level::regional_minima, @@ -3171,7 +3188,7 @@ Add `has' and `point_at' method for all run based image. * mln/core/internal/run_image.hh: Add `has' and `point_at' - method. + method. * mln/core/mono_obased_rle_image.hh, * mln/core/mono_rle_image.hh, * mln/core/obased_rle_image.hh, @@ -3198,10 +3215,13 @@ Update creation of documentation. * doc/Doxyfile.in, - * doc/Makefile.am: Update for generation of internal or user documentation. - * doc/Doxyfile_user.in: New template file for generate the user documentation. - - Update source for distinction between the user and developper documentation. + * doc/Makefile.am: Update for generation of internal or user + documentation. + * doc/Doxyfile_user.in: New template file for generate the user + documentation. + Update source for distinction between the user and developper + documentation. + * mln/accu/all.hh, * mln/accu/internal/base.hh, * mln/arith/all.hh, @@ -3518,7 +3538,7 @@ * mln/core/mono_rle_encode.hh: Fix. * mln/core/mono_rle_image.hh: Add get_value() method. * mln/core/obased_rle_image.hh: Add vector of value for easier - acces to the image. + acces to the image. * tests/core/Makefile.am: Add test. * tests/core/mono_obased_rle_image.cc: New. @@ -3645,14 +3665,14 @@ Complete the macros in Meta Accumlator. * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + mln_accu_result_) New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Complete the macros in Meta Accumlator. * mln/core/concept/meta_accumulator.hh: (mln_accu_with_, - mln_accu_result_) New. + mln_accu_result_) New. 2007-12-03 Matthieu Garrigues <garrigues(a)lrde.epita.fr> @@ -4199,8 +4219,8 @@ * mln/io/ppm/load.hh, * mln/io/ppm/save.hh, * tests/io/ppm/ppm.cc: Add documentation, review the code, put - MLN_INCLUDE_ONLY gards, add missing function declaration (outside - MLN_INCLUDE_ONLY). + MLN_INCLUDE_ONLY gards, add missing function declaration (outside + MLN_INCLUDE_ONLY). 2007-11-28 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> @@ -4251,7 +4271,7 @@ Review debug directory. * mln/debug/iota.hh: Resolve a fixme due to a resolved bug (in - operator %) + operator %) * mln/debug/iota.spe.hh: likewise * tests/Makefile.am: Move debug tests... * tests/debug/Makefile.am: ...here @@ -4268,7 +4288,7 @@ make save pgm work on graylevels. document pnm::save. * mln/io/pgm/save.hh: Disable type checking in pgm::save to allow to - save graylevel images. + save graylevel images. * mln/io/pnm/save.hh: Documentation. * mln/io/pnm/save_header.hh: graylevel compatibility. @@ -5193,7 +5213,8 @@ 2007-11-16 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> - Add tracing for level algorithm and split specialization of level::transform. + Add tracing for level algorithm and split specialization of + level::transform. * mln/level/compute.hh, * mln/level/fill.hh, @@ -10817,7 +10838,6 @@ * mln/core/image1d_b.hh: re-add array_ attribute in the image1d_b class we actually need it to handle the border offset => array_ = buffer_ - vb_.pmin().ind(); -) * mln/debug/println.hh: update * tests/debug_println_with_border.cc: add 1d test. @@ -10993,11 +11013,11 @@ 2007-09-06 Matthieu Garrigues <garrigues.matthieu(a)lrde.epita.fr> add println_with_border - * mln/debug/println.hh: - add 3 function : - println_with_border(const box2d& b, const Fast_Image& input_) - impl::println_with_border(const S&, const Fast_Image& input_) - impl::println_with_border(const box2d& b, const Fast_Image& input_) + * mln/debug/println.hh + (println_with_border(const box2d&, const Fast_Image&)) + (impl::println_with_border(const S&, const Fast_Image&)) + (impl::println_with_border(const box2d&, const Fast_Image&)): + New functions. * tests/println_with_border.cc: New. 2007-09-06 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -12280,9 +12300,11 @@ Repair lineary pixel iterator. - * mln/core/pixter2d_b.hh: Adapt pixter2d_b to the new pixel iterator hierachy. + * mln/core/pixter2d_b.hh: Adapt pixter2d_b to the new pixel + iterator hierachy. * mln/core/internal/pixel_iterator_base.hh: Fix dead code. - * mln/core/internal/lineary_pixel_iterator_base.hh: New factorization class. + * mln/core/internal/lineary_pixel_iterator_base.hh: New + factorization class. 2007-07-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> @@ -12312,13 +12334,16 @@ * tests/pixter_point2d.cc: Update test. * mln/core/pixel.hh: Add typedefs in the class pixel_. * mln/core/macros.hh: Add new macros. - * mln/core/concept/pixel_iterator.hh: New, rename Fast_Iterator concep as Pixel Iterator. + * mln/core/concept/pixel_iterator.hh: New, rename Fast_Iterator + concep as Pixel Iterator. * mln/core/concept/fast_iterator.hh: Remove. * mln/core/concept/genpixel.hh: Constructor fixed. * mln/core/pixter2d_b.hh: Broken!. * mln/core/image2d_b.hh: Add new method point_at_offset. - * mln/core/dpoints_pixter.hh: Adapt dpoint_pixter to the new hierarchy. - * mln/core/internal/pixel_iterator_base.hh: New, rename fast_iterator_base_ as pixel_iterator_base_. + * mln/core/dpoints_pixter.hh: Adapt dpoint_pixter to the new + hierarchy. + * mln/core/internal/pixel_iterator_base.hh: New, rename + fast_iterator_base_ as pixel_iterator_base_. * mln/core/internal/fast_iterator_base.hh: Remove. * mln/level/fast_median.hh: New median using qixter. @@ -12896,12 +12921,13 @@ * sandbox: New. * sandbox/cxxcompilation: New. - * sandbox/cxxcompilation/compilation_unit.rb: Tools used to create compilation unit file - for benchmark. + * sandbox/cxxcompilation/compilation_unit.rb: Tools used to create + compilation unit file for benchmark. * sandbox/cxxcompilation/test.cc: Test file used in benchmark. - * sandbox/cxxcompilation/methods: Describes some existing method which improve compilation - time. - * sandbox/cxxcompilation/vaucanson_bench: Benchmark on Vaucanson method. + * sandbox/cxxcompilation/methods: Describes some existing method + which improve compilation time. + * sandbox/cxxcompilation/vaucanson_bench: Benchmark on Vaucanson + method. 2007-07-03 Thierry Geraud <thierry.geraud(a)lrde.epita.fr>

16 years, 11 months

1821: Sandbox: ICP: Make check.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Sandbox: ICP: Make check. * sandbox/jardonnet/test/icp_check.sh: New Check Script. * sandbox/jardonnet/test/bin: New Bin directory. * sandbox/jardonnet/test/Makefile: Update for testes. * sandbox/jardonnet/test/icp_lazy.cc: New dedicated to lazy_map. * sandbox/jardonnet/registration/icp_lazy.hh: New dedicated to lazy map. * sandbox/jardonnet/registration/quat7.hh: Update. * sandbox/jardonnet/registration/chamfer.hh: Update. * sandbox/jardonnet/registration/icp.hh: Update (dedicated to distance_map). * sandbox/jardonnet/registration/misc.hh: Move outside quat/ (removed). * sandbox/jardonnet/registration/rotation.hh: Move outside quat/ (removed). * sandbox/jardonnet/test/check: Remove old test script. registration/icp.hh | 6 + registration/icp_lazy.hh | 171 +++++++++++++++++++++++++++++++++++++++++++++++ registration/misc.hh | 19 +++++ registration/quat7.hh | 2 registration/rotation.hh | 70 +++++++++++++++++++ test/Makefile | 25 ++++++ test/icp_check.sh | 8 ++ test/icp_lazy.cc | 20 +++++ 8 files changed, 315 insertions(+), 6 deletions(-) Index: sandbox/jardonnet/test/icp_check.sh --- sandbox/jardonnet/test/icp_check.sh (revision 0) +++ sandbox/jardonnet/test/icp_check.sh (revision 0) @@ -0,0 +1,8 @@ +#!/bin/sh + +for i in `\ls bin/` +do + echo execute $i 01.pbm 02.pbm + ./bin/$i 01.pbm 02.pbm > ./bin/log_$i + echo ./bin/log_$i +done Property changes on: sandbox/jardonnet/test/icp_check.sh ___________________________________________________________________ Name: svn:executable + * Index: sandbox/jardonnet/test/Makefile --- sandbox/jardonnet/test/Makefile (revision 1820) +++ sandbox/jardonnet/test/Makefile (working copy) @@ -14,9 +14,6 @@ g++ gaussian.cc $(FLAG) -o '+gau.exe' icp: - g++ icp.cc $(FLAG) -o '+icp.exe' - -icp++: g++ icp.cc -ffloat-store -I../../.. -O3 -DNDEBUG -o '+icp.exe' icpsafe: @@ -29,3 +26,25 @@ ./+icp.exe 01.pbm 02.pbm > log gnuplot plotscript +check: clean + g++ icp.cc -I../../.. -O0 -o './bin/+icp_0' + g++ icp.cc -I../../.. -O0 -ffloat-store -o './bin/+icp_0f' + g++ icp.cc -I../../.. -O0 -DNDEBUG -o './bin/+icp_0D' + g++ icp.cc -I../../.. -O0 -DNDEBUG -ffloat-store -o './bin/+icp_0Df' + g++ icp.cc -I../../.. -O3 -o './bin/+icp_3' + g++ icp.cc -I../../.. -O3 -ffloat-store -o './bin/+icp_3f' + g++ icp.cc -I../../.. -O3 -DNDEBUG -o './bin/+icp_3D' + g++ icp.cc -I../../.. -O3 -DNDEBUG -ffloat-store -o './bin/+icp_3df' + g++ icp_lazy.cc -I../../.. -O0 -o './bin/+icp_lazy_0' + g++ icp_lazy.cc -I../../.. -O0 -ffloat-store -o './bin/+icp_lazy_0f' + g++ icp_lazy.cc -I../../.. -O0 -DNDEBUG -o './bin/+icp_lazy_0D' + g++ icp_lazy.cc -I../../.. -O0 -DNDEBUG -ffloat-store -o './bin/+icp_lazy_0Df' + g++ icp_lazy.cc -I../../.. -O3 -o './bin/+icp_lazy_3' + g++ icp_lazy.cc -I../../.. -O3 -ffloat-store -o './bin/+icp_lazy_3f' + g++ icp_lazy.cc -I../../.. -O3 -DNDEBUG -o './bin/+icp_lazy_3D' + g++ icp_lazy.cc -I../../.. -O3 -DNDEBUG -ffloat-store -o './bin/+icp_lazy_3df' + +clean: + rm -- ./bin/* + +.PHONY: check \ No newline at end of file Index: sandbox/jardonnet/test/icp_lazy.cc --- sandbox/jardonnet/test/icp_lazy.cc (revision 0) +++ sandbox/jardonnet/test/icp_lazy.cc (revision 0) @@ -0,0 +1,20 @@ +#include <mln/core/image3d.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + +#include <sandbox/jardonnet/registration/icp_lazy.hh> + +int main(int, char* argv[]) +{ + using namespace mln; + + image2d< bool > img1; + image2d< bool > img2; + + io::pbm::load(img1, argv[1]); + io::pbm::load(img2, argv[2]); + + io::pbm::save(registration::icp(img1,img2), "./+registred.pbm"); +} + Index: sandbox/jardonnet/registration/quat7.hh --- sandbox/jardonnet/registration/quat7.hh (revision 1820) +++ sandbox/jardonnet/registration/quat7.hh (working copy) @@ -8,7 +8,7 @@ # include <mln/algebra/mat.hh> # include <mln/core/p_array.hh> -# include "quat/all.hh" +# include "rotation.hh" # include "jacobi.hh" # include <mln/norm/l2.hh> Index: sandbox/jardonnet/registration/chamfer.hh Index: sandbox/jardonnet/registration/icp_lazy.hh --- sandbox/jardonnet/registration/icp_lazy.hh (revision 0) +++ sandbox/jardonnet/registration/icp_lazy.hh (revision 0) @@ -0,0 +1,171 @@ +// Copyright (C) 2008 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. + +#ifndef MLN_REGISTRATION_ICP_HH +# define MLN_REGISTRATION_ICP_HH + +/*! \file mln/registration/icp.hh + * + * \brief image registration + */ + +# include <mln/algebra/quat.hh> +# include <mln/algebra/vec.hh> +# include <mln/make/w_window.hh> +# include <mln/make/w_window3d.hh> + +# include "tools.hh" + +# include "cloud.hh" +# include "quat7.hh" +# include "projection.hh" +# include "chamfer.hh" + +namespace mln +{ + + namespace registration + { + + /*! Registration FIXME : doxy + * + * + */ + template <typename I, typename J> + inline + mln_concrete(I) + icp(const Image& cloud, + const Image<J>& surface); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename P, typename M> + inline + p_array + icp_(p_array& C, + const p_array& X, + M& map) + { + trace::entering("registration::impl::icp_"); + + unsigned int k; + quat7<P::dim> old_qk, qk; + float err; + //float err_bis; + p_array Ck(C), Xk(C); //FIXME: Xk copy C + + algebra::vec<P::dim,float> mu_C = center(C), mu_Xk; + + const float epsilon = 1;//1e-3; + + //// step 1 + k = 0; + + do { + //std::cout << "step 2" << std::endl; + + //// step 2 + projection::memo(Ck, X, Xk, map); + + mu_Xk = center(Xk); + + //std::cout << "step 3" << std::endl; + //// step 3 + old_qk = qk; + qk = match(C, mu_C, Xk, mu_Xk); + + //std::cout << "step 4" << std::endl; + //// step 4 + qk.apply_on(C, Ck); // Ck+1 = qk(C) + + //std::cout << "step err" << std::endl; + //// err = d(Ck+1,Xk) + err = rms(Ck, Xk); + std::cout << k << ' ' << err << ' ' << (qk - old_qk).sqr_norm() << std::endl; //plot file + + ++k; + } while (k < 3 || (qk - old_qk).sqr_norm() > epsilon); + + trace::exiting("registration::impl::icp_"); + return Ck; + } + + } // end of namespace mln::registration::impl + + + //Only for 2d and 3d image + template <typename I, typename J> + inline + mln_concrete(I) //FIXME: should return something else ? qk ? + icp(const Image& cloud_, + const Image<J>& surface_) + { + trace::entering("registration::icp"); + mln_precondition(exact(cloud_).has_data()); + mln_precondition(exact(surface_).has_data()); + + //convert to image: time consuming + typedef image3d<mln_value(I)> I3d; + I3d cloud = convert::to_image_3d(exact(cloud_)); + const I3d surface = convert::to_image_3d(exact(surface_)); + + //build p_arrays. + p_array<mln_point(I3d)> c = convert::to_p_array(cloud); + p_array<mln_point(I3d)> x = convert::to_p_array(surface); + + //build closest point map + //FIXME: like that lazy_map<I3d> map(enlarge(bigger(c.bbox(),x.bbox()),50)); + lazy_map<I3d> map(1000,1000,50); + + p_array<mln_point(I3d)> res = impl::icp_(c, x, map); + + //to 2d : projection (FIXME:if 3d) + //mln_concrete(I) output = convert::to_image(res)? + mln_concrete(I) output(exact(cloud_).domain()); + for (size_t i = 0; i < res.npoints(); i++) + { + point2d p(res[i][0], res[i][1]); + //FIXME: not necessary if output(res.bbox()) + if (output.has(p)) + output(p) = true; + } + + trace::exiting("registration::icp"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::registration + +} // end of namespace mln + + +#endif // ! MLN_REGISTRATION_ICP_HH Index: sandbox/jardonnet/registration/icp.hh --- sandbox/jardonnet/registration/icp.hh (revision 1820) +++ sandbox/jardonnet/registration/icp.hh (working copy) @@ -87,8 +87,10 @@ //// step 1 k = 0; + do { - std::cout << "step 2" << std::endl; + //std::cout << "step 2" << std::endl; + //// step 2 projection::fill_Xk(Ck, map, Xk); //projection::de_base(Ck, X, Xk, err_bis); @@ -157,7 +159,7 @@ p_array<mln_point(I3d)> res = impl::icp_(c, x, map); //to 2d : projection (FIXME:if 3d) - //mln_concrete(I) output = convert::to_image2d(res)? + //mln_concrete(I) output = convert::to_image(res)? mln_concrete(I) output(exact(cloud_).domain()); for (size_t i = 0; i < res.npoints(); i++) { Index: sandbox/jardonnet/registration/misc.hh --- sandbox/jardonnet/registration/misc.hh (revision 0) +++ sandbox/jardonnet/registration/misc.hh (revision 0) @@ -0,0 +1,19 @@ +#ifndef MISC_HH +# define MISC_HH + + +inline +float epsilon() +{ + static const float e = 1e-5; + return e; +} + +inline +bool about_equal(float val1, float val2) +{ + return fabs(val1 - val2) < epsilon(); +} + + +#endif // ndef MISC_HH Index: sandbox/jardonnet/registration/rotation.hh --- sandbox/jardonnet/registration/rotation.hh (revision 0) +++ sandbox/jardonnet/registration/rotation.hh (revision 0) @@ -0,0 +1,70 @@ +#ifndef ROTATION_HH +# define ROTATION_HH + +# include <stdlib.h> +//# include "quat.hh" + +//# include "mat.hh" + +# include <mln/algebra/mat.hh> +# include <mln/algebra/vec.hh> +# include <mln/make/vec.hh> +# include <mln/make/mat.hh> +# include <mln/algebra/quat.hh> + +# include "misc.hh" + +// FIXME: rotation should be an abstract class +// and derived classes encapsulate either a quaternion or a algebra::matrix +namespace mln +{ + + // FIXME : quat is not appriate here + template <unsigned n> + algebra::vec<n,float> rotate(const algebra::quat& q, const algebra::vec<n,float>& p) + { + + return (q * algebra::quat(0. ,p) * q.inv()).v(); + } + + //FIXME : check if correct with n != 3 + template <unsigned n> + bool check_rotation(const algebra::mat<n,n,float>& mat, + const algebra::quat& q) + { + assert(q.is_unit()); + algebra::vec<n,float> + tmp = make::vec(rand(), rand(), rand()), + p; + float nl2= norm::l2(tmp); + if(nl2 != 0) + p = tmp / nl2; + algebra::vec<n,float> + p_rot_1 = rotate(q, p), + p_rot_2 = mat * p; + + return about_equal(norm::l2(p_rot_1 - p_rot_2), 0.f); + } + + + //FIXME : switch to n dim. + algebra::mat<3,3,float> quat2mat(const algebra::quat& q) + { + assert(q.is_unit()); + float + w = q.to_vec()[0], + x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, + y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, + z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; + float t[9] = {1.f - y2 - z2, xy - zw, xz + yw, + xy + zw, 1.f - x2 - z2, yz - xw, + xz - yw, yz + xw, 1.f - x2 - y2}; + algebra::mat<3,3,float> tmp = make::mat<3,3,9,float>(t); + // postcondition + assert(check_rotation(tmp, q)); + return tmp; + } +} + + +#endif // ndef ROTATION_HH

16 years, 11 months

milena r1820: change RGB encoding from int_u to float01_

by Caroline Vigouroux

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2008-04-02 Caroline Vigouroux <vigour_c(a)epita.fr> change RGB encoding from int_u to float01_. * sandbox/vigouroux/color/my_hsi.hh: plug HSI on value. * sandbox/vigouroux/color/rgb_to_hsi.hh: . * sandbox/vigouroux/moyenne.cc: test new HSI and RGB. --- color/my_hsi.hh | 5 +++++ color/rgb_to_hsi.hh | 6 +++--- moyenne.cc | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) Index: trunk/milena/sandbox/vigouroux/color/my_hsi.hh =================================================================== --- trunk/milena/sandbox/vigouroux/color/my_hsi.hh (revision 1819) +++ trunk/milena/sandbox/vigouroux/color/my_hsi.hh (revision 1820) @@ -18,6 +18,11 @@ template <typename E> struct HSI + : + public internal::value_like_< algebra::vec< 3, float01_<n> >, // Equivalent. + algebra::vec< 3, float01_<n> >, // Encoding. + algebra::vec< 3, float01_<n> >, // Interoperation. + HSI<E> > { }; Index: trunk/milena/sandbox/vigouroux/color/rgb_to_hsi.hh =================================================================== --- trunk/milena/sandbox/vigouroux/color/rgb_to_hsi.hh (revision 1819) +++ trunk/milena/sandbox/vigouroux/color/rgb_to_hsi.hh (revision 1820) @@ -88,9 +88,9 @@ beta = hsi.sat() * std::sin(h); - red_t r = to_r(sqrt3_3 * hsi.inty() + 2 * inv_sqrt6 * beta); - green_t g = to_g(sqrt3_3 * hsi.inty() + inv_sqrt2 * alpha - inv_sqrt6 * beta); - blue_t b = to_b(sqrt3_3 * hsi.inty() - inv_sqrt2 * alpha - inv_sqrt6 * beta); + red_t r = sqrt3_3 * hsi.inty() + 2 * inv_sqrt6 * beta; + green_t g = sqrt3_3 * hsi.inty() + inv_sqrt2 * alpha - inv_sqrt6 * beta; + blue_t b = sqrt3_3 * hsi.inty() - inv_sqrt2 * alpha - inv_sqrt6 * beta; T_rgb rgb(r, g, b); Index: trunk/milena/sandbox/vigouroux/moyenne.cc =================================================================== --- trunk/milena/sandbox/vigouroux/moyenne.cc (revision 1819) +++ trunk/milena/sandbox/vigouroux/moyenne.cc (revision 1820) @@ -1,10 +1,10 @@ #include <mln/value/hsi.hh> -#include <mln/fun/v2v/rgb_to_hsi.hh> +#include "color/rgb_to_hsi.hh" #include <cmath> #include <mln/core/image2d.hh> -#include <mln/value/rgb8.hh> +#include "rgb.hh" #include <mln/io/ppm/load.hh> #include <mln/io/ppm/save.hh>

16 years, 11 months

1819: Sandbox: ICP: Fix distance map version: 0.5s for 01.pbm over 02.pbm.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox: ICP: Fix distance map version: 0.5s for 01.pbm over 02.pbm. * mln/algebra/vec.hh: Add check for dimension in to_point(). * sandbox/jardonnet/test/plotscript: Add gnuplot script. * sandbox/jardonnet/test/Makefile: Add g++ flags: Unexpected behavior disappear with -ffloat-store (float are not stored in register). * sandbox/jardonnet/test/check: Update test script. * sandbox/jardonnet/registration/quat7.hh: . * sandbox/jardonnet/registration/icp.hh: . * sandbox/jardonnet/registration/projection.hh: . * sandbox/jardonnet/registration/tools.hh: . mln/algebra/vec.hh | 4 +- sandbox/jardonnet/registration/icp.hh | 39 +++++++++++++-------------- sandbox/jardonnet/registration/projection.hh | 6 ++-- sandbox/jardonnet/registration/quat7.hh | 2 - sandbox/jardonnet/registration/tools.hh | 4 +- sandbox/jardonnet/test/Makefile | 9 +++++- sandbox/jardonnet/test/check | 6 ++++ sandbox/jardonnet/test/plotscript | 5 +++ 8 files changed, 47 insertions(+), 28 deletions(-) Index: mln/algebra/vec.hh --- mln/algebra/vec.hh (revision 1818) +++ mln/algebra/vec.hh (working copy) @@ -550,10 +550,10 @@ } - template <typename P, unsigned n> + template <typename P> inline P - to_point(const vec<n,float>& v) + to_point(const vec<P::dim,float>& v) { P tmp; for (unsigned i = 0; i < P::dim; ++i) Index: sandbox/jardonnet/test/plotscript --- sandbox/jardonnet/test/plotscript (revision 0) +++ sandbox/jardonnet/test/plotscript (revision 0) @@ -0,0 +1,5 @@ +set xlabel "k" +set ylabel "err" +set zlabel "dQk" +splot "log" +pause -1 \ No newline at end of file Index: sandbox/jardonnet/test/Makefile --- sandbox/jardonnet/test/Makefile (revision 1818) +++ sandbox/jardonnet/test/Makefile (working copy) @@ -17,8 +17,15 @@ g++ icp.cc $(FLAG) -o '+icp.exe' icp++: - g++ icp.cc -I../../.. -O3 -o '+icp.exe' + g++ icp.cc -ffloat-store -I../../.. -O3 -DNDEBUG -o '+icp.exe' + +icpsafe: + g++ icp.cc -fsignaling-nans -ffloat-store -I../../.. -O1 -o '+icp.exe' run: time ./+sub.exe . . ; time ./+gsub.exe . . +plot: icp + ./+icp.exe 01.pbm 02.pbm > log + gnuplot plotscript + Index: sandbox/jardonnet/test/check --- sandbox/jardonnet/test/check (revision 1818) +++ sandbox/jardonnet/test/check (working copy) @@ -3,11 +3,17 @@ touch log echo "### report : projection" >> log + echo "*** maps ***" >> log time ./+icp_maps.exe +01.pbm +02.pbm >> log + + echo "*** de_base ***" >> log time ./+icp_base.exe +01.pbm +02.pbm >> log + + echo "*** memo ***" >> log time ./+icp_memo.exe +01.pbm +02.pbm >> log + cat log Index: sandbox/jardonnet/registration/quat7.hh --- sandbox/jardonnet/registration/quat7.hh (revision 1818) +++ sandbox/jardonnet/registration/quat7.hh (working copy) @@ -99,7 +99,7 @@ // qR algebra::mat<P::dim,P::dim,float> Mk; - for (unsigned i = 0; i < C.npoints(); ++i) + for (size_t i = 0; i < C.npoints(); ++i) { algebra::vec<P::dim,float> Ci = C[i]; algebra::vec<P::dim,float> Xki = Xk[i]; Index: sandbox/jardonnet/registration/icp.hh --- sandbox/jardonnet/registration/icp.hh (revision 1818) +++ sandbox/jardonnet/registration/icp.hh (working copy) @@ -36,7 +36,7 @@ # include <mln/algebra/quat.hh> # include <mln/algebra/vec.hh> # include <mln/make/w_window.hh> -# include <mln/make/window3d.hh> +# include <mln/make/w_window3d.hh> # include "tools.hh" @@ -66,12 +66,12 @@ namespace impl { - template <typename P, typename T> + template <typename P, typename M> inline p_array icp_(p_array& C, - const p_array& X, - lazy_map<T>& map) + const p_array&, + M& map) { trace::entering("registration::impl::icp_"); @@ -88,23 +88,27 @@ //// step 1 k = 0; do { + std::cout << "step 2" << std::endl; //// step 2 - //err_bis = projection::fill_Xk(Ck, map, Xk); + projection::fill_Xk(Ck, map, Xk); //projection::de_base(Ck, X, Xk, err_bis); - projection::memo(Ck, X, Xk, map); + //projection::memo(Ck, X, Xk, map); mu_Xk = center(Xk); + //std::cout << "step 3" << std::endl; //// step 3 old_qk = qk; qk = match(C, mu_C, Xk, mu_Xk); + //std::cout << "step 4" << std::endl; //// step 4 qk.apply_on(C, Ck); // Ck+1 = qk(C) + //std::cout << "step err" << std::endl; //// err = d(Ck+1,Xk) err = rms(Ck, Xk); - std::cout << k << ' ' << err << std::endl; //plot file + std::cout << k << ' ' << err << ' ' << (qk - old_qk).sqr_norm() << std::endl; //plot file ++k; } while (k < 3 || (qk - old_qk).sqr_norm() > epsilon); @@ -132,17 +136,14 @@ I3d cloud = convert::to_image_3d(exact(cloud_)); const I3d surface = convert::to_image_3d(exact(surface_)); - /* + //create a pair (distance map, closest point) - bool w[27] = {true, true, true, true, true, true, true, true, true, - true, true, true, true, true, true, true, true, true, - true, true, true, true, true, true, true, true, true}; - window<mln_dpoint(I3d)> win3d = make::window3d(w); - fun::cham<point3d> fun; - w_window<mln_dpoint(I3d), float> chamfer = make::w_window(win3d, fun); - */ - //std::pair<mln_ch_value(I3d,float), mln_ch_value(I3d,mln_point(I3d)) > maps;// = - //dt::chamfer(surface, chamfer); + float w[27] = {1.4142, 1, 1.4142, 1.4142, 1, 1.4142, 0, 0, 0, + 1, 1, 1, 1, 1, 0, 0, 0, 0, + 1.4142, 1, 1.4142, 0, 0, 0, 0, 0, 0}; + w_window<mln_dpoint(I3d), float> chamfer = make::w_window3d(w); + std::pair<mln_ch_value(I3d,float), mln_ch_value(I3d,mln_point(I3d)) > map = + dt::chamfer(surface, chamfer); //build p_arrays. @@ -151,7 +152,7 @@ //build closest point map //lazy_map<I3d> map(enlarge(bigger(c.bbox(),x.bbox()),50)); - lazy_map<I3d> map(1000,1000,50); + //lazy_map<I3d> map(1000,1000,50); p_array<mln_point(I3d)> res = impl::icp_(c, x, map); @@ -162,7 +163,7 @@ { point2d p(res[i][0], res[i][1]); //FIXME: not necessary if output(res.bbox()) - //if (output.has(p)) + if (output.has(p)) output(p) = true; } Index: sandbox/jardonnet/registration/projection.hh --- sandbox/jardonnet/registration/projection.hh (revision 1818) +++ sandbox/jardonnet/registration/projection.hh (working copy) @@ -22,13 +22,13 @@ for (size_t i = 0; i < Ck.npoints(); ++i) { //FIXME: bof - //if (map.second.has(Ck[i])) - //{ + if (map.second.has(Ck[i])) + { //x[i] := Ck[i] closest point in X Xk.hook_()[i] = map.second(Ck[i]); //err := Distance between Ck[i] and its closest point err += map.first(Ck[i]); - //} + } } return err /= Ck.npoints(); } Index: sandbox/jardonnet/registration/tools.hh --- sandbox/jardonnet/registration/tools.hh (revision 1818) +++ sandbox/jardonnet/registration/tools.hh (working copy) @@ -133,8 +133,8 @@ image3d<T> to_image_3d(const image2d<T>& img) { - point3d pmin(img.domain().pmin()[0], img.domain().pmin()[1], -1); - point3d pmax(img.domain().pmax()[0], img.domain().pmax()[1], 1); + point3d pmin(img.domain().pmin()[0], img.domain().pmin()[1], 0); + point3d pmax(img.domain().pmax()[0], img.domain().pmax()[1], 0); image3d<T> img3d(box3d(pmin,pmax)); mln_piter(image3d<T>) p(img3d.domain());

16 years, 11 months

1818: Add personal folder in sandbox with prototype of najman component tree.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Add personal folder in sandbox with prototype of najman component tree. * sandbox/abraham: New. * sandbox/abraham/morpho: New. * sandbox/abraham/morpho/basic_najman.hh: New, contains Najman component tree. * sandbox/abraham/morpho/test.cc: New. * sandbox/abraham/morpho/images: New. * sandbox/abraham/morpho/images/test_component_tree.pgm: New. * sandbox/abraham/morpho/topo_wst.hh: New, draft of topological watershed. * sandbox/abraham/morpho/Makefile: New. Makefile | 8 + basic_najman.hh | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ test.cc | 43 ++++++++ topo_wst.hh | 130 +++++++++++++++++++++++++ 4 files changed, 468 insertions(+) Index: sandbox/abraham/morpho/basic_najman.hh --- sandbox/abraham/morpho/basic_najman.hh (revision 0) +++ sandbox/abraham/morpho/basic_najman.hh (revision 0) @@ -0,0 +1,287 @@ +#include <mln/level/sort_psites.hh> +#include <mln/level/fill.hh> +#include <mln/core/image2d.hh> + +namespace mln +{ + + namespace morpho + { + + template <class I, class N> + struct basic_najman + { + + typedef mln_psite(I) psite; + + struct node { + int level; + int area; + int highest; + p_array<mln_psite(I)> children; + + void addChildren(const node& n) + { + typename p_array<mln_psite(I)>::fwd_piter it(n.children); + for (it.start(); + it.is_valid(); + it.next()) + children.append(it.to_psite()); + } + void addChild(const psite n) + { + children.append(n); + } + }; // struct node + + + const Image& ima; + const Neighborhood<N>& nbh; + mln_ch_value(I, psite) par; + + mln_ch_value(I, psite) Par_tree; + // Par_node is handled by par (from ap_maxtree) + mln_ch_value(I, int) Rnk_tree; + mln_ch_value(I, int) Rnk_node; + mln_ch_value(I, psite) lowestNode; + mln_ch_value(I, node) nodes; + mln_ch_value(I, bool) isproc; + psite Root; + p_array<mln_psite(I)> S; + // std::map<psite,psite> M; // to keep the root of any point. + + basic_najman(const Image& i, + const Neighborhood<N>& n) + : ima(i), + nbh(n), + par(exact(i).domain(), exact(i).border()), + Par_tree(exact(i).domain(), exact(i).border()), + Rnk_tree(exact(i).domain(), exact(i).border()), + Rnk_node(exact(i).domain(), exact(i).border()), + lowestNode(exact(i).domain(), exact(i).border()), + nodes(exact(i).domain(), exact(i).border()), + isproc(exact(i).domain(), exact(i).border()) + { + } + + + void MakeSet_tree(psite x) + { + Par_tree(x) = x; + Rnk_tree(x) = 0; + } + + void MakeSet_node(psite x) + { + par(x) = x; // was Par_node(x) = x; + Rnk_node(x) = 0; + } + + psite Find_tree(psite x) + { + if (Par_tree(x) != x) + Par_tree(x) = Find_tree(Par_tree(x)); + return Par_tree(x); + } + + void swap(psite& x, psite& y) + { + psite memo = x; + x = y; + y = memo; + } + + bool is_root(const psite& x) const + { + return par(x) == x; + } + + bool is_level_root(const psite& x) const + { + return is_root(x) || exact(ima)(par(x)) < exact(ima)(x); + } + + psite find_level_root(const psite& x) + { + if (is_level_root(x)) + return x; + else + return par(x) = find_level_root(par(x)); + } + + psite Find_node(psite x) + { + if (par(x) != x) + par(x) = Find_node(par(x)); + return par(x); + } + + void go() + { + init(); + BuildComponentTree(); + } + + + void init() + { + // Sort the points in increasing order + S = level::sort_psites_increasing(ima); + + // Clear the marker map + level::fill(isproc, false); + for (int ip = 0; ip < int(S.npoints()); ++ip) + { + psite p = S[ip]; + MakeSet_node(p); + MakeSet_tree(p); + // if (lowestNode.hold(p)) + lowestNode(p) = p; + // if (nodes.hold(p)) + nodes(p) = MakeNode(exact(ima)(p)); + } + } + + + void BuildComponentTree() + { + for (int ip = 0; ip < int(S.npoints()); ++ip) + { + psite p = S[ip]; + isproc(p) = true; + + psite curTree = Find_tree(p); + psite curNode = Find_node(lowestNode(curTree)); + + mln_niter(N) q(nbh, p); + + for_all(q) + if (exact(ima).has(q) and isproc(q) and exact(ima)(q) >= exact(ima)(p)) // f[q] >= f[p] parce qu'on prend l'ordre de l'histogramme + { + psite adjTree = Find_tree(q); + psite adjNode = Find_node(lowestNode(adjTree)); + if (curNode != adjNode) + { + if (nodes(curNode).level == nodes(adjNode).level) + curNode = MergeNode(adjNode, curNode); + else + { + // we have nodes[curNode].level < nodes[adjNode].level + nodes(curNode).addChild(adjNode); + //apparemment NON :Par_node[adjNode] = curNode; // car adjNode devient fils de curNode + nodes(curNode).area += nodes(adjNode).area; + nodes(curNode).highest += nodes(adjNode).highest; + } + } + curTree = Link_tree(adjTree, curTree); + lowestNode(curTree) = curNode; + } + } + Root = lowestNode(Find_tree(Find_node(psite(0, 0)))); + // Pour garder une map de correspondance point <-> local_root + // for (int ip = 0; ip < int(S.size()); ++ip) + // { + // psite p = S[ip]; + // M(p) = Find_node(p); + // } + + mln_piter(I) r(par.domain()); + for_all(r) + par(r) = Find_node(r); + } + + + psite MergeNode(psite& node1, psite& node2) + { + psite tmpNode = Link_node(node1, node2); + psite tmpNode2; + if (tmpNode == node2) + { + nodes(node2).addChildren(nodes(node1)); + tmpNode2 = node1; + } + else + { + nodes(node1).addChildren(nodes(node2)); + tmpNode2 = node2; + } + nodes(tmpNode).area += nodes(tmpNode2).area; + nodes(tmpNode).highest += nodes(tmpNode2).highest; + return tmpNode; + } + + psite Link_tree(psite x, psite y) + { + if (Rnk_tree(x) > Rnk_tree(y)) + swap(x, y); + else + if (Rnk_tree(x) == Rnk_tree(y)) + Rnk_tree(y) += 1; + Par_tree(x) = y; + return y; + } + + psite Link_node(psite x, psite y) + { + if (Rnk_node(x) > Rnk_node(y)) + swap(x, y); + else + if (Rnk_node(x) == Rnk_node(y)) + Rnk_node(y) += 1; + par(x) = y; // was Par_node(x) = y; + return y; + } + + node MakeNode(int level) + { + node n; + n.level = level; + n.area = 1; + n.highest = level; + return n; + } + + template <typename C> + void image_output(image2d<C>& img) + { + for(unsigned int i = 0; i < img.domain().len(0); ++i) + { + for(unsigned int j = 0; j < img.domain().len(1); ++j) + { + C l = (img(psite(i, j)));//.row() * img.domain().len(1) + (img(psite(i, j))).col(); + std::cout << " " << l << " "; + } + std::cout << std::endl; + } + } + + + + void print_tree(psite p) + { + node& n = nodes(p); + std::cout << "psite " <::fwd_piter it(n.children); + for (it.start(); + it.is_valid(); + it.next()) + { + psite q = it.to_psite(); + std::cout << q << "=" << (q.row() * lowestNode.domain().len(2) + q.col()) << " "; + } + std::cout << std::endl; + + for (it.start(); + it.is_valid(); + it.next()) + { + print_tree(it.to_psite()); + } + } + + }; // struct basic_najman + + }; // namespace morpho + +}; // namespace mln Index: sandbox/abraham/morpho/test.cc --- sandbox/abraham/morpho/test.cc (revision 0) +++ sandbox/abraham/morpho/test.cc (revision 0) @@ -0,0 +1,43 @@ +#include <mln/core/image2d.hh> +#include <mln/core/window2d.hh> +#include <mln/core/neighb2d.hh> + +#include <mln/value/int_u8.hh> + +//#include <mln/morpho/meyer_wst.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +# include "basic_najman.hh" +// # include "topo_wst.hh" + +int main () +{ + using namespace mln; + using value::int_u8; + + // component_tree< image2d<int_u8> > c; + + using namespace mln; + using value::int_u8; + + image2d<int_u8> input; + io::pgm::load(input, "./images/test_component_tree.pgm"); + + morpho::basic_najman< image2d<int_u8>, neighb2d> n(input, c8()); + n.image_output(input); + n.go(); + n.image_output(n.Par_tree); + n.print_tree(n.Root); + n.image_output(n.par); + std::cout << " --------------------------- " << std::endl; + n.image_output(n.Rnk_tree); + std::cout << " --------------------------- " << std::endl; + n.image_output(n.Rnk_node); + + // image2d<int_u8> output = morpho::topo_wst(input, c4()); + // io::pgm::save(output, "out.pgm"); + + return 0; +} Index: sandbox/abraham/morpho/images/test_component_tree.pgm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: sandbox/abraham/morpho/images/test_component_tree.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: sandbox/abraham/morpho/topo_wst.hh --- sandbox/abraham/morpho/topo_wst.hh (revision 0) +++ sandbox/abraham/morpho/topo_wst.hh (revision 0) @@ -0,0 +1,130 @@ +// 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_MORPHO_TOPO_WST_HH +# define MLN_MORPHO_TOPO_WST_HH + +/** \file mln/morpho/topo_wst.hh + \brief Topological Watershed Transform (WST) algorithm. + + Reference: + Quasi-linear algorithms for the topological watershed. Michel + Courie and Laurent Najman and Gilles Bertrand. +*/ + +# include <mln/trait/ch_value.hh> + +//# include <mln/util/greater_psite.hh> +# include <mln/morpho/includes.hh> +//# include <mln/morpho/extrema_components.hh> + +# include "component_tree.hh" + +namespace mln +{ + + namespace morpho + { + + /** \brief Topological Watershed Transform (WST) algorithm. + + \param[in] input The input image. + \param[in] nbh The connexity of markers. + \param[out] nbasins The number of basins. + + \li \p L is the type of labels, used to number the watershed + itself (with the minimal value), and the basins. + \li \p I is the exact type of the input image. + \li \p N is the exact type of the neighborhood used to express + \a input's connexity. */ + template <typename L, typename I, typename N> + mln_ch_value(I, L) + topo_wst(const Image& input, const Neighborhood<N>& nbh); + + template <typename I, typename P> + bool is_m_destructible(const Image& ima, const Point& point, component_tree c); + + template <typename L, typename I, typename N> + mln_ch_value(I, L) + m_wst(const Image& input, const Neighborhood<N>& nbh); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename P> + int is_m_destructible(const Image& ima, const mln_psite(I) p, const Neighborhood<N>& nbh, component_tree c) + { + p_set v; + + mln_niter(N) n(nbh, p); + for_all(n) + if (n < p) + v = uni(V, c(n)); + if (v.is_empty()) + return -1; + + p_set::fwd_piter p = v.begin(); + if (c(*p).children.size() != 0) + return -1; + + component_tree highest_fork = c.highest_fork(v); + if (highest_fork.level == -1) + return -1; + + return highest_fork.level; + } + + template <typename L, typename I, typename N> + mln_ch_value(I, L) + m_wst(const Image& input, const Neighborhood<N>& nbh); + { + typedef + std::priority_queue< psite, std::vector<psite>, util::greater_psite > + ordered_queue_type; + + ordered_queue_type queue(); + component_tree c(input); + + mln_piter(I) p(input.domain()); + + for_all(p) + { + if (is_m_destructible(input, p, c4(), c + } + + } + + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho + +} // end of namespace mln + + +#endif // ! MLN_MORPHO_TOPOLOGICAL_WST_HH Index: sandbox/abraham/morpho/Makefile --- sandbox/abraham/morpho/Makefile (revision 0) +++ sandbox/abraham/morpho/Makefile (revision 0) @@ -0,0 +1,8 @@ +SOURCE=test.cc +OBJECTS=test.o +CXXFLAGS=-Wall -W -I ../../.. -g + +all:${OBJECTS} + g++ ${FLAGS} ${OBJECTS} -o test + +test.o: basic_najman.hh \ No newline at end of file

16 years, 11 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2008