Olena-patches February 2009

olena-patches@lrde.epita.fr

12 participants
266 discussions

3247: configure.ac: Configure milena/tests/convert/impl.

by Guillaume Lazzara

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d193d2..3b3abe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure milena/tests/convert/impl. + 2009-01-26 Guillaume Lazzara <z(a)lrde.epita.fr> * boostrap: call milena/doc/tutorial/gen_distributed_files.sh. diff --git a/configure.ac b/configure.ac index 72e099b..d54fb41 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,7 @@ AC_CONFIG_FILES([ milena/tests/canvas/browsing/Makefile milena/tests/canvas/morpho/Makefile milena/tests/convert/Makefile + milena/tests/convert/impl/Makefile milena/tests/core/Makefile milena/tests/core/alias/Makefile milena/tests/core/image/Makefile -- 1.5.6.5

15 years, 10 months

3246: Fix step2 in tutorial.

by Guillaume Lazzara

* doc/tutorial/figures/tuto1_first_image-1.pbm, * doc/tutorial/outputs/tuto1_first_image.txt: remove. Not needed anymore. * doc/tutorial/samples/tuto2_first_image.cc: update image saving. * doc/tutorial/tutorial.tex: include the right files. --- milena/ChangeLog | 12 ++++++++++++ .../doc/tutorial/figures/tuto1_first_image-1.pbm | 5 ----- milena/doc/tutorial/outputs/tuto1_first_image.txt | 14 -------------- milena/doc/tutorial/samples/tuto2_first_image.cc | 3 ++- milena/doc/tutorial/tutorial.tex | 12 ++++++------ 5 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 milena/doc/tutorial/figures/tuto1_first_image-1.pbm delete mode 100644 milena/doc/tutorial/outputs/tuto1_first_image.txt diff --git a/milena/ChangeLog b/milena/ChangeLog index 39ac7d6..f846446 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2009-02-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix step2 in tutorial. + + * doc/tutorial/figures/tuto1_first_image-1.pbm, + * doc/tutorial/outputs/tuto1_first_image.txt: remove. Not needed + anymore. + + * doc/tutorial/samples/tuto2_first_image.cc: update image saving. + + * doc/tutorial/tutorial.tex: include the right files. + 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> Introduce subject_point_impl. diff --git a/milena/doc/tutorial/figures/tuto1_first_image-1.pbm b/milena/doc/tutorial/figures/tuto1_first_image-1.pbm deleted file mode 100644 index 03baef0..0000000 --- a/milena/doc/tutorial/figures/tuto1_first_image-1.pbm +++ /dev/null @@ -1,5 +0,0 @@ -P4 -# Generated by Milena 1.0 http://olena.lrde.epita.fr -# EPITA Research and Development Laboratory (LRDE) -21 13 -ÿÿøš»Ø«»š»š«»ššØÿÿøª«šªš«ššÿÿø \ No newline at end of file diff --git a/milena/doc/tutorial/outputs/tuto1_first_image.txt b/milena/doc/tutorial/outputs/tuto1_first_image.txt deleted file mode 100644 index 42a59f9..0000000 --- a/milena/doc/tutorial/outputs/tuto1_first_image.txt +++ /dev/null @@ -1,14 +0,0 @@ -- - - - - - - - - - - - - - - - - - - - - -- | - | - | | | - | - - - | - - - - | - - -- | - | - | - - - | - - - | - - - | - | - -- | | | - | | | - | - - - | - - - | - | - -- | - | - | - - - | - - - | - - - | - | - -- | - | - | | | - | | | - | | | - - | - - -- - - - - - - - - - - - - - - - - - - - - -- | - | - - | - - | | - - | - - - | | - - -- | - | - | - | - | - | - | - - - | - | - -- | - | - | - | - | | - - | - - - | - | - -- | | | - | - | - | - | - | - - - | - | - -- | - | - - | - - | - | - | | | - | | - - -- - - - - - - - - - - - - - - - - - - - - - diff --git a/milena/doc/tutorial/samples/tuto2_first_image.cc b/milena/doc/tutorial/samples/tuto2_first_image.cc index ecc995f..c9ef0fd 100644 --- a/milena/doc/tutorial/samples/tuto2_first_image.cc +++ b/milena/doc/tutorial/samples/tuto2_first_image.cc @@ -1,4 +1,5 @@ #include <mln/essential/2d.hh> +#include <doc/tutorial/tools/sample_utils.hh> int main() { using namespace mln; @@ -30,6 +31,6 @@ int main() // \} // \{ - io::pbm::save(ima, "../figures/tuto1_first_image-1.pbm"); + doc::pbmsave(ima, "tuto2_first_image"); // \} } diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index ffe6ca5..83219ee 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -420,27 +420,27 @@ After this step you should know how to: First, declare an array of bool which will represent the image grid. Each each cell in this grid is a site and each cell contains a value, \val{true} or \val{false}. -\doxycode[1]{tuto1_first_image} +\doxycode[1]{tuto2_first_image} From that grid, simply call make::image to get an image initialized with that data. -\doxycode[2]{tuto1_first_image} +\doxycode[2]{tuto2_first_image} This way of initializing an image is the most common one. However, there are several other ways described in section \doxyref{imacreate}. To be sure that the data is correctly initialized, it is possible to display the image in the standard output using debug::println. -\doxycode[3]{tuto1_first_image} +\doxycode[3]{tuto2_first_image} Output: -\doxyoutput{tuto1_first_image} +\doxyoutput{tuto2_first_image} Finally, you may want to save the image. Since we use bool as image value, the PBM format is the best choice. Therefore, we use io::pbm::save. -\doxycode[4]{tuto1_first_image} +\doxycode[4]{tuto2_first_image} The output image looks like the following: -\doxyfigure{tuto1_first_image}{3cm} +\doxyfigure{tuto2_first_image}{3cm} In this first step we used a boolean image. Many other value types are available though. A more detailed description can be found in section -- 1.5.6.5

15 years, 10 months

3245: Introduce subject_point_impl.

by Guillaume Lazzara

* mln/core/point.hh: All Point proxies will inherit from that class whatever the point type is. Subject_impl<point*> inherits from that class too. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/point.hh | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cdee4a7..39ac7d6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,12 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce subject_point_impl. + + * mln/core/point.hh: All Point proxies will inherit from that class + whatever the point type is. Subject_impl<point*> inherits from that + class too. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> Various small fixes. diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index 2d7deee..a661fe5 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -33,8 +33,8 @@ /// /// Definition of the generic point class mln::point. - # include <mln/core/def/coord.hh> +# include <mln/core/concept/proxy.hh> # include <mln/core/concept/gpoint.hh> # include <mln/core/internal/coord_impl.hh> # include <mln/fun/i2v/all_to.hh> @@ -202,6 +202,27 @@ namespace mln algebra::vec<G::dim, C> coord_; }; + namespace internal + { + + /// subject_impl specialization (Proxy) + /// \{ + + template <typename P, typename E> + struct subject_point_impl; + + template <typename G, typename C, typename E> + struct subject_point_impl< point<G,C>, E > + { + const typename point<G,C>::vec& to_vec() const; + + private: + const E& exact_() const; + }; + + /// \} + + } // end of namespace mln::internal /// FIXME... @@ -442,6 +463,26 @@ namespace mln return the_; } + namespace internal + { + + template <typename G, typename C, typename E> + inline + const E& + subject_point_impl< point<G,C>, E >::exact_() const + { + return internal::force_exact<const E>(*this); + } + + template <typename G, typename C, typename E> + inline + const typename point<G,C>::vec& + subject_point_impl< point<G,C>, E >::to_vec() const + { + return exact_().get_subject().to_vec(); + } + + } // end of namespace mln::internal template <typename G, typename C> inline -- 1.5.6.5

15 years, 10 months

3244: Various small fixes.

by Guillaume Lazzara

* headers.mk: add new headers to distribution. * mln/algebra/quat.hh: add a new overload of rotate(). * mln/canvas/labeling/level.hh, * mln/canvas/labeling.hh: handle labeling abortion with trace::warning. * mln/core/internal/graph_psite_base.hh: remove a useless forward declaration. * mln/io/raw/all.hh: Rewrite, completely wrong... * mln/accu/compute.hh, * mln/core/image/tr_image.hh, * mln/core/site_set/p_queue.hh, * mln/io/raw/load.hh, * mln/io/raw/save.hh, * mln/value/shell.hh: update doc. * mln/math/jacobi.hh: add missing casts and fix a bug with macros and missing semicolons in for loops. * tests/unit_test/Makefile.am, * tests/unit_test/mln_convert_impl_from_site_set_to_image.cc, * tests/unit_test/mln_core_image_p2p_image.cc, * tests/unit_test/mln_core_image_slice_image.cc, * tests/unit_test/mln_debug_slices_2d.cc, * tests/unit_test/mln_fun_p2p_all.cc, * tests/unit_test/mln_fun_p2p_translation.cc, * tests/unit_test/mln_level_sort_offsets.cc: add new unit tests. --- milena/ChangeLog | 36 ++++++++++++++++++++ milena/headers.mk | 7 ++++ milena/mln/accu/compute.hh | 4 +- milena/mln/algebra/quat.hh | 24 ++++++++++--- milena/mln/canvas/labeling.hh | 4 +-- milena/mln/core/alias/point3d.hh | 1 + milena/mln/core/image/tr_image.hh | 22 +++++------- milena/mln/core/internal/graph_psite_base.hh | 4 -- milena/mln/core/site_set/p_queue.hh | 2 +- milena/mln/io/raw/all.hh | 23 ++++++------ milena/mln/io/raw/load.hh | 1 + milena/mln/io/raw/save.hh | 2 + milena/mln/labeling/level.hh | 2 - milena/mln/math/jacobi.hh | 25 ++++++++++--- milena/mln/value/shell.hh | 2 +- milena/tests/unit_test/Makefile.am | 14 ++++++++ .../mln_convert_impl_from_site_set_to_image.cc | 11 ++++++ milena/tests/unit_test/mln_core_image_p2p_image.cc | 11 ++++++ .../tests/unit_test/mln_core_image_slice_image.cc | 11 ++++++ milena/tests/unit_test/mln_debug_slices_2d.cc | 11 ++++++ milena/tests/unit_test/mln_fun_p2p_all.cc | 11 ++++++ milena/tests/unit_test/mln_fun_p2p_translation.cc | 11 ++++++ milena/tests/unit_test/mln_level_sort_offsets.cc | 11 ++++++ 23 files changed, 200 insertions(+), 50 deletions(-) create mode 100644 milena/tests/unit_test/mln_convert_impl_from_site_set_to_image.cc create mode 100644 milena/tests/unit_test/mln_core_image_p2p_image.cc create mode 100644 milena/tests/unit_test/mln_core_image_slice_image.cc create mode 100644 milena/tests/unit_test/mln_debug_slices_2d.cc create mode 100644 milena/tests/unit_test/mln_fun_p2p_all.cc create mode 100644 milena/tests/unit_test/mln_fun_p2p_translation.cc create mode 100644 milena/tests/unit_test/mln_level_sort_offsets.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index d4ee97a..cdee4a7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,41 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small fixes. + + * headers.mk: add new headers to distribution. + + * mln/algebra/quat.hh: add a new overload of rotate(). + + * mln/canvas/labeling/level.hh, + * mln/canvas/labeling.hh: handle labeling abortion with + trace::warning. + + * mln/core/internal/graph_psite_base.hh: remove a useless forward + declaration. + + * mln/io/raw/all.hh: Rewrite, completely wrong... + + * mln/accu/compute.hh, + * mln/core/image/tr_image.hh, + * mln/core/site_set/p_queue.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh, + * mln/value/shell.hh: update doc. + + * mln/math/jacobi.hh: add missing casts and fix a bug with macros and + missing semicolons in for loops. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_convert_impl_from_site_set_to_image.cc, + * tests/unit_test/mln_core_image_p2p_image.cc, + * tests/unit_test/mln_core_image_slice_image.cc, + * tests/unit_test/mln_debug_slices_2d.cc, + * tests/unit_test/mln_fun_p2p_all.cc, + * tests/unit_test/mln_fun_p2p_translation.cc, + * tests/unit_test/mln_level_sort_offsets.cc: add new unit tests. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new overload of make::image3d. * mln/make/image3d.hh: create an image3d from a single image. diff --git a/milena/headers.mk b/milena/headers.mk index bb97122..d109eb7 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -181,6 +181,8 @@ mln/fun/p2b/all.hh \ mln/fun/p2b/has.hh \ mln/fun/p2b/big_chess.hh \ mln/fun/p2b/essential.hh \ +mln/fun/p2p/all.hh \ +mln/fun/p2p/translation.hh \ mln/fun/p2p/mirror.hh \ mln/fun/x2p/closest_point.hh \ mln/fun/x2p/all.hh \ @@ -274,6 +276,7 @@ mln/convert/from_to.hh \ mln/convert/impl/from_value_to_value.hh \ mln/convert/impl/all.hh \ mln/convert/impl/from_double_to_value.hh \ +mln/convert/impl/from_site_set_to_image.hh \ mln/convert/impl/from_image_to_site_set.hh \ mln/convert/impl/from_float_to_value.hh \ mln/convert/impl/from_int_to_value.hh \ @@ -397,6 +400,7 @@ mln/accu/line.hh \ mln/accu/essential.hh \ mln/accu/max_h.hh \ mln/level/compare.hh \ +mln/level/sort_offsets.hh \ mln/level/transform_inplace.hh \ mln/level/replace.hh \ mln/level/apply.hh \ @@ -931,6 +935,8 @@ mln/core/image/image_if.hh \ mln/core/image/hexa.hh \ mln/core/image/line_graph_elt_neighborhood.hh \ mln/core/image/extended.hh \ +mln/core/image/p2p_image.hh \ +mln/core/image/slice_image.hh \ mln/core/image/image2d_h.hh \ mln/core/image/image2d.hh \ mln/core/image/ch_piter.hh \ @@ -1035,6 +1041,7 @@ mln/debug/all.hh \ mln/debug/println_with_border.hh \ mln/debug/println.spe.hh \ mln/debug/colorize.hh \ +mln/debug/slices_2d.hh \ mln/debug/draw_graph.hh \ mln/debug/put_word.hh \ mln/debug/quiet.hh \ diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index 69af068..a632fa8 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -86,7 +86,7 @@ namespace mln namespace generic { - + template <typename A, typename I> mln_result(A) compute(const Accumulator<A>&, const Image& input_) @@ -106,7 +106,7 @@ namespace mln } } // end of namespace mln::accu::impl::generic - + } // end of namespace mln::accu::impl diff --git a/milena/mln/algebra/quat.hh b/milena/mln/algebra/quat.hh index 13590d0..9dee769 100644 --- a/milena/mln/algebra/quat.hh +++ b/milena/mln/algebra/quat.hh @@ -32,6 +32,8 @@ /// \file mln/algebra/quat.hh /// /// Define a class for quaternion algebra values. +/// +/// \todo Inline computations in rotate routine. # include <cmath> @@ -194,8 +196,10 @@ namespace mln quat& set_unit(); /// Rotate using quaternion definition of a rotation - template <unsigned n> - algebra::vec<n,float> rotate(const algebra::vec<n,float>& v); + template <unsigned n, typename T> + algebra::vec<n,float> rotate(const algebra::vec<n,T>& v) const; + + quat rotate(const quat& q) const; /// Transform into unit quaternion. template <typename T> @@ -257,7 +261,6 @@ namespace mln quat slerp_5(const quat& p, const quat& q, float h); - # ifndef MLN_INCLUDE_ONLY // Constructors. @@ -482,14 +485,24 @@ namespace mln set_unit(theta(), uv); } - template <unsigned n> + template <unsigned n, typename T> inline algebra::vec<n,float> - quat::rotate(const algebra::vec<n,float>& v) + quat::rotate(const algebra::vec<n,T>& v) const { + mln_precondition(is_unit()); return ((*this) * quat(0. ,v) * (*this).inv()).v(); } + inline + quat quat::rotate(const quat& q) const + { + mln_precondition(this->is_unit()); + mln_precondition(q.is_pure()); + return (*this) * q * this->inv(); + } + + // Operators. inline @@ -655,7 +668,6 @@ namespace mln return tmp; } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::algebra diff --git a/milena/mln/canvas/labeling.hh b/milena/mln/canvas/labeling.hh index f6a5299..c8a9e5c 100644 --- a/milena/mln/canvas/labeling.hh +++ b/milena/mln/canvas/labeling.hh @@ -124,7 +124,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // Initialization. { @@ -181,7 +180,7 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; + trace::warning("labeling aborted!"); return output; } output(p) = ++nlabels; @@ -190,7 +189,6 @@ namespace mln else output(p) = output(parent(p)); } - status = true; } trace::exiting("canvas::impl::generic::labeling"); diff --git a/milena/mln/core/alias/point3d.hh b/milena/mln/core/alias/point3d.hh index ff88b5d..7ffac8f 100644 --- a/milena/mln/core/alias/point3d.hh +++ b/milena/mln/core/alias/point3d.hh @@ -55,6 +55,7 @@ namespace mln template <typename C, typename E> struct subject_impl< const point<grid::cube, C>, E > + : subject_point_impl< point<grid::cube, C>, E > { typedef C coord; enum { dim = 3 }; diff --git a/milena/mln/core/image/tr_image.hh b/milena/mln/core/image/tr_image.hh index 2ace346..a0fb983 100644 --- a/milena/mln/core/image/tr_image.hh +++ b/milena/mln/core/image/tr_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,12 +29,10 @@ #ifndef MLN_CORE_IMAGE_TR_IMAGE_HH # define MLN_CORE_IMAGE_TR_IMAGE_HH -/*! \file mln/core/image/tr_image.hh - * - * \brief Definition of the morpher mln::tr_image presenting an image - * through a (bijective) transformation. - * - */ +/// \file mln/core/image/tr_image.hh +/// +/// Definition of the morpher mln::tr_image presenting an image +/// through a (bijective) transformation. # include <cmath> @@ -41,11 +40,10 @@ # include <mln/algebra/vec.hh> # include <mln/value/set.hh> - namespace mln { - // Fwd decl. + // Forward declaration. template <typename S, typename I, typename T> struct tr_image; namespace internal @@ -78,10 +76,8 @@ namespace mln } // end of namespace mln::trait - /*! \brief Morpher that makes an image become transformed by a given - * transformation. - * - */ + /// Morpher that makes an image become transformed by a given + /// transformation. template <typename S, typename I, typename T> struct tr_image : public mln::internal::image_identity< I, mln_pset(I), tr_image<S,I,T> > diff --git a/milena/mln/core/internal/graph_psite_base.hh b/milena/mln/core/internal/graph_psite_base.hh index d0df650..3767fd2 100644 --- a/milena/mln/core/internal/graph_psite_base.hh +++ b/milena/mln/core/internal/graph_psite_base.hh @@ -39,10 +39,6 @@ namespace mln { - // Forward declaration. - template <typename G, typename F> class p_vertices; - - namespace internal { diff --git a/milena/mln/core/site_set/p_queue.hh b/milena/mln/core/site_set/p_queue.hh index babc994..d6fc400 100644 --- a/milena/mln/core/site_set/p_queue.hh +++ b/milena/mln/core/site_set/p_queue.hh @@ -114,7 +114,7 @@ namespace mln /// Push a site \p p in the queue. void push(const P& p); - /// Insertion element associated type. + /// Insertion element associated type. typedef P i_element; /// Insert a site \p p (equivalent as 'push'). diff --git a/milena/mln/io/raw/all.hh b/milena/mln/io/raw/all.hh index c10fa1a..32d34d7 100644 --- a/milena/mln/io/raw/all.hh +++ b/milena/mln/io/raw/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,13 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_PGM_ALL_HH -# define MLN_IO_PGM_ALL_HH +#ifndef MLN_IO_RAW_ALL_HH +# define MLN_IO_RAW_ALL_HH -/*! \file mln/io/pgm/all.hh - * - * \brief File that includes all pgm io materials. - */ +/// \file mln/io/raw/all.hh +/// +/// File that includes all raw io materials. namespace mln @@ -39,13 +38,13 @@ namespace mln namespace io { - /// Namespace of pgm input/output handling. - namespace pgm {} + /// Namespace of raw input/output handling. + namespace raw {} } } -# include <mln/io/pgm/load.hh> -# include <mln/io/pgm/save.hh> +# include <mln/io/raw/load.hh> +# include <mln/io/raw/save.hh> -#endif // ! MLN_IO_PGM_ALL_HH +#endif // ! MLN_IO_RAW_ALL_HH diff --git a/milena/mln/io/raw/load.hh b/milena/mln/io/raw/load.hh index d6e9077..eb1d789 100644 --- a/milena/mln/io/raw/load.hh +++ b/milena/mln/io/raw/load.hh @@ -98,6 +98,7 @@ namespace mln { I& ima = exact(ima_); + // Handle padding. unsigned data_size = sizeof (mln_value(I)) + sizeof (mln_value(I)) % 2; mln_box_runstart_piter(I) p(ima.domain()); diff --git a/milena/mln/io/raw/save.hh b/milena/mln/io/raw/save.hh index 83b8fab..06c1f7d 100644 --- a/milena/mln/io/raw/save.hh +++ b/milena/mln/io/raw/save.hh @@ -31,6 +31,7 @@ /// \file mln/io/raw/save.hh /// /// Save a Milena image by dumping its data to a file. +/// \todo handle endianness. # include <iostream> # include <fstream> @@ -82,6 +83,7 @@ namespace mln inline void save_data(I& ima, std::ofstream& file) { + // Handle padding. unsigned data_size = sizeof (mln_value(I)) + sizeof (mln_value(I)) % 2; mln_box_runstart_piter(I) p(ima.domain()); diff --git a/milena/mln/labeling/level.hh b/milena/mln/labeling/level.hh index 8e373ea..17850bc 100644 --- a/milena/mln/labeling/level.hh +++ b/milena/mln/labeling/level.hh @@ -171,8 +171,6 @@ namespace mln level_functor f(input, val); mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); - // FIXME: Handle canvas status. - trace::exiting("labeling::impl::generic::level"); return output; } diff --git a/milena/mln/math/jacobi.hh b/milena/mln/math/jacobi.hh index 0992098..a09e07b 100644 --- a/milena/mln/math/jacobi.hh +++ b/milena/mln/math/jacobi.hh @@ -45,17 +45,19 @@ namespace mln namespace math { - algebra::quat jacobi(algebra::mat < 4, 4, float >a); + algebra::quat + jacobi(algebra::mat<4u,4u,float> a); # ifndef MLN_INCLUDE_ONLY // FIXME: nD ? #define rotateJacobi(a,i,j,k,l) g=a(i,j);h=a(k,l);a(i,j)=g-s*(h+g*tau); \ - a(k,l)=h+s*(g-h*tau) + a(k,l)=h+s*(g-h*tau); - algebra::quat jacobi(algebra::mat < 4, 4, float >a) + algebra::quat + jacobi(algebra::mat<4u,4u,float> a) { float dd, d[4]; algebra::mat < 4, 4, float >v(literal::zero); @@ -106,13 +108,13 @@ namespace mln for (iq = ip + 1; iq < 4; iq++) { g = 100.0f * std::fabs(a(ip, iq)); - if (i > 4 && std::fabs(d[ip]) + g == std::fabs(d[ip]) - && std::fabs(d[iq]) + g == std::fabs(d[iq])) + if (i > 4 && (float)(std::fabs(d[ip]) + g) == (float)std::fabs(d[ip]) + && (float)(std::fabs(d[iq]) + g) == (float)std::fabs(d[iq])) a(ip, iq) = 0.0f; else if (std::fabs(a(ip, iq)) > tresh) { h = d[iq] - d[ip]; - if (std::fabs(h) + g == std::fabs(h)) // unsafe? + if ((float)(std::fabs(h) + g) == (float)std::fabs(h)) // unsafe? t = (a(ip, iq)) / h; else { @@ -131,14 +133,25 @@ namespace mln d[ip] -= h; d[iq] += h; a(ip, iq) = 0.0; + + // DO *NOT* remove these semicolons!! + // rotateJacobi is a macro with 4 function calls. for (j = 0; j <= ip - 1; j++) + { rotateJacobi(a, j, ip, j, iq); + } for (j = ip + 1; j <= iq - 1; j++) + { rotateJacobi(a, ip, j, j, iq); + } for (j = iq + 1; j < 4; j++) + { rotateJacobi(a, ip, j, iq, j); + } for (j = 0; j < 4; j++) + { rotateJacobi(v, j, ip, j, iq); + } } } } diff --git a/milena/mln/value/shell.hh b/milena/mln/value/shell.hh index 31799f4..e55b210 100644 --- a/milena/mln/value/shell.hh +++ b/milena/mln/value/shell.hh @@ -115,7 +115,7 @@ namespace mln // Ctor template <typename F, typename I> - shell<F,I>::shell(Image &ima, const mln_site(I) &s) + shell<F,I>::shell(Image& ima, const mln_site(I)& s) : ima_(exact(ima)), s_(s), v_(F()(exact(ima)(s))) { } diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 09177d7..9ad9c7c 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -178,6 +178,8 @@ mln_fun_p2b_all \ mln_fun_p2b_has \ mln_fun_p2b_big_chess \ mln_fun_p2b_essential \ +mln_fun_p2p_all \ +mln_fun_p2p_translation \ mln_fun_p2p_mirror \ mln_fun_x2p_closest_point \ mln_fun_x2p_all \ @@ -271,6 +273,7 @@ mln_convert_from_to \ mln_convert_impl_from_value_to_value \ mln_convert_impl_all \ mln_convert_impl_from_double_to_value \ +mln_convert_impl_from_site_set_to_image \ mln_convert_impl_from_image_to_site_set \ mln_convert_impl_from_float_to_value \ mln_convert_impl_from_int_to_value \ @@ -393,6 +396,7 @@ mln_accu_line \ mln_accu_essential \ mln_accu_max_h \ mln_level_compare \ +mln_level_sort_offsets \ mln_level_transform_inplace \ mln_level_replace \ mln_level_apply \ @@ -902,6 +906,8 @@ mln_core_image_image_if \ mln_core_image_hexa \ mln_core_image_line_graph_elt_neighborhood \ mln_core_image_extended \ +mln_core_image_p2p_image \ +mln_core_image_slice_image \ mln_core_image_image2d_h \ mln_core_image_image2d \ mln_core_image_ch_piter \ @@ -999,6 +1005,7 @@ mln_debug_iota \ mln_debug_all \ mln_debug_println_with_border \ mln_debug_colorize \ +mln_debug_slices_2d \ mln_debug_draw_graph \ mln_debug_put_word \ mln_debug_quiet \ @@ -1212,6 +1219,8 @@ mln_fun_p2b_all_SOURCES = mln_fun_p2b_all.cc mln_fun_p2b_has_SOURCES = mln_fun_p2b_has.cc mln_fun_p2b_big_chess_SOURCES = mln_fun_p2b_big_chess.cc mln_fun_p2b_essential_SOURCES = mln_fun_p2b_essential.cc +mln_fun_p2p_all_SOURCES = mln_fun_p2p_all.cc +mln_fun_p2p_translation_SOURCES = mln_fun_p2p_translation.cc mln_fun_p2p_mirror_SOURCES = mln_fun_p2p_mirror.cc mln_fun_x2p_closest_point_SOURCES = mln_fun_x2p_closest_point.cc mln_fun_x2p_all_SOURCES = mln_fun_x2p_all.cc @@ -1305,6 +1314,7 @@ mln_convert_from_to_SOURCES = mln_convert_from_to.cc mln_convert_impl_from_value_to_value_SOURCES = mln_convert_impl_from_value_to_value.cc mln_convert_impl_all_SOURCES = mln_convert_impl_all.cc mln_convert_impl_from_double_to_value_SOURCES = mln_convert_impl_from_double_to_value.cc +mln_convert_impl_from_site_set_to_image_SOURCES = mln_convert_impl_from_site_set_to_image.cc mln_convert_impl_from_image_to_site_set_SOURCES = mln_convert_impl_from_image_to_site_set.cc mln_convert_impl_from_float_to_value_SOURCES = mln_convert_impl_from_float_to_value.cc mln_convert_impl_from_int_to_value_SOURCES = mln_convert_impl_from_int_to_value.cc @@ -1427,6 +1437,7 @@ mln_accu_line_SOURCES = mln_accu_line.cc mln_accu_essential_SOURCES = mln_accu_essential.cc mln_accu_max_h_SOURCES = mln_accu_max_h.cc mln_level_compare_SOURCES = mln_level_compare.cc +mln_level_sort_offsets_SOURCES = mln_level_sort_offsets.cc mln_level_transform_inplace_SOURCES = mln_level_transform_inplace.cc mln_level_replace_SOURCES = mln_level_replace.cc mln_level_apply_SOURCES = mln_level_apply.cc @@ -1936,6 +1947,8 @@ mln_core_image_image_if_SOURCES = mln_core_image_image_if.cc mln_core_image_hexa_SOURCES = mln_core_image_hexa.cc mln_core_image_line_graph_elt_neighborhood_SOURCES = mln_core_image_line_graph_elt_neighborhood.cc mln_core_image_extended_SOURCES = mln_core_image_extended.cc +mln_core_image_p2p_image_SOURCES = mln_core_image_p2p_image.cc +mln_core_image_slice_image_SOURCES = mln_core_image_slice_image.cc mln_core_image_image2d_h_SOURCES = mln_core_image_image2d_h.cc mln_core_image_image2d_SOURCES = mln_core_image_image2d.cc mln_core_image_ch_piter_SOURCES = mln_core_image_ch_piter.cc @@ -2033,6 +2046,7 @@ mln_debug_iota_SOURCES = mln_debug_iota.cc mln_debug_all_SOURCES = mln_debug_all.cc mln_debug_println_with_border_SOURCES = mln_debug_println_with_border.cc mln_debug_colorize_SOURCES = mln_debug_colorize.cc +mln_debug_slices_2d_SOURCES = mln_debug_slices_2d.cc mln_debug_draw_graph_SOURCES = mln_debug_draw_graph.cc mln_debug_put_word_SOURCES = mln_debug_put_word.cc mln_debug_quiet_SOURCES = mln_debug_quiet.cc diff --git a/milena/tests/unit_test/mln_convert_impl_from_site_set_to_image.cc b/milena/tests/unit_test/mln_convert_impl_from_site_set_to_image.cc new file mode 100644 index 0000000..6af7096 --- /dev/null +++ b/milena/tests/unit_test/mln_convert_impl_from_site_set_to_image.cc @@ -0,0 +1,11 @@ +// Unit test for mln/convert/impl/from_site_set_to_image.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/convert/impl/from_site_set_to_image.hh> +#include <mln/convert/impl/from_site_set_to_image.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_core_image_p2p_image.cc b/milena/tests/unit_test/mln_core_image_p2p_image.cc new file mode 100644 index 0000000..83595eb --- /dev/null +++ b/milena/tests/unit_test/mln_core_image_p2p_image.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/image/p2p_image.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/image/p2p_image.hh> +#include <mln/core/image/p2p_image.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_core_image_slice_image.cc b/milena/tests/unit_test/mln_core_image_slice_image.cc new file mode 100644 index 0000000..2f52ab1 --- /dev/null +++ b/milena/tests/unit_test/mln_core_image_slice_image.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/image/slice_image.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/image/slice_image.hh> +#include <mln/core/image/slice_image.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_debug_slices_2d.cc b/milena/tests/unit_test/mln_debug_slices_2d.cc new file mode 100644 index 0000000..d74679f --- /dev/null +++ b/milena/tests/unit_test/mln_debug_slices_2d.cc @@ -0,0 +1,11 @@ +// Unit test for mln/debug/slices_2d.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/debug/slices_2d.hh> +#include <mln/debug/slices_2d.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_fun_p2p_all.cc b/milena/tests/unit_test/mln_fun_p2p_all.cc new file mode 100644 index 0000000..f64c24e --- /dev/null +++ b/milena/tests/unit_test/mln_fun_p2p_all.cc @@ -0,0 +1,11 @@ +// Unit test for mln/fun/p2p/all.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/fun/p2p/all.hh> +#include <mln/fun/p2p/all.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_fun_p2p_translation.cc b/milena/tests/unit_test/mln_fun_p2p_translation.cc new file mode 100644 index 0000000..5a1da3a --- /dev/null +++ b/milena/tests/unit_test/mln_fun_p2p_translation.cc @@ -0,0 +1,11 @@ +// Unit test for mln/fun/p2p/translation.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/fun/p2p/translation.hh> +#include <mln/fun/p2p/translation.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_level_sort_offsets.cc b/milena/tests/unit_test/mln_level_sort_offsets.cc new file mode 100644 index 0000000..a32249e --- /dev/null +++ b/milena/tests/unit_test/mln_level_sort_offsets.cc @@ -0,0 +1,11 @@ +// Unit test for mln/level/sort_offsets.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/level/sort_offsets.hh> +#include <mln/level/sort_offsets.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

15 years, 10 months

3243: Add a new overload of make::image3d.

by Guillaume Lazzara

* mln/make/image3d.hh: create an image3d from a single image. --- milena/ChangeLog | 6 ++++++ milena/mln/make/image3d.hh | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3344c86..d4ee97a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new overload of make::image3d. + + * mln/make/image3d.hh: create an image3d from a single image. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Check if the rotation is correct. * mln/fun/x2x/rotation.hh: add a new check while creating the rotation diff --git a/milena/mln/make/image3d.hh b/milena/mln/make/image3d.hh index 67855d9..bff73ff 100644 --- a/milena/mln/make/image3d.hh +++ b/milena/mln/make/image3d.hh @@ -55,6 +55,11 @@ namespace mln mln::image3d<mln_value(I)> image3d(const util::array& ima); + /// Create an image3d from a 2D images. + /// + template <typename I> + mln::image3d<mln_value(I)> + image3d(const I& ima); # ifndef MLN_INCLUDE_ONLY @@ -80,6 +85,24 @@ namespace mln return output; } + + template <typename I> + inline + mln::image3d<mln_value(I)> + image3d(const I& ima) + { + mlc_is_a(mln_pset(I), Box)::check(); + mln_precondition(ima.is_valid()); + + mln::box2d b = ima.domain(); + mln::box3d b_ = make::box3d(0, b.pmin().row(), b.pmin().col(), + 0, b.pmax().row(), b.pmax().col()); + mln::image3d<mln_value(I)> output(b_); + data::paste(ima, slice(output, 0).rw()); + + return output; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::make -- 1.5.6.5

15 years, 10 months

3242: Check if the rotation is correct.

by Guillaume Lazzara

* mln/fun/x2x/rotation.hh: add a new check while creating the rotation matrix from a quaternion. --- milena/ChangeLog | 7 ++++++ milena/mln/fun/x2x/rotation.hh | 47 ++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b3607e..3344c86 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Check if the rotation is correct. + + * mln/fun/x2x/rotation.hh: add a new check while creating the rotation + matrix from a quaternion. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add closest_point_functor. * headers.mk: add new headers to distribution. diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index ce334a5..dce37ed 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -33,12 +33,15 @@ /// /// Define a rotation function. +# include <cmath> # include <mln/core/concept/function.hh> # include <mln/fun/internal/x2x_linear_impl.hh> # include <mln/algebra/vec.hh> # include <mln/algebra/mat.hh> # include <mln/algebra/quat.hh> -# include <cmath> +# include <mln/make/h_mat.hh> + +# include <mln/norm/l2.hh> namespace mln { @@ -140,6 +143,8 @@ namespace mln rotation(float alpha, const algebra::vec<n,float>& axis); /// Constructor with quaternion rotation(const algebra::quat& q); + /// Constructor with h_mat. + rotation(const algebra::h_mat<n,C>& m); using super_::operator(); /// Perform the rotation of the given vector. @@ -152,7 +157,10 @@ namespace mln protected: void update(); + bool check_rotation(const algebra::quat& q); + + /// FIXME: Is it useful? float alpha_; algebra::vec <n,float> axis_; }; @@ -188,13 +196,23 @@ namespace mln 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[16] = {1.f - y2 - z2, xy - zw, xz + yw, 0, - xy + zw, 1.f - x2 - z2, yz - xw, 0, - xz - yw, yz + xw, 1.f - x2 - y2, 0, - 0, 0, 0, 1}; - this->m_ = make::mat<4,4>(t); + 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}; + + this->m_ = mln::make::h_mat(t); + mln_assertion(check_rotation(q)); + } + + + template <unsigned n, typename C> + inline + rotation<n,C>::rotation(const algebra::h_mat<n,C>& m) + { + this->m_ = m; } + template <unsigned n, typename C> inline algebra::vec<n,C> @@ -203,7 +221,6 @@ namespace mln algebra::mat<n+1,1,C> hmg; algebra::mat<n+1,1,C> tmp; algebra::vec<n,C> res; - for (unsigned i = 0; i < n; ++i) hmg(i,0) = v[i]; hmg(n,0) = 1; @@ -251,6 +268,22 @@ namespace mln this->m_ = internal::get_rot_h_mat(alpha_, axis_); } + template <unsigned n, typename C> + inline + bool + rotation<n,C>::check_rotation(const algebra::quat& q) + { + srand(time(0)); + assert(q.is_unit()); + + algebra::vec<n,C> + tmp = make::vec(rand(), rand(), rand()), + p = tmp / norm::l2(tmp), + p_rot_1 = q.rotate(p), + p_rot_2 = (*this)(p); + return norm::l2(p_rot_1 - p_rot_2) < mln_epsilon(float); + } + # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

15 years, 10 months

3241: Add closest_point_functor.

by Guillaume Lazzara

* headers.mk: add new headers to distribution. * mln/canvas/distance_geodesic.hh: add a call to init_p() in the functor passed as argument. * mln/transform/internal/distance_functor.hh: add missing init_p() member. * mln/transform/internal/closest_point_functor.hh: New. Construct an image of closest point. * tests/unit_test/Makefile.am, * tests/unit_test/mln_transform_internal_closest_point_functor.cc: add new unit test. --- milena/ChangeLog | 19 ++++++++++ milena/headers.mk | 1 + milena/mln/canvas/distance_geodesic.hh | 3 ++ ...istance_functor.hh => closest_point_functor.hh} | 39 +++++++++++++------- milena/mln/transform/internal/distance_functor.hh | 10 +++++- milena/tests/unit_test/Makefile.am | 9 +++++ ...mln_transform_internal_closest_point_functor.cc | 11 ++++++ 7 files changed, 77 insertions(+), 15 deletions(-) copy milena/mln/transform/internal/{distance_functor.hh => closest_point_functor.hh} (71%) create mode 100644 milena/tests/unit_test/mln_transform_internal_closest_point_functor.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 9e9189d..5b3607e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,24 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add closest_point_functor. + + * headers.mk: add new headers to distribution. + + * mln/canvas/distance_geodesic.hh: add a call to init_p() in the + functor passed as argument. + + * mln/transform/internal/distance_functor.hh: add missing init_p() + member. + + * mln/transform/internal/closest_point_functor.hh: New. Construct an + image of closest point. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_transform_internal_closest_point_functor.cc: add + new unit test. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add io::cloud. * headers.mk: add new headers to distribution. diff --git a/milena/headers.mk b/milena/headers.mk index 28e24e7..bb97122 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -962,6 +962,7 @@ mln/test/positive.hh \ mln/test/essential.hh \ mln/transform/distance_geodesic.hh \ mln/transform/internal/all.hh \ +mln/transform/internal/closest_point_functor.hh \ mln/transform/internal/distance_functor.hh \ mln/transform/internal/influence_zone_functor.hh \ mln/transform/all.hh \ diff --git a/milena/mln/canvas/distance_geodesic.hh b/milena/mln/canvas/distance_geodesic.hh index 7d7362b..123bb24 100644 --- a/milena/mln/canvas/distance_geodesic.hh +++ b/milena/mln/canvas/distance_geodesic.hh @@ -31,6 +31,8 @@ /// \file mln/canvas/distance_geodesic.hh /// /// Discrete geodesic distance canvas. +/// +/// \todo add fast version. Use extension(input) = true and extension(map) = 0. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -85,6 +87,7 @@ namespace mln for_all(p) if (functor.inqueue_p_wrt_input_p(input(p))) // <-- inqueue_p_wrt_input_p { + functor.init_p(p); dmap(p) = 0; for_all(n) if (input.domain().has(n) && diff --git a/milena/mln/transform/internal/distance_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh similarity index 71% copy from milena/mln/transform/internal/distance_functor.hh copy to milena/mln/transform/internal/closest_point_functor.hh index 1214feb..634d44c 100644 --- a/milena/mln/transform/internal/distance_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,36 +25,37 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_TRANSFORM_INTERNAL_DISTANCE_FUNCTOR_HH -# define MLN_TRANSFORM_INTERNAL_DISTANCE_FUNCTOR_HH +#ifndef MLN_TRANSFORM_INTERNAL_CLOSEST_POINT_FUNCTOR_HH +# define MLN_TRANSFORM_INTERNAL_CLOSEST_POINT_FUNCTOR_HH -/// \file mln/transform/internal/distance_functor.hh +/// \file mln/transform/internal/closest_point_functor.hh /// -/// Distance functor. +/// Closest point functor. # include <mln/core/macros.hh> - - namespace mln { namespace transform { - + namespace internal { template <typename I> - struct distance_functor + struct closest_point_functor { typedef mln_value(I) V; typedef mln_site(I) P; void init(const I&); bool inqueue_p_wrt_input_p(const V& input_p); + void init_p(const P&); bool inqueue_p_wrt_input_n(const V& input_n); void process(const P&, const P&); + + mln_ch_value(I,P) cp_ima; }; @@ -63,30 +64,40 @@ namespace mln template <typename I> inline void - distance_functor::init(const I&) + closest_point_functor::init(const I& input) { + initialize(cp_ima, input); } template <typename I> inline bool - distance_functor::inqueue_p_wrt_input_p(const V& input_p) + closest_point_functor::inqueue_p_wrt_input_p(const V& input_p) { return input_p == true; } template <typename I> inline + void + closest_point_functor::init_p(const P& p) + { + cp_ima(p) = p; + } + + template <typename I> + inline bool - distance_functor::inqueue_p_wrt_input_n(const V& input_n) + closest_point_functor::inqueue_p_wrt_input_n(const V& input_n) { return input_n == false; } template <typename I> inline - void distance_functor::process(const P&, const P&) + void closest_point_functor::process(const P& p, const P& n) { + cp_ima(n) = p; } # endif // ! MLN_INCLUDE_ONLY @@ -98,4 +109,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_TRANSFORM_INTERNAL_DISTANCE_FUNCTOR_HH +#endif // ! MLN_TRANSFORM_INTERNAL_CLOSEST_POINT_FUNCTOR_HH diff --git a/milena/mln/transform/internal/distance_functor.hh b/milena/mln/transform/internal/distance_functor.hh index 1214feb..1c1295e 100644 --- a/milena/mln/transform/internal/distance_functor.hh +++ b/milena/mln/transform/internal/distance_functor.hh @@ -41,7 +41,7 @@ namespace mln namespace transform { - + namespace internal { @@ -53,6 +53,7 @@ namespace mln void init(const I&); bool inqueue_p_wrt_input_p(const V& input_p); + void init_p(const P&); bool inqueue_p_wrt_input_n(const V& input_n); void process(const P&, const P&); }; @@ -77,6 +78,13 @@ namespace mln template <typename I> inline + void + distance_functor::init_p(const P&) + { + } + + template <typename I> + inline bool distance_functor::inqueue_p_wrt_input_n(const V& input_n) { diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 7139e44..09177d7 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -931,6 +931,7 @@ mln_test_positive \ mln_test_essential \ mln_transform_distance_geodesic \ mln_transform_internal_all \ +mln_transform_internal_closest_point_functor \ mln_transform_internal_distance_functor \ mln_transform_internal_influence_zone_functor \ mln_transform_all \ @@ -1164,6 +1165,7 @@ mln_trace_stop_SOURCES = mln_trace_stop.cc mln_trace_essential_SOURCES = mln_trace_essential.cc mln_make_graph_SOURCES = mln_make_graph.cc mln_make_double_neighb2d_SOURCES = mln_make_double_neighb2d.cc +mln_make_image3d_SOURCES = mln_make_image3d.cc mln_make_dpoint2d_h_SOURCES = mln_make_dpoint2d_h.cc mln_make_w_window_SOURCES = mln_make_w_window.cc mln_make_image_SOURCES = mln_make_image.cc @@ -1177,6 +1179,7 @@ mln_make_w_window2d_int_SOURCES = mln_make_w_window2d_int.cc mln_make_box1d_SOURCES = mln_make_box1d.cc mln_make_voronoi_SOURCES = mln_make_voronoi.cc mln_make_box2d_SOURCES = mln_make_box2d.cc +mln_make_h_mat_SOURCES = mln_make_h_mat.cc mln_make_w_window2d_SOURCES = mln_make_w_window2d.cc mln_make_box3d_SOURCES = mln_make_box3d.cc mln_make_relabelfun_SOURCES = mln_make_relabelfun.cc @@ -1393,6 +1396,7 @@ mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_rank_high_quant_SOURCES = mln_accu_rank_high_quant.cc mln_accu_count_SOURCES = mln_accu_count.cc mln_accu_median_h_SOURCES = mln_accu_median_h.cc +mln_accu_rms_SOURCES = mln_accu_rms.cc mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_land_basic_SOURCES = mln_accu_land_basic.cc mln_accu_p_SOURCES = mln_accu_p.cc @@ -1824,11 +1828,13 @@ mln_core_alias_p_run2d_SOURCES = mln_core_alias_p_run2d.cc mln_core_alias_point3d_SOURCES = mln_core_alias_point3d.cc mln_core_alias_neighb3d_SOURCES = mln_core_alias_neighb3d.cc mln_core_alias_window3d_SOURCES = mln_core_alias_window3d.cc +mln_core_alias_all_SOURCES = mln_core_alias_all.cc mln_core_alias_neighb2d_SOURCES = mln_core_alias_neighb2d.cc mln_core_alias_complex_image_SOURCES = mln_core_alias_complex_image.cc mln_core_alias_w_window1d_float_SOURCES = mln_core_alias_w_window1d_float.cc mln_core_alias_neighb1d_SOURCES = mln_core_alias_neighb1d.cc mln_core_alias_w_window2d_float_SOURCES = mln_core_alias_w_window2d_float.cc +mln_core_alias_vec3d_SOURCES = mln_core_alias_vec3d.cc mln_core_alias_w_window2d_int_SOURCES = mln_core_alias_w_window2d_int.cc mln_core_alias_box1d_SOURCES = mln_core_alias_box1d.cc mln_core_alias_box2d_SOURCES = mln_core_alias_box2d.cc @@ -1959,6 +1965,7 @@ mln_test_positive_SOURCES = mln_test_positive.cc mln_test_essential_SOURCES = mln_test_essential.cc mln_transform_distance_geodesic_SOURCES = mln_transform_distance_geodesic.cc mln_transform_internal_all_SOURCES = mln_transform_internal_all.cc +mln_transform_internal_closest_point_functor_SOURCES = mln_transform_internal_closest_point_functor.cc mln_transform_internal_distance_functor_SOURCES = mln_transform_internal_distance_functor.cc mln_transform_internal_influence_zone_functor_SOURCES = mln_transform_internal_influence_zone_functor.cc mln_transform_all_SOURCES = mln_transform_all.cc @@ -1987,6 +1994,8 @@ mln_io_pfm_save_SOURCES = mln_io_pfm_save.cc mln_io_raw_load_SOURCES = mln_io_raw_load.cc mln_io_raw_all_SOURCES = mln_io_raw_all.cc mln_io_raw_save_SOURCES = mln_io_raw_save.cc +mln_io_cloud_load_SOURCES = mln_io_cloud_load.cc +mln_io_cloud_save_SOURCES = mln_io_cloud_save.cc mln_io_all_SOURCES = mln_io_all.cc mln_io_pbm_load_SOURCES = mln_io_pbm_load.cc mln_io_pbm_all_SOURCES = mln_io_pbm_all.cc diff --git a/milena/tests/unit_test/mln_transform_internal_closest_point_functor.cc b/milena/tests/unit_test/mln_transform_internal_closest_point_functor.cc new file mode 100644 index 0000000..96b7c96 --- /dev/null +++ b/milena/tests/unit_test/mln_transform_internal_closest_point_functor.cc @@ -0,0 +1,11 @@ +// Unit test for mln/transform/internal/closest_point_functor.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/transform/internal/closest_point_functor.hh> +#include <mln/transform/internal/closest_point_functor.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

15 years, 10 months

3240: Add io::cloud.

by Guillaume Lazzara

* headers.mk: add new headers to distribution. * mln/io/all.hh: include new headers. * mln/io/cloud/all.hh, * mln/io/cloud/load.hh, * mln/io/cloud/save.hh: load and save a cloud of points. * tests/unit_test/Makefile.am, * tests/unit_test/mln_io_cloud_load.cc, * tests/unit_test/mln_io_cloud_save.cc: add new unit tests. --- milena/ChangeLog | 16 ++++ milena/headers.mk | 2 + milena/mln/io/all.hh | 16 ++-- milena/mln/io/{ => cloud}/all.hh | 30 +++----- milena/mln/io/cloud/load.hh | 118 +++++++++++++++++++++++++++ milena/mln/io/cloud/save.hh | 110 +++++++++++++++++++++++++ milena/tests/unit_test/Makefile.am | 2 + milena/tests/unit_test/mln_io_cloud_load.cc | 11 +++ milena/tests/unit_test/mln_io_cloud_save.cc | 11 +++ 9 files changed, 290 insertions(+), 26 deletions(-) copy milena/mln/io/{ => cloud}/all.hh (70%) create mode 100644 milena/mln/io/cloud/load.hh create mode 100644 milena/mln/io/cloud/save.hh create mode 100644 milena/tests/unit_test/mln_io_cloud_load.cc create mode 100644 milena/tests/unit_test/mln_io_cloud_save.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index f2defdd..9e9189d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add io::cloud. + + * headers.mk: add new headers to distribution. + + * mln/io/all.hh: include new headers. + + * mln/io/cloud/all.hh, + * mln/io/cloud/load.hh, + * mln/io/cloud/save.hh: load and save a cloud of points. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_io_cloud_load.cc, + * tests/unit_test/mln_io_cloud_save.cc: add new unit tests. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add accu::rms. * headers.mk: add new header to distribution. diff --git a/milena/headers.mk b/milena/headers.mk index 6a937c5..28e24e7 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -993,6 +993,8 @@ mln/io/pfm/save.hh \ mln/io/raw/load.hh \ mln/io/raw/all.hh \ mln/io/raw/save.hh \ +mln/io/cloud/load.hh \ +mln/io/cloud/save.hh \ mln/io/all.hh \ mln/io/pbm/load.hh \ mln/io/pbm/all.hh \ diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index bb6f7d3..777ffb7 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,10 @@ #ifndef MLN_IO_ALL_HH # define MLN_IO_ALL_HH -/*! \file mln/io/all.hh - * - * \brief File that includes all io materials. - */ +/// \file mln/io/all.hh +/// +/// File that includes all io materials. + namespace mln @@ -46,13 +46,15 @@ namespace mln } -//# include <mln/io/fits/all.hh> -//# include <mln/io/off/all.hh> +# include <mln/io/cloud/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> # include <mln/io/pnm/all.hh> # include <mln/io/ppm/all.hh> +# include <mln/io/raw/all.hh> # include <mln/io/txt/all.hh> +//# include <mln/io/fits/all.hh> +//# include <mln/io/off/all.hh> #endif // ! MLN_IO_ALL_HH diff --git a/milena/mln/io/all.hh b/milena/mln/io/cloud/all.hh similarity index 70% copy from milena/mln/io/all.hh copy to milena/mln/io/cloud/all.hh index bb6f7d3..f3bceb4 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/cloud/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,34 +25,26 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_ALL_HH -# define MLN_IO_ALL_HH +#ifndef MLN_IO_CLOUD_ALL_HH +# define MLN_IO_CLOUD_ALL_HH -/*! \file mln/io/all.hh - * - * \brief File that includes all io materials. - */ +/// \file mln/io/cloud/all.hh +/// +/// File that includes all cloud io materials. namespace mln { - /// Namespace of input/output handling. namespace io { - /// Internal namespace of io namespace. - namespace internal {} + /// Namespace of cloud input/output handling. + namespace cloud {} } } -//# include <mln/io/fits/all.hh> -//# include <mln/io/off/all.hh> -# include <mln/io/pbm/all.hh> -# include <mln/io/pfm/all.hh> -# include <mln/io/pgm/all.hh> -# include <mln/io/pnm/all.hh> -# include <mln/io/ppm/all.hh> -# include <mln/io/txt/all.hh> +# include <mln/io/cloud/load.hh> +# include <mln/io/cloud/save.hh> -#endif // ! MLN_IO_ALL_HH +#endif // ! MLN_IO_CLOUD_ALL_HH diff --git a/milena/mln/io/cloud/load.hh b/milena/mln/io/cloud/load.hh new file mode 100644 index 0000000..83f1e85 --- /dev/null +++ b/milena/mln/io/cloud/load.hh @@ -0,0 +1,118 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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_IO_CLOUD_LOAD_HH +# define MLN_IO_CLOUD_LOAD_HH + +/// \file mln/io/cloud/load.hh +/// +/// Load a cloud of points. +/// A cloud file must contain one point per line. +/// For a list of 3d points, a line would looks like the following: +/// +/// 35 4 5 +/// +/// +/// \todo Support 1 and 2d images. +/// \todo Make it generic? + +# include <iostream> +# include <fstream> + +# include <mln/core/concept/image.hh> +# include <mln/core/site_set/p_array.hh> + +namespace mln +{ + + namespace io + { + + namespace cloud + { + + /// Load a cloud of points. + /// + /// \param[in,out] arr the site set where to load the data. + /// \param[in] filename file to load. + template <typename P> + void load(p_array& arr, const std::string& filename); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename P> + inline + void load_data(p_array& arr, std::ifstream& file) + { + std::string line; + while (std::getline(file, line)) + { + algebra::vec<P::dim,float> v; + std::istringstream sline(line); + sline >> v[0] >> v[1] >> v[2]; + arr.append(v); + } + } + + } // end of namespace mln::io::cloud::internal + + + + template <typename P> + void load(p_array& arr, const std::string& filename) + { + trace::entering("mln::io::cloud::load"); + + /// FIXME: do we really want this? + mln_precondition(P::dim == 3u); + + std::ifstream file(filename.c_str()); + if (! file) + { + std::cerr << "error: cannot open file '" << filename << "'!"; + abort(); + } + + internal::load_data(arr, file); + + trace::exiting("mln::io::cloud::load"); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::cloud + + } // end of namespace mln::io + +} // end of namespace mln + +#endif // ! MLN_IO_CLOUD_LOAD_HH diff --git a/milena/mln/io/cloud/save.hh b/milena/mln/io/cloud/save.hh new file mode 100644 index 0000000..fc42228 --- /dev/null +++ b/milena/mln/io/cloud/save.hh @@ -0,0 +1,110 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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_IO_CLOUD_SAVE_HH +# define MLN_IO_CLOUD_SAVE_HH + +/// \file mln/io/cloud/save.hh +/// +/// Save an image as a cloud of points. + +# include <iostream> +# include <fstream> + +# include <mln/core/concept/image.hh> +# include <mln/core/site_set/p_array.hh> + +namespace mln +{ + + namespace io + { + + namespace cloud + { + + /// Load a cloud of points + /// + /// \param[in] arr the cloud of points to save. + /// \param[in] filename the destination. + template <typename P> + void save(const p_array& arr, const std::string& filename); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename P> + inline + void save_data(const p_array& arr, std::ofstream& file) + { + std::ostringstream sline; + mln_piter(p_array) p(arr); + for_all(p) + { + algebra::vec<P::dim,float> v = p.to_site().to_vec(); + sline << v[0]; + for (unsigned i = 1; i < P::dim; ++i) + sline << ' ' << v[i]; + sline << std::endl; + file << sline.str(); + } + } + + } // end of namespace mln::io::cloud::internal + + + + template <typename P> + void save(const p_array& arr, const std::string& filename) + { + trace::entering("mln::io::cloud::save"); + + std::ofstream file(filename.c_str()); + if (! file) + { + std::cerr << "error: cannot open file '" << filename << "'!"; + abort(); + } + + internal::save_data(arr, file); + + trace::exiting("mln::io::cloud::save"); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::cloud + + } // end of namespace mln::io + +} // end of namespace mln + +#endif // ! MLN_IO_CLOUD_SAVE_HH diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index b31efec..7139e44 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -959,6 +959,8 @@ mln_io_pfm_save \ mln_io_raw_load \ mln_io_raw_all \ mln_io_raw_save \ +mln_io_cloud_load \ +mln_io_cloud_save \ mln_io_all \ mln_io_pbm_load \ mln_io_pbm_all \ diff --git a/milena/tests/unit_test/mln_io_cloud_load.cc b/milena/tests/unit_test/mln_io_cloud_load.cc new file mode 100644 index 0000000..8edc601 --- /dev/null +++ b/milena/tests/unit_test/mln_io_cloud_load.cc @@ -0,0 +1,11 @@ +// Unit test for mln/io/cloud/load.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/io/cloud/load.hh> +#include <mln/io/cloud/load.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_io_cloud_save.cc b/milena/tests/unit_test/mln_io_cloud_save.cc new file mode 100644 index 0000000..8d27cc9 --- /dev/null +++ b/milena/tests/unit_test/mln_io_cloud_save.cc @@ -0,0 +1,11 @@ +// Unit test for mln/io/cloud/save.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/io/cloud/save.hh> +#include <mln/io/cloud/save.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

15 years, 10 months

3239: Add accu::rms.

by Guillaume Lazzara

* headers.mk: add new header to distribution. * mln/accu/all.hh: include new header. * mln/accu/rms.hh: Compute the root mean square. * tests/unit_test/Makefile.am, * tests/unit_test/mln_accu_rms.cc: add unit test. --- milena/ChangeLog | 15 +++- milena/headers.mk | 1 + milena/mln/accu/all.hh | 1 + milena/mln/accu/rms.hh | 165 ++++++++++++++++++++++++++++++++ milena/tests/unit_test/Makefile.am | 1 + milena/tests/unit_test/mln_accu_rms.cc | 11 ++ 6 files changed, 193 insertions(+), 1 deletions(-) create mode 100644 milena/mln/accu/rms.hh create mode 100644 milena/tests/unit_test/mln_accu_rms.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 58b16ad..f2defdd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add accu::rms. + + * headers.mk: add new header to distribution. + + * mln/accu/all.hh: include new header. + + * mln/accu/rms.hh: Compute the root mean square. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_accu_rms.cc: add unit test. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add make::h_mat. * headers.mk: add new header to distribution. @@ -49,7 +62,7 @@ 2009-02-02 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Activate fastest version of algebraic union-find. - + * mln/morpho/closing_attribute.hh (closing_attribute_dispatch): Activate for fastest images. * mln/canvas/morpho/algebraic_union_find.hh: Likewise. diff --git a/milena/headers.mk b/milena/headers.mk index 04bef51..6a937c5 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -366,6 +366,7 @@ mln/accu/transform_snake.hh \ mln/accu/rank_high_quant.hh \ mln/accu/count.hh \ mln/accu/median_h.hh \ +mln/accu/rms.hh \ mln/accu/all.hh \ mln/accu/land_basic.hh \ mln/accu/p.hh \ diff --git a/milena/mln/accu/all.hh b/milena/mln/accu/all.hh index 273d4d2..0181b9a 100644 --- a/milena/mln/accu/all.hh +++ b/milena/mln/accu/all.hh @@ -77,6 +77,7 @@ namespace mln # include <mln/accu/nil.hh> # include <mln/accu/pair.hh> # include <mln/accu/rank.hh> +# include <mln/accu/rms.hh> # include <mln/accu/sum.hh> # include <mln/accu/tuple.hh> # include <mln/accu/volume.hh> diff --git a/milena/mln/accu/rms.hh b/milena/mln/accu/rms.hh new file mode 100644 index 0000000..c873686 --- /dev/null +++ b/milena/mln/accu/rms.hh @@ -0,0 +1,165 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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_ACCU_RMS_HH +# define MLN_ACCU_RMS_HH + +/// \file mln/accu/rms.hh +/// +/// Define an accumulator that computes the Root Mean Square. + +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/accu/internal/base.hh> + + +namespace mln +{ + + namespace accu + { + + + /// Generic rms accumulator class. + /// + /// The parameter \c T is the type of the root mean square value. + /// + template <typename T, typename V> + struct rms : public mln::accu::internal::base<V, rms<T,V> > + { + typedef T argument; + + rms(); + + /// Manipulators. + /// \{ + void init(); + void take_as_init(const T& p); + void take(const T& p); + void take(const rms<T,V>& other); + /// \} + + /// Get the value of the accumulator. + V to_result() const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + + V t_; + unsigned count_; + }; + + + namespace meta + { + + /// Meta accumulator for rms. + struct rms : public Meta_Accumulator< rms > + { + template <typename T, typename V> + struct with + { + typedef accu::rms<T,V> ret; + }; + }; + + } // end of namespace mln::accu::meta + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T, typename V> + inline + rms<T,V>::rms() + { + init(); + } + + template <typename T, typename V> + inline + void + rms<T,V>::init() + { + t_ = literal::zero; + count_ = 0; + } + + template <typename T, typename V> + inline + void + rms<T,V>::take_as_init(const T& t) + { + t_ += t * t; + ++count_; + } + + template <typename T, typename V> + inline + void + rms<T,V>::take(const T& t) + { + t_ += t * t; + ++count_; + } + + template <typename T, typename V> + inline + void + rms<T,V>::take(const rms<T,V>& other) + { + t_ += other.t_; + count_ += other.count_; + } + + template <typename T, typename V> + inline + V + rms<T,V>::to_result() const + { + if (count_ == 0) + return literal::zero; + return math::sqrt<V>(t_ / count_); + } + + template <typename T, typename V> + inline + bool + rms<T,V>::is_valid() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_RMS_HH diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index a6b6b26..b31efec 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -362,6 +362,7 @@ mln_accu_transform_snake \ mln_accu_rank_high_quant \ mln_accu_count \ mln_accu_median_h \ +mln_accu_rms \ mln_accu_all \ mln_accu_land_basic \ mln_accu_p \ diff --git a/milena/tests/unit_test/mln_accu_rms.cc b/milena/tests/unit_test/mln_accu_rms.cc new file mode 100644 index 0000000..0dd83bd --- /dev/null +++ b/milena/tests/unit_test/mln_accu_rms.cc @@ -0,0 +1,11 @@ +// Unit test for mln/accu/rms.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/accu/rms.hh> +#include <mln/accu/rms.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

15 years, 10 months

3238: Add make::h_mat.

by Guillaume Lazzara

* headers.mk: add new header to distribution. * mln/make/h_mat.hh: create a h_mat from a C-style array. * tests/unit_test/Makefile.am, * tests/unit_test/mln_make_h_mat.cc: add unit test. --- milena/ChangeLog | 38 +++++++++ milena/headers.mk | 1 + milena/mln/make/h_mat.hh | 121 ++++++++++++++++++++++++++++++ milena/tests/unit_test/Makefile.am | 1 + milena/tests/unit_test/mln_make_h_mat.cc | 11 +++ 5 files changed, 172 insertions(+), 0 deletions(-) create mode 100644 milena/mln/make/h_mat.hh create mode 100644 milena/tests/unit_test/mln_make_h_mat.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index eb424b1..58b16ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,43 @@ 2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Add make::h_mat. + + * headers.mk: add new header to distribution. + + * mln/make/h_mat.hh: create a h_mat from a C-style array. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_make_h_mat.cc: add unit test. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add core/alias/all.hh and alias/vec3d.hh. + + * doc/tutorial/examples/examples.mk + * doc/tutorial/figures/figures.mk + * doc/tutorial/outputs/outputs.mk + * doc/tutorial/samples/samples.mk: Update generated files. + + * headers.mk: add new header to distribution. + + * mln/core/alias/all.hh: new header. + + * mln/core/alias/vec3d.hh: new aliases for 3d algebra::vec. + + * mln/core/alias/box2d.hh, + * mln/core/alias/box3d.hh: update comments. + + * mln/core/all.hh: include alias/all.hh. + + * mln/essential/3d.hh: add image3d.hh and vec3d.hh. + + * tests/unit_test/Makefile.am, + * tests/unit_test/mln_core_alias_all.cc, + * tests/unit_test/mln_core_alias_vec3d.cc, + * tests/unit_test/mln_make_image3d.cc: add new unit test files. + +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix tutorial generation. * doc/tutorial/generate_dist_files.sh: dot not include current diff --git a/milena/headers.mk b/milena/headers.mk index 037b5cc..04bef51 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -148,6 +148,7 @@ mln/make/w_window2d_int.hh \ mln/make/box1d.hh \ mln/make/voronoi.hh \ mln/make/box2d.hh \ +mln/make/h_mat.hh \ mln/make/w_window2d.hh \ mln/make/box3d.hh \ mln/make/relabelfun.hh \ diff --git a/milena/mln/make/h_mat.hh b/milena/mln/make/h_mat.hh new file mode 100644 index 0000000..930c133 --- /dev/null +++ b/milena/mln/make/h_mat.hh @@ -0,0 +1,121 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// 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_MAKE_H_MAT_HH +# define MLN_MAKE_H_MAT_HH + +/// \file mln/make/h_mat.hh +/// +/// Routine to construct an mln::algebra::h_mat. + +# include <mln/algebra/h_mat.hh> +# include <mln/metal/math/sqrt.hh> + + +namespace mln +{ + + namespace make + { + + /// Create an mln::algebra::h_mat<d,T>. + /* + * \param[in] tab Array of values. + * + * \pre The array dimension has to be d * d. + */ + template <typename T, unsigned d> + algebra::h_mat<d,T> h_mat(const T (&tab)[(d+1)*(d+1)]); + + + /// Create an mln::algebra::h_mat<d,T>. + /* + * \param[in] tab Array of values. + * + * \pre The array dimension has to be d * d. + */ + template <typename T, unsigned d> + algebra::h_mat<d,T> h_mat(const T (&tab)[d+1][d+1]); + + + /// reate an mln::algebra::mat<n,n,T>. + /* + * \param[in] tab C-array of values. + * + * \pre The array dimension N has to be square (N = n * n). + */ + template <typename T, unsigned N> + algebra::h_mat<mlc_sqrt_int(N), T> h_mat(const T (&tab)[N]); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T, unsigned d> + inline + algebra::h_mat<d,T> + h_mat(const T (&tab)[(d+1)*(d+1)]) + { + algebra::h_mat<d,T> tmp; + for (unsigned i = 0; i <= d; ++i) + tmp(i / (d+1), i % (d+1)) = tab[i]; + return tmp; + } + + + template <typename T, unsigned d> + algebra::h_mat<d,T> + h_mat(const T (&tab)[d+1][d+1]) + { + algebra::h_mat<d,T> tmp; + for (unsigned i = 0; i <= d; ++i) + for (unsigned j = 0; j <= d; ++j) + tmp(i, j) = tab[i][j]; + return tmp; + } + + + template <typename T, unsigned N> + inline + algebra::h_mat<mlc_sqrt_int(N), T> + h_mat(const T (&tab)[N]) + { + enum { n = mlc_sqrt_int(N) }; + mlc_bool(N == n * n)::check(); + algebra::h_mat<n,T> tmp; + for (unsigned i = 0; i < N; ++i) + tmp(i / n, i % n) = tab[i]; + return tmp; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::make + +} // end of namespace mln + +#endif // ! MLN_MAKE_H_MAT_HH diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 2653f23..a6b6b26 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -145,6 +145,7 @@ mln_make_w_window2d_int \ mln_make_box1d \ mln_make_voronoi \ mln_make_box2d \ +mln_make_h_mat \ mln_make_w_window2d \ mln_make_box3d \ mln_make_relabelfun \ diff --git a/milena/tests/unit_test/mln_make_h_mat.cc b/milena/tests/unit_test/mln_make_h_mat.cc new file mode 100644 index 0000000..b572cb4 --- /dev/null +++ b/milena/tests/unit_test/mln_make_h_mat.cc @@ -0,0 +1,11 @@ +// Unit test for mln/make/h_mat.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/make/h_mat.hh> +#include <mln/make/h_mat.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2009