Olena-patches November 2009

olena-patches@lrde.epita.fr

4 participants
70 discussions

[Olena] #214: Use Automake 1.11's AM_DEFAULT_SOURCE_EXT

by Olena Trac

#214: Use Automake 1.11's AM_DEFAULT_SOURCE_EXT -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Component: Milena | Version: 1.0 Keywords: Make | -------------------------+-------------------------------------------------- Quoting the [http://www.mail-archive.com/automake@gnu.org/msg15022.html announce of Automake 1.11]: {{{ - The default source file extension (.c) can be overridden with AM_DEFAULT_SOURCE_EXT now. }}} Which allows us to replace {{{ bin_PROGRAMS = foo bar baz foo_SOURCES = foo.cc bar_SOURCES = bar.cc baz_SOURCES = baz.cc }}} with {{{ bin_PROGRAMS = foo bar baz AM_DEFAULT_SOURCE_EXT = .cc }}} (Of course, « `AM_DEFAULT_SOURCE_EXT = .cc` » should be factored in some `common.mk` file.) This just rocks if you consider the tons of `*_SOURCES` lines in the zillions of `tests/*/Makefile.am` files. On the downward side, this change requires Automake 1.11, which is not even in Debian unstable as of July 24, 2009. We might want to wait a little bit before requiring this version. -- Ticket URL: <https://trac.lrde.org/olena/ticket/214> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

13 years, 11 months

[Olena] #207: Use Automake 1.11

by Olena Trac

#207: Use Automake 1.11 -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Automake 1.11 provides a better framework for tests: each test can generate a log file, and the test suite is a mere rule generating a summary log, depending on all these logs. The `check` rule is no longer based on a shell `for` loop, and `make` can truly honors its `-j` (parallel instances) option when testing. Of course, one need to be careful with side effects, notably files created by tests, as one test may overwrite the output(s) of another tests. Akim recommends that test `foo` writes its outputs to `foo.dir`. Moreover, this permits many improvements: * One can generate pretty-printed versions of the tests using, e.g., `rst2html` (if the log contains an RST output) on the logs. * One can have a `recheck` rule reruning only the failed tests, since the first line of the log records the outcome of the test (pass or fail). * Also, provided dependencies are well set, this can probably help one write rules to rerun only the needed tests when a change occurred in the source tree (but I don't know yet how to do this). -- Ticket URL: <https://trac.lrde.org/olena/ticket/207> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

13 years, 11 months

[Olena] #129: Reintegrate oln.m4 (full or a part of it) into Olena 1.0

by Olena

#129: Reintegrate oln.m4 (full or a part of it) into Olena 1.0 -----------------------------------+---------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0ß Component: Olena | Version: 1.0 Keywords: configure autoconf M4 | -----------------------------------+---------------------------------------- In Olena 0.11, `oln.m4` (which might be renamed to `olena.m4`) provided useful services to both the Olena package (search for libraries, set up flags for tests, etc.) and autoconfiscated packages using Olena, by providing a `--with-oln` (to be renamed to `--with-olena`) flag. We should reintegrate a part of these features, possibly in two M4 macro packages: * one for Olena, * one for Olena-based projects. -- Ticket URL: <https://trac.lrde.org/olena/ticket/129> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image library.

14 years

[Olena] #212: Convert Olena's Subversion repository to Git

by Olena Trac

#212: Convert Olena's Subversion repository to Git ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: blocker | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- I (Roland) will take care of it ASAP (following the release of Olena 1.0). A few remarks: * Use a script to do this, of course (reuse the one I wrote to convert `share/`). * Don't forget to use a real list of authors (as in the conversion of other LRDE repositories). Compile a list of all contributors to ensure we forgot nobody. * Keep Subversion revision numbers in Git: they will be useful to match information from Trac and the mailing lists. * Actually merge branches in the Git repository, by rewriting the history. The best is probably to create a map of Subversion merges, then extend the script to handle this. * Don't forget branches in source:prototypes (grrr...). * See also #201 and #203. * Later: Teach Git to Git beginners. * Even later: reintegrate the PRCS repository (see #3). -- Ticket URL: <https://trac.lrde.org/olena/ticket/212> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

14 years, 5 months

[PATCH] Add missing copyright headers to M4 files.

by Roland Levillain

My very first patch into the brand new Olena Git repository. Yippee!! * m4/oln-with-lib.m4, m4/with-swilena.m4: Here. Signed-off-by: Roland Levillain <roland(a)lrde.epita.fr> --- ChangeLog | 6 ++++++ m4/oln-with-lib.m4 | 17 +++++++++++++++++ m4/with-swilena.m4 | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b360b9..76c3a44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing copyright headers to M4 files. + + * m4/oln-with-lib.m4, m4/with-swilena.m4: Here. + 2009-10-02 Roland Levillain <roland(a)lrde.epita.fr> Configure Makefiles under milena/apps/papers/. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 4678d8b..4f939cb 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -1,5 +1,22 @@ # -*- Autoconf -*- +# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + + # OLN_WITH_LIB(PACKAGE, HEADER, LIBRARY, [SHELL_NAME], [CPP_NAME], # [OTHER-LIBRARIES]) # ---------------------------------------------------------------- diff --git a/m4/with-swilena.m4 b/m4/with-swilena.m4 index 0537699..08cfdf4 100644 --- a/m4/with-swilena.m4 +++ b/m4/with-swilena.m4 @@ -1,5 +1,22 @@ # -*- Autoconf -*- +# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + + # FIXME: Revamp and make it generic, so that it can shared among # Olena, TC and clspr. -- 1.6.5.2

14 years, 5 months

4726: doc/white_paper/white_paper.tex: Fix an invalid URL.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/doc/white_paper/white_paper.tex | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa70a1c..b3cd42e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * doc/white_paper/white_paper.tex: Fix an invalid URL. + +2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce labeled_image_base. * mln/core/internal/labeled_image_base.hh: New. diff --git a/milena/doc/white_paper/white_paper.tex b/milena/doc/white_paper/white_paper.tex index f32a979..0120ad6 100644 --- a/milena/doc/white_paper/white_paper.tex +++ b/milena/doc/white_paper/white_paper.tex @@ -171,7 +171,7 @@ Olena's \textbf{official website}: \url{http://olena.lrde.epita.fr} Olena's \textbf{Trac}: \url{http://trac.lrde.org/olena} Milena's \textbf{documentation}: -\url{http://www.lrde.epita.fr/dload/doc/milena-1.0} +\url{http://www.lrde.epita.fr/dload/doc/milena/user-refman-html} % \medskip -- 1.5.6.5

14 years, 5 months

4725: Introduce labeled_image_base.

by Guillaume Lazzara

* mln/core/internal/labeled_image_base.hh: New. * mln/core/image/imorph/labeled_image.hh: Make inherit from labeled_image_base. --- milena/ChangeLog | 9 + milena/mln/core/image/imorph/labeled_image.hh | 194 +------------- .../labeled_image_base.hh} | 270 +++++++------------- 3 files changed, 118 insertions(+), 355 deletions(-) copy milena/mln/core/{image/imorph/labeled_image.hh => internal/labeled_image_base.hh} (52%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 811c23e..aa70a1c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce labeled_image_base. + + * mln/core/internal/labeled_image_base.hh: New. + + * mln/core/image/imorph/labeled_image.hh: Make inherit from + labeled_image_base. + +2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix invalid macros. * mln/core/box_runend_piter.hh, diff --git a/milena/mln/core/image/imorph/labeled_image.hh b/milena/mln/core/image/imorph/labeled_image.hh index b0e5ffb..438f6ae 100644 --- a/milena/mln/core/image/imorph/labeled_image.hh +++ b/milena/mln/core/image/imorph/labeled_image.hh @@ -30,35 +30,17 @@ /// /// \brief Definition of a morpher on a labeled image. -# include <mln/core/image/dmorph/image_if.hh> -# include <mln/core/concept/function.hh> -# include <mln/core/internal/image_identity.hh> -# include <mln/core/site_set/box.hh> -# include <mln/core/routine/duplicate.hh> - -# include <mln/accu/pair.hh> -# include <mln/accu/nil.hh> -# include <mln/accu/center.hh> +# include <mln/core/internal/labeled_image_base.hh> -# include <mln/labeling/compute.hh> -# include <mln/labeling/pack.hh> -# include <mln/labeling/relabel.hh> +# include <mln/core/routine/duplicate.hh> # include <mln/util/array.hh> -# include <mln/pw/cst.hh> -# include <mln/pw/value.hh> - -# ifndef NDEBUG -# include <mln/accu/stat/max.hh> -# include <mln/data/compute.hh> -# endif // ! NDEBUG - - +# include <mln/accu/center.hh> # include <mln/accu/shape/bbox.hh> -# include <mln/labeling/relabel.hh> -# include <mln/make/relabelfun.hh> +# include <mln/accu/stat/max.hh> +# include <mln/labeling/compute.hh> namespace mln { @@ -78,14 +60,13 @@ namespace mln /// Data structure for \c mln::labeled_image. template <typename I> struct data< labeled_image > + : data< labeled_image_base<I, labeled_image > > { + typedef data< labeled_image_base<I, labeled_image > > super_; + data(const I& ima, const mln_value(I)& nlabels); data(const I& ima, const mln_value(I)& nlabels, const util::array<mln_box(I)>& bboxes); - - I ima_; - mln_value(I) nlabels_; - mutable util::array< box<mln_psite(I)> > bboxes_; }; } // end of namespace mln::internal @@ -95,19 +76,9 @@ namespace mln { template <typename I> - struct image_< labeled_image > : image_ // Same as I except... + struct image_< labeled_image > + : image_< labeled_image_base<I, labeled_image > > { - // ...these changes. - typedef trait::image::category::identity_morpher category; - typedef mln_internal_trait_image_speed_from(I) speed; // Un-fastest. - typedef trait::image::value_access::indirect value_access; - - typedef trait::image::value_io::read_only value_io; - typedef trait::image::pw_io::read pw_io; - - // extended domain - typedef trait::image::ext_value::multiple ext_value; - typedef trait::image::ext_io::read_only ext_io; }; } // end of namespace mln::trait @@ -128,19 +99,15 @@ namespace mln // template <typename I> class labeled_image - : public internal::image_identity< const I, mln_domain(I), labeled_image > + : public labeled_image_base<I, labeled_image > { - typedef internal::image_identity< const I, mln_domain(I), labeled_image > - super_; + typedef labeled_image_base<I, labeled_image > super_; public: /// Skeleton. typedef labeled_image< tag::image_ > skeleton; - /// Type of the bounding component bounding boxes. - typedef mln_result(accu::shape::bbox<mln_psite(I)>) bbox_t; - /// Constructors /// @{ /// Constructor without argument. @@ -162,39 +129,6 @@ namespace mln /// Duplicate the underlying image and create a new labeled_image. void init_from_(const labeled_image& model); - /// Relabel according to a function. - /// @{ - // - /// Merge or delete labels according to the given function. - /// This method ensures that the labeling remains contiguous. - /// - // FIXME: currently the label is kept contiguous for - // performance reasons. Do we want to be less restrictive? - template <typename F> - void relabel(const Function_v2v<F>& f); - // - /// Labels may be removed. This overload make sure the labeling is still - /// contiguous. - template <typename F> - void relabel(const Function_v2b<F>& f); - /// @} - - /// Return the number of labels; - mln_value(I) nlabels() const; - - /// Update bounding boxes information. - void update_(const fun::i2v::array<mln_value(I)>& relabel_fun); - - /// Return the bounding box of the component \p label. - const bbox_t& bbox(const mln_value(I)& label) const; - - /// Return the component bounding boxes. - const util::array<bbox_t>& bboxes() const; - - /// Return the domain of the component with label \p label. - p_if<mln_box(I), - fun::eq_v2b_expr_<pw::value_, pw::cst_<mln_value(I)> > > - subdomain(const mln_value(I)& label) const; }; @@ -204,7 +138,7 @@ namespace mln // 'labeled_image'. template <typename I, typename J> void init_(tag::image_t, labeled_image& target, - const labeled_image<J>& model); + const labeled_image<J>& model); @@ -234,7 +168,7 @@ namespace mln template <typename I> inline data< labeled_image >::data(const I& ima, const mln_value(I)& nlabels) - : ima_(ima), nlabels_(nlabels) + : super_(ima, nlabels) { } @@ -242,7 +176,7 @@ namespace mln inline data< labeled_image >::data(const I& ima, const mln_value(I)& nlabels, const util::array<mln_box(I)>& bboxes) - : ima_(ima), nlabels_(nlabels), bboxes_(bboxes) + : super_(ima, nlabels, bboxes) { } @@ -296,61 +230,6 @@ namespace mln this->data_->bboxes_ = model.hook_data_()->bboxes_; } - template <typename I> - template <typename F> - inline - void - labeled_image::relabel(const Function_v2v<F>& f_) - { - const F& f = exact(f_); - mln_value(I) new_nlabels; - - fun::i2v::array<mln_value(I)> - packed_relabel_fun = make::relabelfun(f, - this->data_->nlabels_, - new_nlabels); - - labeling::relabel_inplace(this->data_->ima_, this->data_->nlabels_, - packed_relabel_fun); - - this->data_->nlabels_ = new_nlabels; - - /// We may have merged or deleted labels. - update_(packed_relabel_fun); - } - - - - template <typename I> - template <typename F> - inline - void - labeled_image::relabel(const Function_v2b<F>& f_) - { - const F& f = exact(f_); - - // Relabel the underlying image. - typedef fun::i2v::array<mln_value(I)> fv2v_t; - fv2v_t fv2v = make::relabelfun(f, - this->data_->nlabels_, - this->data_->nlabels_); - - labeling::relabel_inplace(this->data_->ima_, this->data_->nlabels_, fv2v); - - - // Then, merge or delete bounding boxes according to this relabeling. - update_(fv2v); - } - - template <typename I> - inline - mln_value(I) - labeled_image::nlabels() const - { - return this->data_->nlabels_; - } - - // init_ template <typename I, typename J> @@ -363,49 +242,6 @@ namespace mln } - template <typename I> - void - labeled_image::update_(const fun::i2v::array<mln_value(I)>& relabel_fun) - { - util::array<accu::shape::bbox<mln_psite(I)> > - new_bboxes(static_cast<unsigned>(this->data_->nlabels_) + 1); - - for (unsigned i = 1; i < this->data_->bboxes_.size(); ++i) - if (relabel_fun(i) != 0) - new_bboxes[relabel_fun(i)].take(this->data_->bboxes_[i]); - - convert::from_to(new_bboxes, this->data_->bboxes_); - - mln_assertion(new_bboxes.size() == this->data_->bboxes_.size()); - } - - - template <typename I> - const typename labeled_image::bbox_t& - labeled_image::bbox(const mln_value(I)& label) const - { - return this->data_->bboxes_[label]; - } - - - template <typename I> - const util::array<typename labeled_image::bbox_t>& - labeled_image::bboxes() const - { - return this->data_->bboxes_; - } - - - template <typename I> - p_if<mln_box(I), - fun::eq_v2b_expr_<pw::value_, pw::cst_<mln_value(I)> > > - labeled_image::subdomain(const mln_value(I)& label) const - { - return ((this->data_->ima_ | bbox(label)) - | (pw::value(this->data_->ima_) == pw::cst(label))).domain(); - } - - // Make routines. namespace make diff --git a/milena/mln/core/image/imorph/labeled_image.hh b/milena/mln/core/internal/labeled_image_base.hh similarity index 52% copy from milena/mln/core/image/imorph/labeled_image.hh copy to milena/mln/core/internal/labeled_image_base.hh index b0e5ffb..e79bb12 100644 --- a/milena/mln/core/image/imorph/labeled_image.hh +++ b/milena/mln/core/internal/labeled_image_base.hh @@ -23,25 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_HH -# define MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_HH +#ifndef MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_BASE_HH +# define MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_BASE_HH /// \file /// -/// \brief Definition of a morpher on a labeled image. +/// \brief Definition of a base class for labeled image morphers. # include <mln/core/image/dmorph/image_if.hh> # include <mln/core/concept/function.hh> # include <mln/core/internal/image_identity.hh> # include <mln/core/site_set/box.hh> -# include <mln/core/routine/duplicate.hh> -# include <mln/accu/pair.hh> -# include <mln/accu/nil.hh> -# include <mln/accu/center.hh> +# include <mln/accu/shape/bbox.hh> -# include <mln/labeling/compute.hh> -# include <mln/labeling/pack.hh> # include <mln/labeling/relabel.hh> # include <mln/util/array.hh> @@ -49,35 +44,23 @@ # include <mln/pw/cst.hh> # include <mln/pw/value.hh> -# ifndef NDEBUG -# include <mln/accu/stat/max.hh> -# include <mln/data/compute.hh> -# endif // ! NDEBUG - - -# include <mln/accu/shape/bbox.hh> -# include <mln/labeling/relabel.hh> # include <mln/make/relabelfun.hh> namespace mln { - // Forward declarations. - template <typename I> struct labeled_image; - namespace accu - { - template <typename T> struct nil; - template <typename T> struct bbox; - } + // Forward declaration. + template <typename I, typename E> + class labeled_image_base; namespace internal { - /// Data structure for \c mln::labeled_image. - template <typename I> - struct data< labeled_image > + /// Data structure for \c mln::labeled_image_base<I,E>. + template <typename I, typename E> + struct data< labeled_image_base<I,E> > { data(const I& ima, const mln_value(I)& nlabels); data(const I& ima, const mln_value(I)& nlabels, @@ -91,11 +74,12 @@ namespace mln } // end of namespace mln::internal + namespace trait { - template <typename I> - struct image_< labeled_image > : image_ // Same as I except... + template <typename I, typename E> + struct image_< labeled_image_base<I,E> > : image_ // Same as I except... { // ...these changes. typedef trait::image::category::identity_morpher category; @@ -114,54 +98,35 @@ namespace mln - /// Morpher providing an improved interface for labeled image. - /// - /// \tparam I The label image type. - /// - /// This image type allows to access every site set at a given - /// label. - /// - /// This image type guaranties that labels are contiguous (from 1 to - /// n). - /// - /// \ingroup modimageidmorpher - // - template <typename I> - class labeled_image - : public internal::image_identity< const I, mln_domain(I), labeled_image > + /*! \brief Base class Morpher providing an improved interface for + labeled image. + + \tparam I The label image type. + + This image type allows to access every site set at a given + label. + + This image type guaranties that labels are contiguous (from 1 to + n). + + */ + template <typename I, typename E> + class labeled_image_base + : public internal::image_identity< const I, mln_domain(I), E > { - typedef internal::image_identity< const I, mln_domain(I), labeled_image > + typedef internal::image_identity< const I, mln_domain(I), E > super_; public: - - /// Skeleton. - typedef labeled_image< tag::image_ > skeleton; - /// Type of the bounding component bounding boxes. typedef mln_result(accu::shape::bbox<mln_psite(I)>) bbox_t; /// Constructors /// @{ /// Constructor without argument. - labeled_image(); - - /// Constructor from an image \p ima and the number of labels \p nlabels. - labeled_image(const I& ima, const mln_value(I)& nlabels); - - /// Constructor from an image \p ima, the number of labels \p - /// nlabels and the object bounding boxes. - labeled_image(const I& ima, const mln_value(I)& nlabels, - const util::array<mln_box(I)>& bboxes); + labeled_image_base(); /// @} - /// Deferred initialization from a labeled image \p ima and the number - /// of labels \p nlabels. - void init_(const I& ima, const mln_value(I)& nlabels); - - /// Duplicate the underlying image and create a new labeled_image. - void init_from_(const labeled_image& model); - /// Relabel according to a function. /// @{ // @@ -182,9 +147,6 @@ namespace mln /// Return the number of labels; mln_value(I) nlabels() const; - /// Update bounding boxes information. - void update_(const fun::i2v::array<mln_value(I)>& relabel_fun); - /// Return the bounding box of the component \p label. const bbox_t& bbox(const mln_value(I)& label) const; @@ -195,27 +157,19 @@ namespace mln p_if<mln_box(I), fun::eq_v2b_expr_<pw::value_, pw::cst_<mln_value(I)> > > subdomain(const mln_value(I)& label) const; - }; - - - // init_ - - //FIXME: not enough generic? We would like 'J' instead of - // 'labeled_image'. - template <typename I, typename J> - void init_(tag::image_t, labeled_image& target, - const labeled_image<J>& model); - + protected: + /// Update bounding boxes information. + void update_data(const fun::i2v::array<mln_value(I)>& relabel_fun); - namespace make - { + template <typename F> + void relabel_(const Function_v2v<F>& f); - template <typename I> - mln::labeled_image - labeled_image(const Image& ima, const mln_value(I)& nlabels); + template <typename F> + void relabel_(const Function_v2b<F>& f); - } // end of namespace mln::make + void update_data_(const fun::i2v::array<mln_value(I)>& relabel_fun); + }; @@ -223,24 +177,24 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // internal::data< labeled_image > + // internal::data< labeled_image_base<I,E> > namespace internal { - // data< labeled_image > + // data< labeled_image_base<I,E> > - template <typename I> + template <typename I, typename E> inline - data< labeled_image >::data(const I& ima, const mln_value(I)& nlabels) + data< labeled_image_base<I,E> >::data(const I& ima, const mln_value(I)& nlabels) : ima_(ima), nlabels_(nlabels) { } - template <typename I> + template <typename I, typename E> inline - data< labeled_image >::data(const I& ima, const mln_value(I)& nlabels, + data< labeled_image_base<I,E> >::data(const I& ima, const mln_value(I)& nlabels, const util::array<mln_box(I)>& bboxes) : ima_(ima), nlabels_(nlabels), bboxes_(bboxes) { @@ -250,57 +204,18 @@ namespace mln } // end of namespace mln::internal - template <typename I> + template <typename I, typename E> inline - labeled_image::labeled_image() + labeled_image_base<I,E>::labeled_image_base() { } - template <typename I> - inline - labeled_image::labeled_image(const I& ima, const mln_value(I)& nlabels) - { - init_(ima, nlabels); - } - template <typename I> - inline - labeled_image::labeled_image(const I& ima, const mln_value(I)& nlabels, - const util::array<mln_box(I)>& bboxes) - { - mln_precondition(data::compute(accu::meta::stat::max(), ima) == nlabels); - this->data_ = new internal::data< labeled_image >(ima, nlabels, bboxes); - } - - - template <typename I> - inline - void - labeled_image::init_(const I& ima, const mln_value(I)& nlabels) - { - mln_precondition(data::compute(accu::meta::stat::max(), ima) == nlabels); - this->data_ = new internal::data< labeled_image >(ima, nlabels); - this->data_->bboxes_ = labeling::compute(accu::meta::shape::bbox(), - this->data_->ima_, - this->data_->nlabels_); - } - - template <typename I> - inline - void - labeled_image::init_from_(const labeled_image& model) - { - this->data_ - = new internal::data< labeled_image >(duplicate(model.hook_data_()->ima_), - model.nlabels()); - this->data_->bboxes_ = model.hook_data_()->bboxes_; - } - - template <typename I> + template <typename I, typename E> template <typename F> inline void - labeled_image::relabel(const Function_v2v<F>& f_) + labeled_image_base<I,E>::relabel(const Function_v2v<F>& f_) { const F& f = exact(f_); mln_value(I) new_nlabels; @@ -315,17 +230,18 @@ namespace mln this->data_->nlabels_ = new_nlabels; + exact(this)->relabel_(f); + /// We may have merged or deleted labels. - update_(packed_relabel_fun); + update_data(packed_relabel_fun); } - - template <typename I> + template <typename I, typename E> template <typename F> inline void - labeled_image::relabel(const Function_v2b<F>& f_) + labeled_image_base<I,E>::relabel(const Function_v2b<F>& f_) { const F& f = exact(f_); @@ -337,35 +253,24 @@ namespace mln labeling::relabel_inplace(this->data_->ima_, this->data_->nlabels_, fv2v); + exact(this)->relabel_(f); // Then, merge or delete bounding boxes according to this relabeling. - update_(fv2v); + update_data(fv2v); } - template <typename I> + template <typename I, typename E> inline mln_value(I) - labeled_image::nlabels() const + labeled_image_base<I,E>::nlabels() const { return this->data_->nlabels_; } - // init_ - - template <typename I, typename J> - void init_(tag::image_t, labeled_image& target, - const labeled_image<J>& model) - { - I ima; - init_(tag::image, ima, model); - target.init_(ima, model.nlabels()); - } - - - template <typename I> + template <typename I, typename E> void - labeled_image::update_(const fun::i2v::array<mln_value(I)>& relabel_fun) + labeled_image_base<I,E>::update_data(const fun::i2v::array<mln_value(I)>& relabel_fun) { util::array<accu::shape::bbox<mln_psite(I)> > new_bboxes(static_cast<unsigned>(this->data_->nlabels_) + 1); @@ -377,55 +282,68 @@ namespace mln convert::from_to(new_bboxes, this->data_->bboxes_); mln_assertion(new_bboxes.size() == this->data_->bboxes_.size()); + + exact(this)->update_data_(relabel_fun); } - template <typename I> - const typename labeled_image::bbox_t& - labeled_image::bbox(const mln_value(I)& label) const + template <typename I, typename E> + const typename labeled_image_base<I,E>::bbox_t& + labeled_image_base<I,E>::bbox(const mln_value(I)& label) const { return this->data_->bboxes_[label]; } - template <typename I> - const util::array<typename labeled_image::bbox_t>& - labeled_image::bboxes() const + template <typename I, typename E> + const util::array<typename labeled_image_base<I,E>::bbox_t>& + labeled_image_base<I,E>::bboxes() const { return this->data_->bboxes_; } - template <typename I> + template <typename I, typename E> p_if<mln_box(I), fun::eq_v2b_expr_<pw::value_, pw::cst_<mln_value(I)> > > - labeled_image::subdomain(const mln_value(I)& label) const + labeled_image_base<I,E>::subdomain(const mln_value(I)& label) const { return ((this->data_->ima_ | bbox(label)) | (pw::value(this->data_->ima_) == pw::cst(label))).domain(); } - // Make routines. - namespace make + template <typename I, typename E> + template <typename F> + void + labeled_image_base<I,E>::relabel_(const Function_v2v<F>& f) { + (void) f; + // No-Op. + } - template <typename I> - mln::labeled_image - labeled_image(const Image& ima, const mln_value(I)& nlabels) - { - mln_precondition(exact(ima).is_valid()); - mln::labeled_image tmp(exact(ima), nlabels); - return tmp; - } - - } // end of namespace mln::make + template <typename I, typename E> + template <typename F> + void + labeled_image_base<I,E>::relabel_(const Function_v2b<F>& f) + { + (void) f; + // No-Op. + } + template <typename I, typename E> + void + labeled_image_base<I,E>::update_data_( + const fun::i2v::array<mln_value(I)>& relabel_fun) + { + (void) relabel_fun; + // No-Op. + } # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln -#endif // ! MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_HH +#endif // ! MLN_CORE_IMAGE_IMORPH_LABELED_IMAGE_BASE_HH -- 1.5.6.5

14 years, 5 months

4724: Fix invalid macros.

by Guillaume Lazzara

* mln/core/box_runend_piter.hh, * mln/core/box_runstart_piter.hh: use mln_psite_ in macros dedicated for non templated functions. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/box_runend_piter.hh | 2 +- milena/mln/core/box_runstart_piter.hh | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9812f96..811c23e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix invalid macros. + + * mln/core/box_runend_piter.hh, + * mln/core/box_runstart_piter.hh: use mln_psite_ in macros + dedicated for non templated functions. + +2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove useless traces. * mln/geom/bbox.hh, diff --git a/milena/mln/core/box_runend_piter.hh b/milena/mln/core/box_runend_piter.hh index a0b1d32..e40760f 100644 --- a/milena/mln/core/box_runend_piter.hh +++ b/milena/mln/core/box_runend_piter.hh @@ -35,7 +35,7 @@ #define mln_box_runend_piter(I) typename mln::box_runend_piter<mln_psite(I)> -#define mln_box_runend_piter_(I) mln::box_runend_piter<mln_psite(I)> +#define mln_box_runend_piter_(I) mln::box_runend_piter<mln_psite_(I)> namespace mln diff --git a/milena/mln/core/box_runstart_piter.hh b/milena/mln/core/box_runstart_piter.hh index a777d1e..fafcc46 100644 --- a/milena/mln/core/box_runstart_piter.hh +++ b/milena/mln/core/box_runstart_piter.hh @@ -35,7 +35,7 @@ #define mln_box_runstart_piter(I) typename mln::box_runstart_piter<mln_psite(I)> -#define mln_box_runstart_piter_(I) mln::box_runstart_piter<mln_psite(I)> +#define mln_box_runstart_piter_(I) mln::box_runstart_piter<mln_psite_(I)> namespace mln -- 1.5.6.5

14 years, 5 months

4723: Remove useless traces.

by Guillaume Lazzara

* mln/geom/bbox.hh, * mln/geom/max_col.hh, * mln/geom/max_row.hh, * mln/geom/max_sli.hh, * mln/geom/min_col.hh, * mln/geom/min_row.hh, * mln/geom/min_sli.hh, * mln/geom/ncols.hh, * mln/geom/nrows.hh, * mln/geom/nslis.hh: Remove useless traces. --- milena/ChangeLog | 15 +++++++++++++++ milena/mln/geom/bbox.hh | 16 +++------------- milena/mln/geom/max_col.hh | 9 ++------- milena/mln/geom/max_row.hh | 9 ++------- milena/mln/geom/max_sli.hh | 6 ++---- milena/mln/geom/min_col.hh | 9 ++------- milena/mln/geom/min_row.hh | 9 ++------- milena/mln/geom/min_sli.hh | 6 ++---- milena/mln/geom/ncols.hh | 9 ++------- milena/mln/geom/nrows.hh | 9 ++------- milena/mln/geom/nslis.hh | 6 ++---- 11 files changed, 36 insertions(+), 67 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e97d05..9812f96 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove useless traces. + + * mln/geom/bbox.hh, + * mln/geom/max_col.hh, + * mln/geom/max_row.hh, + * mln/geom/max_sli.hh, + * mln/geom/min_col.hh, + * mln/geom/min_row.hh, + * mln/geom/min_sli.hh, + * mln/geom/ncols.hh, + * mln/geom/nrows.hh, + * mln/geom/nslis.hh: Remove useless traces. + +2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve influence zone geodesic. * mln/canvas/distance_geodesic.hh: Remove useless traces. diff --git a/milena/mln/geom/bbox.hh b/milena/mln/geom/bbox.hh index 0ec374a..2a727e0 100644 --- a/milena/mln/geom/bbox.hh +++ b/milena/mln/geom/bbox.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -34,7 +35,7 @@ * \todo Re-activate precondition so introduce * "set::nsites(Site_Set)"... * - * \todo Add a static check "domain is ok for bbox (like grid)". + * \todo Add a static check "domain is ok for bbox (like grid)". * * \todo Add the weighted_window case. */ @@ -120,34 +121,27 @@ namespace mln inline box<mln_site(S)> bbox(const Site_Set<S>& pset) { - trace::entering("geom::bbox"); // mln_precondition(set::is_empty(pset) != 0); box<mln_site(S)> b = impl::bbox_(mln_trait_site_set_bbox(S)(), exact(pset)); - trace::exiting("geom::bbox"); return b; } template <typename I> box<mln_site(I)> bbox(const Image& ima_) { - trace::entering("geom::bbox"); - const I& ima = exact(ima_); mln_precondition(ima.is_valid()); box<mln_site(I)> b = geom::bbox(ima.domain()); - trace::exiting("geom::bbox"); return b; } template <typename W> box<mln_psite(W)> bbox(const Window<W>& win) { - trace::entering("geom::bbox"); - typedef mln_psite(W) P; accu::shape::bbox b; P O = literal::origin; @@ -155,18 +149,14 @@ namespace mln for_all(q) b.take(q); - trace::exiting("geom::bbox"); return b; } template <typename W> box<mln_psite(W)> bbox(const Weighted_Window<W>& win) { - trace::entering("geom::bbox"); - box<mln_psite(W)> b = bbox(exact(win).win()); - trace::exiting("geom::bbox"); return b; } diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index 7e600ce..36eb213 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,12 +55,9 @@ namespace mln inline mln_deduce(I, site, coord) max_col(const Image& ima) { - trace::entering("mln::geom::max_col"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxcol = geom::bbox(ima).pmax().col(); - trace::exiting("mln::geom::max_col"); return maxcol; } @@ -68,12 +66,9 @@ namespace mln inline mln_deduce(B, point, coord) max_col(const Box& b) { - trace::entering("mln::geom::max_col"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) maxcol = exact(b).pmax().col(); - trace::exiting("mln::geom::max_col"); return maxcol; } diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index 04689e8..6519906 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,12 +56,9 @@ namespace mln inline mln_deduce(I, site, coord) max_row(const Image& ima) { - trace::entering("mln::geom::max_row"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxrow = geom::bbox(ima).pmax().row(); - trace::exiting("mln::geom::max_row"); return maxrow; } @@ -69,12 +67,9 @@ namespace mln inline mln_deduce(B, point, coord) max_row(const Box& b) { - trace::entering("mln::geom::max_row"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) maxrow = exact(b).pmax().row(); - trace::exiting("mln::geom::max_row"); return maxrow; } diff --git a/milena/mln/geom/max_sli.hh b/milena/mln/geom/max_sli.hh index b0c541c..cf4fc51 100644 --- a/milena/mln/geom/max_sli.hh +++ b/milena/mln/geom/max_sli.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -51,12 +52,9 @@ namespace mln inline mln_deduce(I, site, coord) max_sli(const Image& ima) { - trace::entering("mln::geom::max_sli"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) maxsli = geom::bbox(ima).pmax().sli(); - trace::exiting("mln::geom::max_sli"); return maxsli; } diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index 2cdc052..373237e 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,12 +56,9 @@ namespace mln inline mln_deduce(I, site, coord) min_col(const Image& ima) { - trace::entering("mln::geom::min_col"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) mincol = geom::bbox(ima).pmin().col(); - trace::exiting("mln::geom::min_col"); return mincol; } @@ -69,12 +67,9 @@ namespace mln inline mln_deduce(B, point, coord) min_col(const Box& b) { - trace::entering("mln::geom::min_col"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) mincol = exact(b).pmin().col(); - trace::exiting("mln::geom::min_col"); return mincol; } diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index ad8c8b7..ec833c3 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -58,12 +59,9 @@ namespace mln inline mln_deduce(I, site, coord) min_row(const Image& ima) { - trace::entering("mln::geom::min_row"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) minrow = geom::bbox(ima).pmin().row(); - trace::exiting("mln::geom::min_row"); return minrow; } @@ -72,12 +70,9 @@ namespace mln inline mln_deduce(B, point, coord) min_row(const Box& b) { - trace::entering("mln::geom::min_row"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); mln_deduce(B, point, coord) minrow = exact(b).pmin().row(); - trace::exiting("mln::geom::min_row"); return minrow; } diff --git a/milena/mln/geom/min_sli.hh b/milena/mln/geom/min_sli.hh index 7b07a8c..87d6571 100644 --- a/milena/mln/geom/min_sli.hh +++ b/milena/mln/geom/min_sli.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -51,12 +52,9 @@ namespace mln inline mln_deduce(I, site, coord) min_sli(const Image& ima) { - trace::entering("mln::geom::min_sli"); - mln_precondition(exact(ima).is_valid()); mln_deduce(I, site, coord) minsli = geom::bbox(ima).pmin().sli(); - trace::exiting("mln::geom::min_sli"); return minsli; } diff --git a/milena/mln/geom/ncols.hh b/milena/mln/geom/ncols.hh index 4e062ce..bc4a09b 100644 --- a/milena/mln/geom/ncols.hh +++ b/milena/mln/geom/ncols.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,12 +56,9 @@ namespace mln inline unsigned ncols(const Image& ima) { - trace::entering("mln::geom::ncols"); - mln_precondition(exact(ima).is_valid()); unsigned ncols = geom::max_col(ima) - geom::min_col(ima) + 1; - trace::exiting("mln::geom::ncols"); return ncols; } @@ -68,12 +66,9 @@ namespace mln template <typename B> unsigned ncols(const Box& b) { - trace::entering("mln::geom::ncols"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); unsigned ncols = geom::max_col(b) - geom::min_col(b) + 1; - trace::exiting("mln::geom::ncols"); return ncols; } diff --git a/milena/mln/geom/nrows.hh b/milena/mln/geom/nrows.hh index b7892c8..040ca57 100644 --- a/milena/mln/geom/nrows.hh +++ b/milena/mln/geom/nrows.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -55,24 +56,18 @@ namespace mln inline unsigned nrows(const Image& ima) { - trace::entering("mln::geom::nrows"); - mln_precondition(exact(ima).is_valid()); unsigned nrows = geom::max_row(ima) - geom::min_row(ima) + 1; - trace::exiting("mln::geom::nrows"); return nrows; } template <typename B> unsigned nrows(const Box& b) { - trace::entering("mln::geom::nrows"); - metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); unsigned nrows = geom::max_row(b) - geom::min_row(b) + 1; - trace::exiting("mln::geom::nrows"); return nrows; } diff --git a/milena/mln/geom/nslis.hh b/milena/mln/geom/nslis.hh index 42c1899..d6953da 100644 --- a/milena/mln/geom/nslis.hh +++ b/milena/mln/geom/nslis.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -51,12 +52,9 @@ namespace mln inline unsigned nslis(const Image& ima) { - trace::entering("mln::geom::nslis"); - mln_precondition(exact(ima).is_valid()); unsigned nslis = geom::max_sli(ima) - geom::min_sli(ima) + 1; - trace::exiting("mln::geom::nslis"); return nslis; } -- 1.5.6.5

14 years, 5 months

4722: Improve influence zone geodesic.

by Guillaume Lazzara

* mln/canvas/distance_geodesic.hh: Remove useless traces. * mln/transform/influence_zone_geodesic.hh: Add a specific fastest version and move some code... * mln/transform/influence_zone_geodesic_saturated.hh: ... here. * tests/transform/influence_zone_geodesic.cc: Update test according to the new interface. * tests/transform/Makefile.am, * tests/transform/influence_zone_geodesic_saturated.cc: New test. --- milena/ChangeLog | 17 ++ milena/mln/canvas/distance_geodesic.hh | 56 +++--- milena/mln/transform/influence_zone_geodesic.hh | 194 ++++++++++++++++---- ...sic.hh => influence_zone_geodesic_saturated.hh} | 52 ++--- milena/tests/transform/Makefile.am | 6 +- milena/tests/transform/influence_zone_geodesic.cc | 4 +- ...sic.cc => influence_zone_geodesic_saturated.cc} | 6 +- 7 files changed, 232 insertions(+), 103 deletions(-) copy milena/mln/transform/{influence_zone_geodesic.hh => influence_zone_geodesic_saturated.hh} (65%) copy milena/tests/transform/{influence_zone_geodesic.cc => influence_zone_geodesic_saturated.cc} (90%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f835a42..1e97d05 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve influence zone geodesic. + + * mln/canvas/distance_geodesic.hh: Remove useless traces. + + * mln/transform/influence_zone_geodesic.hh: Add a specific fastest + version and move some code... + + * mln/transform/influence_zone_geodesic_saturated.hh: ... here. + + * tests/transform/influence_zone_geodesic.cc: Update test + according to the new interface. + + * tests/transform/Makefile.am, + * tests/transform/influence_zone_geodesic_saturated.cc: New test. + 2009-11-09 Guillaume Lazzara <z(a)lrde.epita.fr> Add box_runend_piter. diff --git a/milena/mln/canvas/distance_geodesic.hh b/milena/mln/canvas/distance_geodesic.hh index 813e8fc..e833f08 100644 --- a/milena/mln/canvas/distance_geodesic.hh +++ b/milena/mln/canvas/distance_geodesic.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -51,8 +52,8 @@ namespace mln template <typename I, typename N, typename D, typename F> mln_ch_value(I, D) - distance_geodesic(const Image& input, const Neighborhood<N>& nbh, D max, - F& functor); + distance_geodesic(const Image& input, const Neighborhood<N>& nbh, + D max, F& functor); @@ -67,7 +68,8 @@ namespace mln template <typename I, typename N, typename D, typename F> void - distance_geodesic_tests(const Image& input_, const Neighborhood<N>& nbh_, D max, + distance_geodesic_tests(const Image& input_, + const Neighborhood<N>& nbh_, D max, F& functor) { const I& input = exact(input_); @@ -98,8 +100,8 @@ namespace mln template <typename I, typename N, typename D, typename F> mln_ch_value(I, D) - distance_geodesic(const Image& input_, const Neighborhood<N>& nbh_, D max, - F& functor) + distance_geodesic(const Image& input_, const Neighborhood<N>& nbh_, + D max, F& functor) { trace::entering("canvas::impl::generic::distance_geodesic"); @@ -119,8 +121,6 @@ namespace mln // Initialization. { - trace::entering("initialization"); - functor.init(input); // <-- init data::fill(dmap, max); @@ -139,12 +139,10 @@ namespace mln break; } } - trace::exiting("initialization"); } // Propagation. { - trace::entering("propagation"); P p; mln_niter(N) n(nbh, p); while (! q.is_empty()) @@ -164,7 +162,6 @@ namespace mln q.push(n); } } - trace::exiting("propagation"); } trace::exiting("canvas::impl::generic::distance_geodesic"); @@ -180,8 +177,10 @@ namespace mln template <typename I, typename N, typename D, typename F> mln_ch_value(I, D) - distance_geodesic_fastest(const Image& input_, const Neighborhood<N>& nbh_, D max, - F& functor) + distance_geodesic_fastest(const Image& input_, + const Neighborhood<N>& nbh_, + D max, + F& functor) { trace::entering("canvas::impl::distance_geodesic_fastest"); @@ -199,8 +198,6 @@ namespace mln // Initialization. { - trace::entering("initialization"); - functor.init_(input); // <-- init data::fill(dmap, max); // For the extension to be ignored: @@ -221,13 +218,10 @@ namespace mln break; } } - - trace::exiting("initialization"); } // Propagation. { - trace::entering("propagation"); unsigned p; util::array<int> dp = offsets_wrt(input, nbh); @@ -251,9 +245,8 @@ namespace mln } } } - trace::exiting("propagation"); } - + trace::exiting("canvas::impl::distance_geodesic_fastest"); return dmap; } @@ -272,9 +265,10 @@ namespace mln typename F> inline mln_ch_value(I, D) - distance_geodesic_dispatch(metal::false_, - const Image& input, const Neighborhood<N>& nbh, D max, - F& functor) + distance_geodesic_dispatch(metal::false_, + const Image& input, + const Neighborhood<N>& nbh, D max, + F& functor) { return impl::generic::distance_geodesic(input, nbh, max, functor); @@ -284,9 +278,10 @@ namespace mln typename F> inline mln_ch_value(I, D) - distance_geodesic_dispatch(metal::true_, - const Image& input, const Neighborhood<N>& nbh, D max, - F& functor) + distance_geodesic_dispatch(metal::true_, + const Image& input, + const Neighborhood<N>& nbh, D max, + F& functor) { return impl::distance_geodesic_fastest(input, nbh, max, functor); // return impl::generic::distance_geodesic(input, nbh, max, @@ -297,8 +292,9 @@ namespace mln typename F> inline mln_ch_value(I, D) - distance_geodesic_dispatch(const Image& input, const Neighborhood<N>& nbh, D max, - F& functor) + distance_geodesic_dispatch(const Image& input, + const Neighborhood<N>& nbh, D max, + F& functor) { enum { test = mlc_equal(mln_trait_image_speed(I), @@ -322,8 +318,8 @@ namespace mln typename F> inline mln_ch_value(I, D) - distance_geodesic(const Image& input, const Neighborhood<N>& nbh, D max, - F& functor) + distance_geodesic(const Image& input, const Neighborhood<N>& nbh, + D max, F& functor) { trace::entering("canvas::distance_geodesic"); diff --git a/milena/mln/transform/influence_zone_geodesic.hh b/milena/mln/transform/influence_zone_geodesic.hh index f500bcf..4d7255a 100644 --- a/milena/mln/transform/influence_zone_geodesic.hh +++ b/milena/mln/transform/influence_zone_geodesic.hh @@ -30,6 +30,7 @@ /// /// Geodesic influence zone transform. +# include <mln/extension/adjust.hh> # include <mln/canvas/distance_geodesic.hh> # include <mln/transform/internal/influence_zone_functor.hh> @@ -44,26 +45,9 @@ namespace mln /// /// \param[in] input An image. /// \param[in] nbh A neighborhood. - /// \param[in] max The maximum influence zone distance. - /// \param[in] background_value The value used as background (i.e. - /// not propagated). /// /// \return An image of influence zone. // - template <typename I, typename N, typename D> - mln_concrete(I) - influence_zone_geodesic(const Image& input, - const Neighborhood<N>& nbh, - const D& max, const mln_value(I)& background_value); - - /// \overload - template <typename I, typename N, typename D> - mln_concrete(I) - influence_zone_geodesic(const Image& input, - const Neighborhood<N>& nbh, const D& max); - - - /// \overload template <typename I, typename N> mln_concrete(I) influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh); @@ -73,38 +57,176 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I, typename N, typename D> - mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh, - const D& max, const mln_value(I)& background_value) + namespace internal { - trace::entering("transform::influence_zone_geodesic"); - mln_precondition(exact(input).is_valid()); - mln_precondition(exact(nbh).is_valid()); + template <typename I, typename N> + void + influence_zone_geodesic_tests(const Image& input, + const Neighborhood<N>& nbh) + { + mln_precondition(exact(input).is_valid()); + mln_precondition(exact(nbh).is_valid()); - internal::influence_zone_functor f(background_value); - (void) mln::canvas::distance_geodesic(input, nbh, max, f); + (void) input; + (void) nbh; + } - trace::exiting("transform::influence_zone_geodesic"); - return f.output; - } + } // end of namespace mln::transform::internal - template <typename I, typename N, typename D> - mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh, - const D& max) + namespace impl + { + + namespace generic + { + + template <typename I, typename N> + mln_concrete(I) + influence_zone_geodesic(const Image& input, + const Neighborhood<N>& nbh) + { + // FIXME: To be written... + mlc_abort(I)::check(); + } + + } // end of namespace mln::transform::impl::generic + + + template <typename I, typename N> + mln_concrete(I) + influence_zone_geodesic_fastest(const Image& input_, + const Neighborhood<N>& nbh_) + { + trace::entering("transform::impl::influence_zone_geodesic_fastest"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + internal::influence_zone_geodesic_tests(input, nbh); + mln_precondition(input.domain().pmin() == literal::origin); + + std::queue<mln_value(I)*> q; + mln_concrete(I) output; + + util::array<int> dp = offsets_wrt(input, nbh); + const unsigned n_nbhs = dp.nelements(); + const unsigned + ncols = input.ncols(), + first_offset = input.border() * (ncols + 2 * input.border() + 1); + + // Initialization. + { + extension::adjust(input, nbh); + output = duplicate(input); + // For the extension to be ignored: + extension::fill(input, 0); // in initialization + extension::fill(output, 1); // in propagation + + const unsigned nelts = input.nelements(); + const mln_value(I)* p_i = & input.at_(0, 0); + mln_value(I)* p_o = & output.at_(0, 0); + for (unsigned i = first_offset; i < nelts; ++i, ++p_i, ++p_o) + { + if (*p_i == 0) + continue; + for (unsigned j = 0; j < n_nbhs; ++j) + { + const mln_value(I)* n_i = p_i + dp[j]; + if (*n_i == 0) + { + q.push(p_o); + break; + } + } + } + + } + + // Propagation. + { + mln_value(I)* ptr; + + while (! q.empty()) + { + ptr = q.front(); + q.pop(); + mln_invariant(*ptr != 0); + for (unsigned j = 0; j < n_nbhs; ++j) + { + mln_value(I)* ntr = ptr + dp[j]; + if (*ntr == 0) + { + *ntr = *ptr; + q.push(ntr); + } + } + } + } + + trace::exiting("transform::impl::influence_zone_geodesic_fastest"); + return output; + } + + + } // end of namespace mln::transform::impl + + + namespace internal { - return influence_zone_geodesic(input, nbh, max, literal::zero); - } + + template <typename I, typename N> + mln_concrete(I) + influence_zone_geodesic_dispatch(trait::image::value_alignment::any, + trait::image::value_storage::any, + trait::image::value_access::any, + const I& input, + const N& nbh) + { + return impl::generic::influence_zone_geodesic(input, nbh); + } + + + template <typename I, typename N> + mln_concrete(I) + influence_zone_geodesic_dispatch(trait::image::value_alignment::with_grid, + trait::image::value_storage::one_block, + trait::image::value_access::direct, + const I& input, + const N& nbh) + { + return impl::influence_zone_geodesic_fastest(input, nbh); + } + + + template <typename I, typename N> + mln_concrete(I) + influence_zone_geodesic_dispatch(const Image& input, + const Neighborhood<N>& nbh) + { + return + influence_zone_geodesic_dispatch(mln_trait_image_value_alignment(I)(), + mln_trait_image_value_storage(I)(), + mln_trait_image_value_access(I)(), + exact(input), exact(nbh)); + } + + } // end of namespace mln::transform::internal template <typename I, typename N> mln_concrete(I) influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh) { - return influence_zone_geodesic(input, nbh, mln_max(unsigned)); + trace::entering("transform::influence_zone_geodesic"); + + internal::influence_zone_geodesic_tests(input, nbh); + + mln_concrete(I) + output = internal::influence_zone_geodesic_dispatch(input, nbh); + + trace::exiting("transform::influence_zone_geodesic"); + return output; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/transform/influence_zone_geodesic.hh b/milena/mln/transform/influence_zone_geodesic_saturated.hh similarity index 65% copy from milena/mln/transform/influence_zone_geodesic.hh copy to milena/mln/transform/influence_zone_geodesic_saturated.hh index f500bcf..5a29858 100644 --- a/milena/mln/transform/influence_zone_geodesic.hh +++ b/milena/mln/transform/influence_zone_geodesic_saturated.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_HH -# define MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_HH +#ifndef MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_SATURATED_HH +# define MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_SATURATED_HH /// \file /// @@ -52,22 +52,17 @@ namespace mln // template <typename I, typename N, typename D> mln_concrete(I) - influence_zone_geodesic(const Image& input, - const Neighborhood<N>& nbh, - const D& max, const mln_value(I)& background_value); + influence_zone_geodesic_saturated(const Image& input, + const Neighborhood<N>& nbh, + const D& max, + const mln_value(I)& background_value); /// \overload template <typename I, typename N, typename D> mln_concrete(I) - influence_zone_geodesic(const Image& input, - const Neighborhood<N>& nbh, const D& max); - - - /// \overload - template <typename I, typename N> - mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh); - + influence_zone_geodesic_saturated(const Image& input, + const Neighborhood<N>& nbh, + const D& max); # ifndef MLN_INCLUDE_ONLY @@ -75,10 +70,12 @@ namespace mln template <typename I, typename N, typename D> mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh, - const D& max, const mln_value(I)& background_value) + influence_zone_geodesic_saturated(const Image& input, + const Neighborhood<N>& nbh, + const D& max, + const mln_value(I)& background_value) { - trace::entering("transform::influence_zone_geodesic"); + trace::entering("transform::influence_zone_geodesic_saturated"); mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -86,25 +83,18 @@ namespace mln internal::influence_zone_functor f(background_value); (void) mln::canvas::distance_geodesic(input, nbh, max, f); - trace::exiting("transform::influence_zone_geodesic"); + trace::exiting("transform::influence_zone_geodesic_saturated"); return f.output; } template <typename I, typename N, typename D> mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh, - const D& max) - { - return influence_zone_geodesic(input, nbh, max, literal::zero); - } - - - template <typename I, typename N> - mln_concrete(I) - influence_zone_geodesic(const Image& input, const Neighborhood<N>& nbh) + influence_zone_geodesic_saturated(const Image& input, + const Neighborhood<N>& nbh, + const D& max) { - return influence_zone_geodesic(input, nbh, mln_max(unsigned)); + return influence_zone_geodesic_saturated(input, nbh, max, literal::zero); } # endif // ! MLN_INCLUDE_ONLY @@ -114,4 +104,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_HH +#endif // ! MLN_TRANSFORM_INFLUENCE_ZONE_GEODESIC_SATURATED_HH diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 3cc36e8..07feb9b 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -25,15 +25,19 @@ check_PROGRAMS = \ distance_front \ distance_geodesic \ hough \ + kht \ influence_zone_front \ - influence_zone_geodesic + influence_zone_geodesic \ + influence_zone_geodesic_saturated bench_closest_point_geodesic_SOURCES = bench_closest_point_geodesic.cc distance_and_closest_point_geodesic_SOURCES = distance_and_closest_point_geodesic.cc distance_front_SOURCES = distance_front.cc distance_geodesic_SOURCES = distance_geodesic.cc hough_SOURCES = hough.cc +kht_SOURCES = kht.cc influence_zone_front_SOURCES = influence_zone_front.cc influence_zone_geodesic_SOURCES = influence_zone_geodesic.cc +influence_zone_geodesic_saturated_SOURCES = influence_zone_geodesic_saturated.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/transform/influence_zone_geodesic.cc b/milena/tests/transform/influence_zone_geodesic.cc index 56a4461..682c1e1 100644 --- a/milena/tests/transform/influence_zone_geodesic.cc +++ b/milena/tests/transform/influence_zone_geodesic.cc @@ -39,7 +39,7 @@ int main() int_u8 vals[] = { 1, 1, 0, 0, 0, 0, 3, - 1, 1, 1, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, @@ -47,6 +47,6 @@ int main() 0, 0, 0, 0, 0, 0, 0 }; image2d<int_u8> input = make::image2d(vals); - image2d<int_u8> output = transform::influence_zone_geodesic(input, c4(), int_u8(2)); + image2d<int_u8> output = transform::influence_zone_geodesic(input, c4()); debug::println(output); } diff --git a/milena/tests/transform/influence_zone_geodesic.cc b/milena/tests/transform/influence_zone_geodesic_saturated.cc similarity index 90% copy from milena/tests/transform/influence_zone_geodesic.cc copy to milena/tests/transform/influence_zone_geodesic_saturated.cc index 56a4461..e925b59 100644 --- a/milena/tests/transform/influence_zone_geodesic.cc +++ b/milena/tests/transform/influence_zone_geodesic_saturated.cc @@ -29,7 +29,7 @@ #include <mln/make/image2d.hh> #include <mln/debug/println.hh> -#include <mln/transform/influence_zone_geodesic.hh> +#include <mln/transform/influence_zone_geodesic_saturated.hh> int main() @@ -39,7 +39,7 @@ int main() int_u8 vals[] = { 1, 1, 0, 0, 0, 0, 3, - 1, 1, 1, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, @@ -47,6 +47,6 @@ int main() 0, 0, 0, 0, 0, 0, 0 }; image2d<int_u8> input = make::image2d(vals); - image2d<int_u8> output = transform::influence_zone_geodesic(input, c4(), int_u8(2)); + image2d<int_u8> output = transform::influence_zone_geodesic_saturated(input, c4(), int_u8(2)); debug::println(output); } -- 1.5.6.5

14 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches November 2009