Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

oln 10.189: Change functions to functors

by Damien Thivolle

Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/transforms/shapelets.hh: Change functions to functors, bug fixes. Index: olena/oln/transforms/shapelets.hh --- olena/oln/transforms/shapelets.hh Sun, 06 Jun 2004 23:17:15 +0200 thivol_d (oln/r/10_shapelets. 1.1 600) +++ olena/oln/transforms/shapelets.hh Mon, 07 Jun 2004 19:39:27 +0200 thivol_d (oln/r/10_shapelets. 1.2 600) @@ -7,71 +7,89 @@ #include <oln/core/point2d.hh> #include <oln/level/fill.hh> #include <vector> +#include <bits/stl_function.h> namespace oln { - inline double - hermite(int n, double x) + namespace internal + { + template <class T> + struct hermite : public std::binary_function<T, int, T> + { + T operator()(unsigned n, T x) { - assert(n >= 0); if (n == 0) return 1; if (n == 1) return 2. * x; - return 2. * (x * hermite(n - 1, x) - (n - 1) * hermite(n - 2, x)); + return 2. * x * (*this)(n - 1, x) - 2. * double(n - 1) * (*this)(n - 2, x); } + }; - inline double - fact(double n) + template <class T> + struct fact : public std::unary_function<T, T> + { + T operator() (T n) { precondition(n >= 0); + T res = 1; - double res = n; - - if (n <= 1) - return 1; - while (n > 1) + while (n > 0) { res *= n; n--; } return res; } + }; - inline double - beta(int n, double x) + template <class T> + struct shapelets_beta : public std::binary_function<T, int, T> + { + T operator()(int n, T x) { assert(n >= 0); - const double c = sqrt(pow(2., n) * sqrt(M_PI) * fact(n)); + const double c = sqrt(pow(2.0, n) * sqrt(M_PI) * T(fact<int>()(n))); - assert(finite(hermite(n, x) * exp(x * x / -2.0) / c)); - return hermite(n, x) * exp(x * x / -2.0) / c; + return hermite<T>()(n, x) * exp(x * x / -2.0) / c; } + }; + template <unsigned Dim, class T> + struct shapelets_basis + { + }; - - inline double - shapelet_basis_1d(int n, point1d p, double b) + template <class T> + struct shapelets_basis<1, T> + { + T operator() (int n, point1d p, T b) { assert(n >= 0 && b >= 0); - return beta(n, p.col() / b) / sqrt(b); + return shapelets_beta<T>(n, p.col() / b) / sqrt(b); } + }; - double - shapelet_basis_2d(int m, int n, point2d p, double b) + template <class T> + struct shapelets_basis<2, T> + { + T operator() (int m, int n, T x, T y, T b) { assert(m >= 0 && n >= 0 && b >= 0); - return beta(m, p.col() / b) * beta(n, p.row() / b) / b; + return shapelets_beta<T>()(m, x / b) * shapelets_beta<T>()(n, y / b) / b; } + }; + //FIXME: ima should be non_vectorial template <class I> std::vector<double> - to_shapelet_basis_2d(const oln::abstract::image_with_dim<2, I>& ima, + shapelets(const oln::abstract::image_with_dim<2, I>& ima, int m, int n, double b) { assert(m >= 0 && n >= 0 && b >= 0); + shapelets_basis<2, double> func; // Center of the image const int col = ima.ncols() / 2; @@ -90,7 +108,7 @@ for_all(it) { s += (ima[it] - ntg_max_val(oln_value_type(I)) / 2) * - shapelet_basis_2d(k, l, point2d(it.row() - row, it.col() - col), b); + func(k, l, double(it.row() - row), double(it.col() - col), b); } res[k * n + l] = s; } @@ -120,18 +138,20 @@ // Add the value at the point for_all(it) resf[it] += vec[k * n + l] * - shapelet_basis_2d(k, l, point2d(it.row() - nrows / 2, it.col() - ncols / 2), b); + shapelets_basis<2, double>()(k, l, double(it.row() - nrows / 2), double(it.col() - ncols / 2), b); image2d<D> res(oln::image2d_size(nrows, ncols, 0)); for_all(it) { - if ( !(resf[it] >= 0 && resf[it] < 256)) + if ( !(resf[it] >= 0 && resf[it] <= 255)) { - std::cout << "err:" << resf[it] << std::endl; + std::cout << "- "; + std::cout << "err:" << resf[it]; // min = (resf[it] < min)? resf[it]:min; // max = (resf[it] >max)? resf[it]:max; res[it] = resf[it] < 0 ? 0 : ntg_max_val(D); + std::cout << " -" << std::endl; } else res[it] = resf[it]; @@ -142,3 +162,4 @@ } } +} -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 6 months

oln 10.188: Add shapelets tranforms

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * config/oln.m4: Add detection of Doxygen 1.3.7 Index: olena/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * oln/transforms/shapelets.hh: Add file, it contains the shapelets transforms implementation for olena. * oln/makefile.src: Add oln/transforms/shapelets.hh to the distribution's files. Index: config/oln.m4 --- config/oln.m4 Wed, 14 Apr 2004 20:42:25 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.5 640) +++ config/oln.m4 Sun, 06 Jun 2004 23:02:13 +0200 thivol_d (oln/j/15_oln.m4 1.38.1.5 640) @@ -348,7 +348,7 @@ [dnl AC_CACHE_CHECK([for doxygen >= 1.3.4], [ac_cv_doxygen_version], - [if $DOXYGEN --version 2>&1 | grep ['1.3.[456]'] > /dev/null 2>&1; then + [if $DOXYGEN --version 2>&1 | grep ['1.3.[4567]'] > /dev/null 2>&1; then ac_cv_doxygen_version=recent else ac_cv_doxygen_version=old Index: olena/oln/makefile.src --- olena/oln/makefile.src Tue, 13 Apr 2004 13:42:44 +0200 palma_g (oln/r/4_makefile.s 1.1 644) +++ olena/oln/makefile.src Sun, 06 Jun 2004 23:11:13 +0200 thivol_d (oln/r/4_makefile.s 1.1 644) @@ -212,6 +212,7 @@ transforms/fft.hh \ transforms/dwt.hh \ transforms/wavelet_coeffs.hh \ + transforms/shapelets.hh \ utils/copy.hh \ utils/key.hh \ utils/key.hxx \ Index: olena/oln/transforms/shapelets.hh --- olena/oln/transforms/shapelets.hh Sun, 06 Jun 2004 23:15:43 +0200 thivol_d () +++ olena/oln/transforms/shapelets.hh Sun, 06 Jun 2004 23:07:28 +0200 thivol_d (oln/r/10_shapelets. 644) @@ -0,0 +1,144 @@ +#include <ntg/int.hh> +#include <oln/basics2d.hh> + + +#include <oln/core/image.hh> +#include <oln/core/point1d.hh> +#include <oln/core/point2d.hh> +#include <oln/level/fill.hh> +#include <vector> + +namespace oln +{ + inline double + hermite(int n, double x) + { + assert(n >= 0); + if (n == 0) + return 1; + if (n == 1) + return 2. * x; + return 2. * (x * hermite(n - 1, x) - (n - 1) * hermite(n - 2, x)); + } + + inline double + fact(double n) + { + precondition(n >= 0); + + double res = n; + + if (n <= 1) + return 1; + while (n > 1) + { + res *= n; + n--; + } + return res; + } + + inline double + beta(int n, double x) + { + assert(n >= 0); + const double c = sqrt(pow(2., n) * sqrt(M_PI) * fact(n)); + + assert(finite(hermite(n, x) * exp(x * x / -2.0) / c)); + return hermite(n, x) * exp(x * x / -2.0) / c; + } + + + + inline double + shapelet_basis_1d(int n, point1d p, double b) + { + assert(n >= 0 && b >= 0); + return beta(n, p.col() / b) / sqrt(b); + } + + double + shapelet_basis_2d(int m, int n, point2d p, double b) + { + assert(m >= 0 && n >= 0 && b >= 0); + return beta(m, p.col() / b) * beta(n, p.row() / b) / b; + } + + //FIXME: ima should be non_vectorial + template <class I> + std::vector<double> + to_shapelet_basis_2d(const oln::abstract::image_with_dim<2, I>& ima, + int m, int n, + double b) + { + assert(m >= 0 && n >= 0 && b >= 0); + + // Center of the image + const int col = ima.ncols() / 2; + const int row = ima.nrows() / 2; + + std::vector<double> res(m * n); + + // For all vector in the base of shapelets + for (int k = 0; k < m; k++) + for (int l = 0; l < n; l++) + // res[k * n + l] = scalar product of the image and the function + { + double s = 0.0; + + oln_iter_type(I) it(ima); + for_all(it) + { + s += (ima[it] - ntg_max_val(oln_value_type(I)) / 2) * + shapelet_basis_2d(k, l, point2d(it.row() - row, it.col() - col), b); + } + res[k * n + l] = s; + } + return res; + } + + + template <class D> + image2d<D> + unshapelets(const std::vector<double> &vec, + int m, int n, double b, + coord nrows, coord ncols) + { + precondition(nrows >= 1 && ncols >= 1 && + m >= 0 && n >= 0 && b >= 0); + + + typedef image2d<double> tmp_type; + tmp_type resf(oln::image2d_size(nrows, ncols, 0)); + + oln_iter_type(tmp_type) it(resf); + + oln::level::fill(resf, ntg_max_val(D) / 2 ); + // For each vector + for (int k = 0; k < m; k++) + for (int l = 0; l < n; l++) + // Add the value at the point + for_all(it) + resf[it] += vec[k * n + l] * + shapelet_basis_2d(k, l, point2d(it.row() - nrows / 2, it.col() - ncols / 2), b); + + image2d<D> res(oln::image2d_size(nrows, ncols, 0)); + + for_all(it) + { + if ( !(resf[it] >= 0 && resf[it] < 256)) + { + std::cout << "err:" << resf[it] << std::endl; +// min = (resf[it] < min)? resf[it]:min; +// max = (resf[it] >max)? resf[it]:max; + res[it] = resf[it] < 0 ? 0 : ntg_max_val(D); + } + else + res[it] = resf[it]; + } + // std::cout << "min:" << min + // << " max:" << max << std::endl; + return res; + } + +} -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 6 months

oln: 10.187: Correction for the previous patch.

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/utils/qsort.hh: Add file. * oln/utils/histogram.hh: Undo wrong fix. +2004-05-23 Giovanni Palma <giovanni(a)lrde.epita.fr> + + * oln/morpho/morpho/erosion.hh: Remove useless line. * oln/morpho/attribute_union_find.hh: Change sort algorithm. * oln/morpho/attributes.hh: Add volume attribute. - * oln/utils/qsort.hh: Add file. 2004-05-15 Niels Van Vliet <niels(a)lrde.epita.fr> Index: olena/oln/utils/histogram.hh --- olena/oln/utils/histogram.hh Sun, 23 May 2004 12:21:34 +0200 palma_g (oln/10_histogram. 1.6.1.14.1.13 640) +++ olena/oln/utils/histogram.hh Sun, 23 May 2004 13:51:52 +0200 palma_g (oln/10_histogram. 1.6.1.14.1.13 640) @@ -682,7 +682,7 @@ ensure_type; // check the size - precondition(v.size() == im/*.npoints()*/); + precondition(v.size() == im.npoints()); // calculate the histogram of the image utils::histogram<val> histo(im); Index: olena/oln/utils/qsort.hh --- olena/oln/utils/qsort.hh Sun, 23 May 2004 13:54:21 +0200 palma_g () +++ olena/oln/utils/qsort.hh Sun, 23 May 2004 12:09:58 +0200 palma_g (oln/r/9_qsort.hh 644) @@ -0,0 +1,161 @@ +// Copyright (C) 2004 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 59 Temple Place - Suite 330, 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 OLN_UTILS_QSORT_HH +# define OLN_UTILS_QSORT_HH +# include <vector> +# include <oln/core/abstract/image.hh> + +# include <algorithm> +# include <iostream> + +namespace oln +{ + namespace utils + { + namespace internal + { + /*! + ** \brief Functor to sort compare 2 points using an image. + ** + ** \param I Exact type of the image. + */ + template <typename I> + struct cmp_pt_value + { + typedef oln::abstract::non_vectorial_image im_type; ///< Type of the image. + typedef oln_point_type(I) point_type; ///< Type of the considered points. + + /*! + ** \brief Constructor. + ** + ** \arg im Image to use for comparison. + */ + cmp_pt_value(const im_type &im): im_(im) + { + } + + /*! + ** \brief Main method. + ** + ** \arg i The first point. + ** \arg j The second point. + ** \return im[i] < im[j] + */ + bool operator()(const point_type &i, const point_type &j) + { + return im_[j] < im_[i]; + } + + protected: + const im_type &im_; ///< Image to use for comparison. + }; + + /*! + ** \brief Functor to sort compare 2 points using an image + ** + ** \param I Exact type of the image. + */ + template <typename I> + struct cmp_pt_value_inv + { + typedef oln::abstract::non_vectorial_image im_type; ///< Type of the image. + typedef oln_point_type(I) point_type; ///< Type of the considered points. + + /*! + ** \brief Constructor. + ** + ** \arg im Image to use for comparison. + */ + cmp_pt_value_inv(const im_type &im): im_(im) + { + } + + /*! + ** \brief Main method. + ** + ** \arg i The first point. + ** \arg j The second point. + ** \return im[i] > im[j] + */ + bool operator()(const point_type &i, const point_type &j) + { + return im_[i] < im_[j]; + } + + protected: + const im_type &im_; ///< Image to use for comparison. + }; + } // !internal + + /*! + ** \brief Sort points of an image in increasing order. + ** + ** \param I Exact type of the image. + ** + ** \arg im The input image. + ** \arg v The result. + */ + template<class I> + void + qsort(const oln::abstract::non_vectorial_image& im, + std::vector<oln_point_type(I)> &v) + { + oln_iter_type(I) it(im); + + for_all(it) + v.push_back(oln_point_type(I)(it)); + internal::cmp_pt_value c(im); + + std::sort(v.begin(), v.end(), c); + } + + /*! + ** \brief Sort points of an image in decreasing order. + ** + ** \param I Exact type of the image. + ** + ** \arg im The input image. + ** \arg v The result. + */ + template<class I> + void + qsort_inv(const oln::abstract::non_vectorial_image& im, + std::vector<oln_point_type(I)> &v) + { + oln_iter_type(I) it(im); + + for_all(it) + v.push_back(oln_point_type(I)(it)); + + internal::cmp_pt_value_inv c(im); + + std::sort(v.begin(), v.end(), c); + } + } // !utils +} // !oln + +#endif // !QSORT -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 7 months

Sort and attributes.

by Giovanni Palma

Index: olena/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * oln/morpho/attribute_union_find.hh: Change sort algorithm. * oln/morpho/attributes.hh: Add volume attribute. * oln/utils/qsort.hh: Add file. Index: olena/oln/morpho/erosion.hh --- olena/oln/morpho/erosion.hh Thu, 18 Mar 2004 18:24:14 +0100 van-vl_n (oln/b/4_erosion.hh 1.21 600) +++ olena/oln/morpho/erosion.hh Wed, 12 May 2004 14:55:31 +0200 palma_g (oln/b/4_erosion.hh 1.21 640) @@ -88,7 +88,6 @@ { mlc::eq<I::dim, E::dim>::ensure(); oln_concrete_type(I) output(input.size()); - se.delta(); input.border_adapt_copy(se.delta()); oln_iter_type(I) p(input); for_all (p) Index: olena/oln/utils/histogram.hh --- olena/oln/utils/histogram.hh Sat, 27 Mar 2004 15:56:32 +0100 van-vl_n (oln/10_histogram. 1.6.1.14.1.12 600) +++ olena/oln/utils/histogram.hh Sun, 23 May 2004 07:52:57 +0200 palma_g (oln/10_histogram. 1.6.1.14.1.12 640) @@ -682,7 +682,7 @@ ensure_type; // check the size - precondition(v.size() == im.npoints()); + precondition(v.size() == im/*.npoints()*/); // calculate the histogram of the image utils::histogram<val> histo(im); Index: olena/oln/morpho/attribute_union_find.hh --- olena/oln/morpho/attribute_union_find.hh Mon, 15 Mar 2004 15:32:27 +0100 van-vl_n (oln/q/50_attribute_ 1.18 600) +++ olena/oln/morpho/attribute_union_find.hh Sun, 23 May 2004 08:31:37 +0200 palma_g (oln/q/50_attribute_ 1.18 640) @@ -34,6 +34,7 @@ #include <vector> #include <oln/utils/histogram.hh> +#include <oln/utils/qsort.hh> #include <oln/morpho/attributes.hh> namespace oln { @@ -89,10 +90,13 @@ { lambda_ = λ - std::vector<point_type> I(input_.npoints()); - - oln::utils::select_distrib_sort<closing>()(input_, I); + std::vector<point_type> I;//(/*input_.npoints()*/); + // oln::utils::select_distrib_sort<closing>()(input_, I); + if (closing) + oln::utils::qsort_inv(input_, I); + else + oln::utils::qsort(input_, I); level::fill(aux_data_, ntg_sup_val(lambda_type)); aux_data_.border_adapt_assign(Ng.delta(), ntg_sup_val(lambda_type)); Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Sat, 15 May 2004 19:16:56 +0200 van-vl_n (oln/j/45_attributes 1.13.1.2 600) +++ olena/oln/morpho/attributes.hh Sun, 23 May 2004 12:14:50 +0200 palma_g (oln/j/45_attributes 1.13.1.2 600) @@ -345,6 +345,169 @@ }; }; + /*-----------* + | volume | + *-----------*/ + /*! + ** \brief Integral attribute. + ** + ** It is equivalent to volume in 2D, and weight in 3D. + ** \todo FIXME: Change the name and explain the diferences with integral. + */ + template <class I, class Exact = mlc::final> + class volume_type: + public attribute<mlc_2_exact_vt_type(volume_type, I, Exact)> + { + public: + typedef volume_type<I, Exact> self_type; /*!< Self type of the class. */ + attr_type_decl(self_type); + + /*! + ** \brief Basic Ctor. + ** + ** \warning After this call, the object is only instantiated + ** (not initialized). + */ + volume_type() + { + }; + + /*! + ** \brief Ctor from a lambda_type value. + */ + volume_type(const lambda_type &lambda): value_(lambda) + { + }; + + /*! + ** \brief Ctor from a point and an image. + */ + template <class J> + volume_type(const abstract::image<J> &, + const oln_point_type(J) &p, + const env_type &e) : + reflevel_(e.getImage()[p]), + area_(1), + value_(1) + { + }; + + // interface part + /*! + ** \brief Accessor to value_. + ** + ** Virtual method. + ** \see getValue_impl() + */ + const value_type &getValue() const + { + mlc_dispatch(getValue)(); + }; + + /*! + ** \brief Accessor to the reference level. + ** + ** \see getReflevel_impl() + */ + const value_type &getReflevel() const + { + mlc_dispatch(getReflevel)(); + }; + + /*! + ** \brief Accessor to the current area. + ** + ** \see getArea_impl() + */ + const value_type &getArea() const + { + mlc_dispatch(getArea)(); + }; + + // impl part + /*! + ** \brief Implementation of getValue(). + ** + ** Override this method in order to provide a new version of + ** getValue(). + ** + ** \warning Do not call this method, use getValue() instead. + */ + const value_type &getValue_impl() const + { + return value_; + }; + + /*! + ** \brief Implementation of getReflevel(). + ** + ** Override this method in order to provide a new version of + ** getReflevel(). + ** + ** \warning Do not call this method, use getReflevel() instead. + */ + const value_type &getReflevel_impl() const + { + return reflevel_; + }; + + /*! + ** \brief Implementation of getArea(). + ** + ** Override this method in order to provide a new version of + ** getArea(). + ** + ** \warning Do not call this method, use getArea() instead. + */ + const value_type &getArea_impl() const + { + return area_; + }; + + /*! + ** \brief += operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + void pe_impl(const volume_type &rhs) + { + value_ += rhs.getValue() + area_ * tools::diffabs(reflevel_, rhs.getReflevel()); + area_ += rhs.getArea(); + }; + + /*! + ** \brief "<" operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + bool less_impl(const lambda_type &lambda) const + { + return value_ < lambda; + }; + + /*! + ** \brief != operator implementation. + ** + ** This is an implementation of the += operator. Override this + ** method to provide a new implementation of this operator. + ** \warning This method SHOULDN'T directly be called. + */ + bool ne_impl(const lambda_type &lambda) const + { + return lambda != value_; + }; + + protected: + value_type reflevel_; ///< Reference level. + value_type area_; ///< Current area. + value_type value_; ///< Current value (deduced from area and level). + }; + + /*--------------* | integral | *------------*/ @@ -1858,6 +2021,16 @@ typedef integral_type<T, NewExact> ret; }; + /*! + ** \brief Trait specialization for the volume attribute. + */ + template <class I, class Exact> + struct attr_traits<volume_type<I, Exact> > + { + typedef unsigned value_type; + typedef value_type lambda_type; + typedef env::OtherImageEnv env_type; + }; }// !attr } // !morpho } //!oln -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 7 months

oln 10.185: attribute integral

by Niels van Vliet

Il faut remettre la vielle fonction et expliquer les différences entre les deux. Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/morpho/attributes.hh (integral): Change the function. Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Fri, 14 May 2004 20:29:58 +0200 van-vl_n (oln/j/45_attributes 1.13.1.1 600) +++ olena/oln/morpho/attributes.hh Sat, 15 May 2004 19:15:24 +0200 van-vl_n (oln/j/45_attributes 1.13.1.1 600) @@ -353,6 +353,7 @@ ** \brief Integral attribute. ** ** It is equivalent to volume in 2D, and weight in 3D. + ** FIXME: Add math definition here. */ template <class T = unsigned, class Exact = mlc::final> class integral_type: @@ -386,8 +387,6 @@ integral_type(const abstract::image &input, const oln_point_type(I) &p, const env_type &) : - reflevel_(input[p]), - area_(ntg_unit_val(value_type)), value_(input[p]) { }; @@ -404,26 +403,6 @@ mlc_dispatch(getValue)(); }; - /*! - ** \brief Accessor to the reference level. - ** - ** \see getReflevel_impl() - */ - const value_type &getReflevel() const - { - mlc_dispatch(getReflevel)(); - }; - - /*! - ** \brief Accessor to the current area. - ** - ** \see getArea_impl() - */ - const value_type &getArea() const - { - mlc_dispatch(getArea)(); - }; - // impl part /*! ** \brief Implementation of getValue(). @@ -438,31 +417,6 @@ return value_; }; - /*! - ** \brief Implementation of getReflevel(). - ** - ** Override this method in order to provide a new version of - ** getReflevel(). - ** - ** \warning Do not call this method, use getReflevel() instead. - */ - const value_type &getReflevel_impl() const - { - return reflevel_; - }; - - /*! - ** \brief Implementation of getArea(). - ** - ** Override this method in order to provide a new version of - ** getArea(). - ** - ** \warning Do not call this method, use getArea() instead. - */ - const value_type &getArea_impl() const - { - return area_; - }; /*! ** \brief += operator implementation. @@ -473,8 +427,7 @@ */ void pe_impl(const self_type &rhs) { - value_ += rhs.getValue() + area_ * tools::diffabs(reflevel_, rhs.getReflevel()); - area_ += rhs.getArea(); + value_ += rhs.getValue(); }; /*! @@ -502,8 +455,6 @@ }; protected: - value_type reflevel_; ///< Reference level. - value_type area_; ///< Current area. value_type value_; ///< Current value (deduced from area and level). };

20 years, 7 months

oln 10.184: Fix a bug in integral closing and opening.

by Niels van Vliet

Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/morpho/attributes.hh (integral): Fix a bug in the constructor. Index: olena/oln/morpho/attributes.hh --- olena/oln/morpho/attributes.hh Tue, 13 Apr 2004 17:31:32 +0200 van-vl_n (oln/j/45_attributes 1.13 600) +++ olena/oln/morpho/attributes.hh Fri, 14 May 2004 20:26:59 +0200 van-vl_n (oln/j/45_attributes 1.13 600) @@ -388,7 +388,7 @@ const env_type &) : reflevel_(input[p]), area_(ntg_unit_val(value_type)), - value_(ntg_unit_val(value_type)) + value_(input[p]) { };

20 years, 7 months

oln 10.169: Updating thanks.

by Giovanni Palma

Index: doc/ChangeLog from Giovanni Palma <giovanni(a)lrde.epita.fr> * dev/thanks.texi: Update thanks. Index: doc/dev/thanks.texi --- doc/dev/thanks.texi Thu, 07 Aug 2003 20:10:12 +0200 burrus_n (oln/p/40_thanks.tex 1.6 600) +++ doc/dev/thanks.texi Thu, 15 Apr 2004 17:28:13 +0200 palma_g (oln/p/40_thanks.tex 1.6 600) @@ -45,7 +45,17 @@ @end itemize @item Astrid Wang -for her work on static arrays. +@itemize @minus +@item for her work on new documentation system, +@item for her work on static arrays. +@end itemize + +@item Damien Thivolle +@itemize @minus +@item for his contributions to document the code, +@item for his work on generic morphers, +@item for his work on the configuration system. +@end itemize @item David Lesage @itemize @minus @@ -64,7 +74,13 @@ @end itemize @item Giovanni Palma +@itemize @minus +@item for his work on color conversion, +@item for his work on attribute opening and closing algorithms, +@item for his work on new documentation system, +@item for his contributions to document the code, @item for his contributions to cleanup the sources. +@end itemize @item Heru Xue for his work on the color system. @@ -107,6 +123,14 @@ @item for his work on the source tree. @end itemize +@item Niels van Vliet +@itemize @minus +@item for his work on color conversion, +@item for his work on attribute opening and closing algorithms, +@item for his contributions to document the code, +@item for his work on histograms. +@end itemize + @item Pierre-Yves Strub @itemize @minus @item for his work on Olena morpho, @@ -134,6 +158,12 @@ @item Renaud Fran@,cois for his bibliographic research. +@item Simon Odou +@itemize @minus +@item for his contributions to document the code, +@item for his work on generic morphers. +@end itemize + @item Sylvain Berlemont @itemize @minus @item for his work on combinatorial maps, -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74

20 years, 7 months

oln 10.183: Slow Gaussian and neighborhood3d

by Niels van Vliet

Index: olena/ChangeLog from Niels Van Vliet <niels(a)lrde.epita.fr> * olena/oln/core/neighborhood3d.hh: Add some common neighborhoods. * olena/oln/convol/slow_gaussian.hh: Add file. * olena/oln/convol/slow_gaussian.hxx: Add file. Index: olena/oln/core/neighborhood3d.hh --- olena/oln/core/neighborhood3d.hh Mon, 29 Mar 2004 09:53:11 +0200 odou_s (oln/c/35_neighborho 1.19 600) +++ olena/oln/core/neighborhood3d.hh Tue, 11 May 2004 09:50:46 +0200 van-vl_n (oln/c/35_neighborho 1.19 600) @@ -260,6 +260,55 @@ return neighb; } + + /*! + ** \brief Create an ellipsoid neighborhood (3 dimension). + ** \arg zradius radius Z. + ** \arg yradius radius Y. + ** \arg xradius radius X. + ** \pre zradius > 0 + ** \pre yradius > 0 + ** \pre xradius > 0 + ** + ** The ellipsoid formula is : + ** \f$$\frac{x^2}{xradius^2} + \frac{y^2}{yradius^2} + \frac{z^2}{zradius^2} = 1$\f$ + */ + inline neighborhood3d + mk_neighb_ellipsoid(float zradius, float yradius, float xradius) + { + precondition(zradius > 0); + precondition(yradius > 0); + precondition(xradius > 0); + + neighborhood3d neighb; + coord zmax = (coord)roundf(zradius); + float zr2 = zradius * zradius; + float yr2 = yradius * yradius; + for (coord z = -zmax; z <= zmax; ++z) + { + /* + x^2 y^2 z^2 + --------- + --------- + --------- = 1 + xradius^2 yradius^2 zradius^2 + */ + + /* Set x to 0 in the above formula to find ymax. */ + float v = 1 - z * z / zr2; + if (v < 0) v = 0; // Can happen because zmax has been rounded. + coord ymax = (coord)roundf(yradius * sqrtf(v)); + for (coord y = -ymax; y <= ymax; ++y) + { + float w = v - y * y / yr2; + if (w < 0) w = 0; // Can happen because ymax has been rounded. + coord xmax = (coord)roundf(xradius * sqrtf(w)); + for (coord x = z > 0 ? 0 : 1; x <= xmax; ++x) + neighb.add(z, y, x); + } + } + return neighb; + } + + /*! ** \brief Create a cube neighborhood (3 dimension). ** \arg width Number of slice, colunm and row. @@ -285,6 +334,16 @@ return win; } + /*! + ** \brief Create a ball neighborhood (3 dimension). + ** \arg radius The radius. + ** \return The new neighborhood (3d). + */ + inline neighborhood3d + mk_neighb_ball(float radius) + { + return mk_neighb_ellipsoid(radius, radius, radius); + } } // end of oln #endif // OLENA_CORE_NEIGHBORHOOD3D_HH Index: olena/oln/convol/slow_gaussian.hh --- olena/oln/convol/slow_gaussian.hh Wed, 12 May 2004 23:10:01 +0200 van-vl_n () +++ olena/oln/convol/slow_gaussian.hh Wed, 12 May 2004 23:04:19 +0200 van-vl_n (oln/r/7_slow_gauss 644) @@ -0,0 +1,80 @@ +// Copyright (C) 2004 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 59 Temple Place - Suite 330, 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 SLOW_GAUSSIAN_HH +# define SLOW_GAUSSIAN_HH +# include <oln/core/image.hh> +# include <ntg/float.hh> +# include "convolution.hh" + +namespace oln { + namespace convol { + namespace slow { + + /*! Gaussian kernel. + ** + ** In the specialization, the function kernel must be defined. + */ + template <int Dim> + struct gaussian_kernel + { + }; + + /*! Gaussian filter. + ** + ** \todo FIXME: this class has been done on hurry. + ** \arg in input image. + ** \arg sigma sigma. + ** \arg mu point corresponding to the center. + */ + template <class I> + oln_concrete_type(I) + gaussian(const oln::abstract::non_vectorial_image & in, + const ntg::float_d sigma, + const oln_point_type(I) & mu = oln_point_type(I)()) + { + static const typename gaussian_kernel<I::dim>::ret k + = gaussian_kernel<I::dim>::kernel_norm(sigma, mu); + in.border_adapt_mirror(k.delta()); + //FIXME: we should use fast convol. + //FIXME: This is hugely. + typename mute<I, double>::ret im = oln::convol::slow::convolve<double> + (in, + gaussian_kernel<I::dim>::kernel(sigma, mu)); + oln_concrete_type(I) out(in.size()); + oln_iter_type(I) it(out); + for_all(it) + out[it] = oln_value_type(I)(im[it]); + return out; + } + }//End namespace slow + }// End namespace convol +}// End namespace oln + +#include "slow_gaussian.hxx" +#endif // end SLOW_GAUSSIAN_HH Index: olena/oln/convol/slow_gaussian.hxx --- olena/oln/convol/slow_gaussian.hxx Wed, 12 May 2004 23:10:01 +0200 van-vl_n () +++ olena/oln/convol/slow_gaussian.hxx Wed, 12 May 2004 23:07:36 +0200 van-vl_n (oln/r/8_slow_gauss 644) @@ -0,0 +1,158 @@ +// Copyright (C) 2004 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 59 Temple Place - Suite 330, 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 SLOW_GAUSSIAN_HXX +# define SLOW_GAUSSIAN_HXX +# include <oln/core/w_window1d.hh> +# include <oln/core/w_window2d.hh> +# include <oln/core/w_window3d.hh> + +//! SIGMA_COEF times sigma is the size of the kernel. +# define SIGMA_COEF 3 + +namespace oln { + namespace convol { + namespace slow { + namespace internal { + /* FIXME: The hierarchy w_window is a REAL mess. + a w_window1d is not an abstract::w_window, + and w_windownd does not supprot concrete_type, etc + */ + template<class T> + T + normalise(const T &in) + { + T w = in; + double sum = 0; + for (unsigned i = 0; i < in.card(); ++i) + sum += in.w(i); + sum = 1. / sum; + for (unsigned i = 0; i < in.card(); ++i) + w.set(w.dp(i), in.w(i) * sum); + return w; + } + + }// End namespace internal + + //! Kernel of a 1D Gaussian. + template<> + struct gaussian_kernel<1> + { + typedef oln::w_window1d<double> ret; + enum {dim = 1}; + + static w_window1d<double> + kernel_norm(double sigma, const point1d & mu = point1d(0)) + { + return internal::normalise(kernel(sigma, mu)); + } + + w_window1d<double> + static kernel(double sigma, const point1d & mu = point1d(0)) + { + assert(sigma >= 0); + w_window1d<double> w; + + const int size = int(sigma * SIGMA_COEF); + const double inv_sigma_sqrt_2pi = 1. / (sigma * sqrt(M_PI * 2.)); + for (int x = -size; x <= +size; ++x) + w.add(x, inv_sigma_sqrt_2pi * exp( -(x - mu.nth(0)) * (x - mu.nth(0)) / (2 * sigma * sigma)) + ); + return w; + } + }; + + //! Kernel of a 2D Gaussian. + template<> + struct gaussian_kernel<2> + { + typedef w_window2d<double> ret; + enum {dim = 2}; + + static w_window2d<double> + kernel_norm(double sigma, const point2d & mu = point2d(0, 0)) + { + return internal::normalise(kernel(sigma, mu)); + } + w_window2d<double> + static kernel(double sigma, const point2d & mu = point2d(0, 0)) + { + assert(sigma >= 0); + w_window2d<double> w; + const int size = int(sigma * SIGMA_COEF); + const double inv_sigma_sigma_pi_2 = 1. / (sigma * sigma * M_PI * 2.); + + for (int x = -size; x <= +size; ++x) + for (int y = -size; y <= +size; ++y) + w.add(x, y, inv_sigma_sigma_pi_2 + * exp(- ((x - mu.nth(0)) * (x - mu.nth(0)) + (y - mu.nth(1)) * (y - mu.nth(1)) + ) + / ( 2. * sigma * sigma) + ) + ); + return w; + } + }; + + //! Kernel of a 3D Gaussian. + template<> + struct gaussian_kernel<3> + { + typedef w_window3d<double> ret; + enum {dim = 3}; + + static w_window3d<double> + kernel_norm(double sigma, const point3d & mu = point3d(0, 0, 0)) + { + return internal::normalise(kernel(sigma, mu)); + } + static w_window3d<double> + kernel(double sigma, const point3d & mu = point3d(0, 0, 0)) + { + assert(sigma >= 0); + w_window3d<double> w; + + const int size = int(sigma * SIGMA_COEF); + const double k = 1. / (sigma * sigma * sigma * sqrt((M_PI * 2.) * (M_PI * 2.) * (M_PI * 2.))); + + for (int x = -size; x <= +size; ++x) + for (int y = -size; y <= +size; ++y) + for (int z = -size; z <= +size; ++z) + w.add(x, y, z, k * + exp(-((x - mu.nth(0)) * (x - mu.nth(0)) + + (y - mu.nth(1)) * (y - mu.nth(1)) + + (z - mu.nth(2)) * (z - mu.nth(2)) + ) / (2. * sigma * sigma))); + return w; + } + }; + + }//End namespace slow + }// End namespace convol +}// End namespace oln +#endif // end SLOW_GAUSSIAN_HXX

20 years, 7 months

oln 10.182

by Réda Dehak

20 years, 7 months

oln 10.171: Updating files.

by Damien Thivolle

Index: ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * NEWS: Update the file. +2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr> + * config/oln.m4: Correct the message that appears when doxygen is not enough up to date. Index: doc/ChangeLog from Damien Thivolle <damien(a)lrde.epita.fr> * dev/abstract.texi: Update the file. * dev/biblio.texi: Update the file. Index: NEWS --- NEWS Mon, 08 Mar 2004 08:12:15 +0100 palma_g (oln/0_NEWS 1.21 600) +++ NEWS Thu, 15 Apr 2004 18:07:12 +0200 thivol_d (oln/0_NEWS 1.21 600) @@ -1,4 +1,4 @@ -Olena 0.10 Not yet +Olena 0.10 April 15, 2004 * New documentaion system. Now any comment should use doxygen style (i.e. /*! ... */). @@ -31,6 +31,15 @@ directly into any other color system. - Conversion between 2 color systems should pass by the RGB one. + * Generic and concrete morphers are now implemented in Olena. + - Five morphers are included in this release: + Color morpher + Sub quantifying morpher + Piece morpher + Iter morpher + Slicing morpher + - These morphers can be manipulated as if they were normal images. + Olena 0.9 August 8, 2003 * New static hierarchy paradigm Index: doc/dev/biblio.texi --- doc/dev/biblio.texi Wed, 20 Aug 2003 16:58:54 +0200 astrid (oln/p/39_biblio.tex 1.4 600) +++ doc/dev/biblio.texi Thu, 15 Apr 2004 17:32:37 +0200 thivol_d (oln/p/39_biblio.tex 1.4 600) @@ -48,6 +48,12 @@ Jérôme Darbon, Thierry Géraud, and Alexandre Duret-Lutz, submitted to International Symposium On Mathematical Morphology VI (ISMM 2002), April 3-5, 2002, Sydney, Australia. + +@item + @cite{Static C++ Object-Oriented Programming (SCOOP)} + Nicolas Burrus, Alexandre Duret-Lutz, Thierry Geraud, David Lesage, + and Raphaël Poss. In the Proceedings of the Workshop on Multiple + Paradigm with OO Languages (MPOOL'03) Anaheim, CA Oct. 2003. @end itemize You can download these papers and related materials from Index: doc/dev/abstract.texi --- doc/dev/abstract.texi Sat, 23 Aug 2003 13:44:03 +0200 burrus_n (oln/p/41_abstract.t 1.7.1.2 600) +++ doc/dev/abstract.texi Thu, 15 Apr 2004 17:27:33 +0200 thivol_d (oln/p/41_abstract.t 1.7.1.2 600) @@ -14,18 +14,13 @@ prototypes and throwaway experiments before settling into the kind of programming paradigm which is finally here. -This version of Olena is quite young. In fact most of the operators -have been translated from the sources of Milena, an image processing -library which works only on 2D images (Milena stands for "mini-Olena") -and which is not publicly available. - -We haven't written a real documentation yet. In the @file{doc/} -directory you will find the start of a reference manual which presently -documents only the morphological operators, together with a developer's -guide to the use of Olena from user projects. In the @file{doc/demo/} -directory lie a few sample programs. The file @file{doc/demo/tour.cc} -attempts to introduce you to the basics of Olena. For the rest, we're -afraid you will have to dig the code or e-mail us. +The documentation does not cover the whole project. In the @file{doc/} +directory you will find the first draft of a reference manual. It +only documents the image hierarchy and image processing algorithms. +In the @file{doc/demo/} directory lie a few sample programs. +The file @file{doc/demo/tour.cc} attempts to introduce you to the basics +of Olena. +For the rest, we're afraid you will have to dig the code or e-mail us. Please direct any question or comments to @email{olena@@lrde.epita.fr}, or @email{olena-bugs@@lrde.epita.fr}. -- Damien Thivolle damien.thivolle(a)lrde.epita.fr

20 years, 8 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