- Olena-patches

cleanup-2008 2825: Fix Update and Revamp Classif.
by Ugo Jardonnet 06 Nov '08

06 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix Update and Revamp Classif. * inim/classif/max_tree.hh, * inim/classif/display.hh, * inim/classif/iccvg04.cc, * inim/classif/proj.hh, * inim/classif/v2.cc: Moved and update... * inim/classif/src/max_tree.hh, * inim/classif/src/display.hh, * inim/classif/src/iccvg04.cc, * inim/classif/src/proj.hh, * inim/classif/src/v2.cc: ...here. * inim/classif/Makefile: . Makefile | 11 +-- src/iccvg04.cc | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/proj.hh | 83 +++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 6 deletions(-) Index: inim/classif/src/iccvg04.cc --- inim/classif/src/iccvg04.cc (revision 0) +++ inim/classif/src/iccvg04.cc (revision 0) @@ -0,0 +1,175 @@ +#include <iostream> + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/histo/data.hh> +#include <mln/value/all.hh> + +#include <mln/level/fill.hh> + +#include <mln/morpho/closing_volume.hh> +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/opening_volume.hh> +#include <mln/morpho/opening_area.hh> + +#include <mln/arith/revert.hh> +#include <mln/morpho/meyer_wst.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/util/array.hh> +#include <mln/labeling/compute.hh> + +#include <mln/geom/nrows.hh> +#include <mln/geom/ncols.hh> +#include <mln/geom/nslis.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/estim/min_max.hh> +#include <mln/algebra/vec.hh> +#include <mln/algebra/vec.hh> + +#include <mln/literal/all.hh> + +#include <mln/level/stretch.hh> + +#include <sys/stat.h> +#include <sstream> +#include <string.h> +#include <stdlib.h> + +#include "proj.hh" +#include "display.hh" + +using namespace mln; + +unsigned max = 0; + +template <typename I> +mln::image3d<unsigned> +fill_histo(const I& ima, int f) +{ + const value::int_u8 v = 255 / f; // FIXME + image3d<unsigned> histo(v,v,v); + level::fill(histo, 0); + unsigned i = 0; + + mln_piter(I) p(ima.domain()); + for_all(p) + { + point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + histo(p3)++; + } + return histo; +} + +template <typename I> +void gplot(const I& ima) +{ + mln_piter(I) p(ima.domain()); + for_all(p) + { + if (ima(p) != 0) + std::cout << p[0] << ' ' << p[1] << ' ' << p[2] << std::endl; + } +} + +template <typename I, typename J, typename K> +void +classify_image(const I& ima, const J& histo, const K& ws, int nbasins, int f) +{ + unsigned border = 0; + unsigned count[nbasins + 1]; + memset(count, 0, (nbasins + 1) * sizeof (unsigned)); + + algebra::vec<3, double> sum[nbasins + 1]; + for (int i = 0; i < nbasins + 1; ++i) + sum[i] = literal::zero; + + // Compute representatives of every class + mln_piter(I) p(ima.domain()); + for_all(p) + { + point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + int w = ws(p3); + + //check if we are not on a border of the WS + if (w == 0) + border++; + count[w] += histo(p3); + sum[w] += histo(p3) * convert::to< algebra::vec<3, value::int_u8> >(p3); + + std::cerr << "p3 : " << p3 << " == " << + convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; + } + + std::cout << border << std::endl; + for (int i = 0; i < nbasins + 1; ++i) + { + std::cout << "sum[" << i << "] = " << sum[i] * f << " / " << count[i] << " == "; + sum[i] = (sum[i] * f) / count[i]; + std::cout << sum[i] << std::endl; + } + + // Make an output image where colors are replaced by their representatives. + mln_piter(I) pi(ima.domain()); + I out(ima.domain()); + for_all(pi) + { + //retrieve color class + value::rgb8 coul = ima(pi); + int w = ws(point3d(coul.red() / f, coul.green() / f, coul.blue() / f)); + + //if w == 0, out(pi) = 0 ie is part of a border of the watershed + if (w == 0) + out(pi) = literal::red; + else + out(pi) = convert::to<value::rgb8>(sum[w]); + + std::cerr << "out(" << pi << ") = sum[" << w << "]; //" + << sum[w] << " : rgb8(" << sum[w] << ")" << std::endl; + } + + io::ppm::save(out, "out.ppm"); + save_class(histo, ws, sum, "palette.ppm"); +} + +bool usage(int argc, char ** argv) +{ + if (argc != 4) + { + std::cout << "usage: " << argv[0] << " image div_factor lambda" << std::endl; + return false; + } + return true; +} + + +int main(int argc, char **argv) +{ + if (not usage(argc, argv)) + return 1; + const int div_factor = atoi(argv[2]); + const int lambda = atoi(argv[3]); + + image2d<value::rgb8> ima; + ima = io::ppm::load<value::rgb8>(argv[1]); + + //make histo + image3d<unsigned> histo = fill_histo(ima,div_factor); + + //compute opening_volume of histo + image3d<unsigned> histo_filtered(histo.domain()); + morpho::opening_volume(histo, c6(), lambda, histo_filtered); + + + //watershed over histo_closure + unsigned nbasins = 0; + image3d<unsigned> ws = morpho::meyer_wst(arith::revert(histo_filtered), + c6(), nbasins); + std::cout << "nbassins : " << nbasins << std::endl; + + //classify image + classify_image(ima, histo, ws, nbasins, div_factor); +} Index: inim/classif/src/proj.hh --- inim/classif/src/proj.hh (revision 0) +++ inim/classif/src/proj.hh (revision 0) @@ -0,0 +1,83 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_PROJ_HH +# define MLN_PROJ_HH + +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/level/paste.hh> +#include <mln/accu/mean.hh> +#include <mln/accu/maj_h.hh> +#include <mln/literal/white.hh> + +namespace mln +{ + + template <typename T, typename A> + image2d<mln_result(A)> + proj(const image3d<T>& input, A a) + { + image2d<A> acc(geom::nslis(input), geom::nrows(input)); + mln_piter(image3d<T>) p(input.domain()); + for_all(p) // 3d + if (input(p) != literal::zero) + acc.at(p.sli(), p.row()).take(input(p)); + + image2d<mln_result(A)> output(acc.domain()); + level::paste(acc, output); + return output; + } + + template <typename T, typename U, typename K> + void + save_class(const image3d<T>& histo, const image3d& ws, + K mean, const char * fn) + { + accu::maj_h<value::int_u8> max_1; + image2d<value::int_u8> hproj = proj(histo, max_1); + + accu::maj_h<value::int_u8> max_2; + image2d<value::int_u8> proj_class = proj(ws, max_2); + + //std::cout << histo; + + image2d<value::rgb8> out(proj_class.domain()); + + level::fill(out, literal::white); + mln_piter(image2d<value::int_u8>) p(hproj.domain()); + for_all(p) + if (hproj(p) > 0) + out(p) = convert::to<value::rgb8>(mean[proj_class(p)]); + + io::ppm::save(out, fn); + } + +} // end of namespace mln + +#endif /* MLN_PROJ_HH */ + Index: inim/classif/Makefile --- inim/classif/Makefile (revision 2824) +++ inim/classif/Makefile (working copy) @@ -2,7 +2,7 @@ # ICCVG ICCVG_INCLUDES=-I../../.. -ICCVG_SRC=iccvg04.cc +ICCVG_SRC=src/iccvg04.cc ICCVG=iccvg ICCVG_DBG=iccvg_dbg @@ -10,10 +10,9 @@ DIV?=4 LAMBDA?=10 - # V2 V2_INCLUDES=-I../../.. -V2_SRC=v2.cc max_tree.hh +V2_SRC=src/v2.cc src/max_tree.hh V2=v2 V2_DBG=v2_dbg @@ -44,7 +43,7 @@ rm -f $(V2) rm -f $(V2_DBG) rm -f *.log - rm -f .dep_iccvg .dep_v2 + rm -f .dep_iccvg .dep_v2 .dep_iccvgr .dep_v2r check-debug: $(ICCVG_DBG) ./iccvg_dbg $(IMG) $(DIV) $(LAMBDA) $(LOG) @@ -74,12 +73,12 @@ .dep_iccvg: - g++ $(ICCVG_INCLUDES) -MM iccvg04.cc > $@ + g++ $(ICCVG_INCLUDES) -MM src/iccvg04.cc > $@ @sed -ir s/iccvg04.cc// .dep_iccvg @sed -ir s/iccvg04.o/iccvg/ .dep_iccvg .dep_v2: - g++ $(V2_INCLUDES) -MM v2.cc > $@ + g++ $(V2_INCLUDES) -MM src/v2.cc > $@ @sed -ir s/v2.cc// .dep_v2 @sed -ir s/v2.o/v2/ .dep_v2

1 0

milena r2824: Fix erosion on octogone, add arith::diff_abs
by Matthieu Garrigues 06 Nov '08

06 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-06 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Add arith::diff_abs. * mln/arith/all.hh: add diff_abs.hh. * mln/arith/diff_abs.hh: New, compute the absolute difference between two images. * mln/fun/vv2v/diff_abs.hh: New, diff_abs vv2v function. * mln/level/transform.hh: Add a generic version of transform working with 2 images and a vv2v functions. * mln/math/all.hh: add diff_abs.hh. * mln/math/diff_abs.hh: New, compute the absolute difference between two values. * tests/arith/Makefile.am: Add diff_abs test. * tests/arith/diff_abs.cc: New, test arith::diff_abs. * mln/core/clock_neighb.hh: Start to clean this neighboorhood. Fix erosion on octogone. * mln/morpho/erosion.spe.hh: Fix erosion on octogone by decomposing the octogone with a vline, a hline, a diagonal and a backdiagonal. All of these elements have a width of (width(oct) + 2) / 3. --- mln/arith/all.hh | 1 mln/arith/diff_abs.hh | 86 +++++++++++++++++++++++++++++++++++++++++ mln/core/clock_neighb.hh | 36 ++++++++--------- mln/fun/vv2v/diff_abs.hh | 78 +++++++++++++++++++++++++++++++++++++ mln/level/transform.hh | 95 ++++++++++++++++++++++++++++++++++++++++++++++ mln/math/all.hh | 1 mln/math/diff_abs.hh | 63 ++++++++++++++++++++++++++++++ mln/morpho/erosion.spe.hh | 11 ++--- tests/arith/Makefile.am | 2 tests/arith/diff_abs.cc | 73 +++++++++++++++++++++++++++++++++++ 10 files changed, 423 insertions(+), 23 deletions(-) Index: branches/cleanup-2008/milena/tests/arith/diff_abs.cc =================================================================== --- branches/cleanup-2008/milena/tests/arith/diff_abs.cc (revision 0) +++ branches/cleanup-2008/milena/tests/arith/diff_abs.cc (revision 2824) @@ -0,0 +1,73 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/arith/diff_abs.cc + * + * \brief Tests on mln::arith::diff_abs. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> +#include <mln/arith/diff_abs.hh> +#include <mln/level/compare.hh> + +int main() +{ + using namespace mln; + + trace::quiet = false; + + { + image2d<int> ima(3,3); + + int vs1[3][3] = { + {0, 1, 2}, + {3, 4, 5}, + {6, 7, 8} + }; + + + int vs2[3][3] = { + {1, 0, 5}, + {8, 5, 6}, + {9, 5, 2} + }; + + int vs_ref[3][3] = { + {1, 1, 3}, + {5, 1, 1}, + {3, 2, 6} + }; + + image2d<int> ima1 = make::image(vs1); + image2d<int> ima2 = make::image(vs2); + image2d<int> ref = make::image(vs_ref); + + mln_assertion (arith::diff_abs(ima1, ima2) == ref); + } + +} Index: branches/cleanup-2008/milena/tests/arith/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/arith/Makefile.am (revision 2823) +++ branches/cleanup-2008/milena/tests/arith/Makefile.am (revision 2824) @@ -4,12 +4,14 @@ check_PROGRAMS = \ all_headers \ + diff_abs \ minus \ plus \ revert \ times all_headers_SOURCES = all_headers.cc +diff_abs_SOURCES = diff_abs.cc minus_SOURCES = minus.cc plus_SOURCES = plus.cc revert_SOURCES = revert.cc Index: branches/cleanup-2008/milena/mln/core/clock_neighb.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/clock_neighb.hh (revision 2823) +++ branches/cleanup-2008/milena/mln/core/clock_neighb.hh (revision 2824) @@ -30,7 +30,7 @@ /*! \file mln/core/clock_neighb.hh * - * \brief Definition of the generic neighborhood class mln::clock_neighb_. + * \brief Definition of the generic neighborhood class mln::clock_neighb. */ # include <mln/core/concept/neighborhood.hh> @@ -47,27 +47,27 @@ /*! \brief Generic neighborhood class. * - * This neighborhood of window is just like a set of delta-points. - * The parameter is \c D, type of delta-point. + * This neighborhood of window is just like a set of delta-psites. + * The parameter is \c D, type of delta-psite. */ template <typename D> - struct clock_neighb_ : public Neighborhood< clock_neighb_ <D> > + struct clock_neighb : public Neighborhood< clock_neighb <D> > { /// Dpsite associated type. - typedef D dpoint; + typedef D dpsite; /// Site associated type. typedef mln_psite(D) point; - /*! \brief Site_Iterator type to browse the points of a generic - * neighborhood w.r.t. the ordering of delta-points. + /*! \brief Site_Iterator type to browse the psites of a generic + * neighborhood w.r.t. the ordering of delta-psites. */ typedef dpsites_fwd_piter<D> fwd_niter; - /*! \brief Site_Iterator type to browse the points of a generic - * neighborhood w.r.t. the reverse ordering of delta-points. + /*! \brief Site_Iterator type to browse the psites of a generic + * neighborhood w.r.t. the reverse ordering of delta-psites. * - * !!! Be careful the start delta point become the last now. + * !!! Be careful the start delta psite become the last now. */ typedef dpsites_bkd_piter<D> bkd_niter; @@ -80,18 +80,18 @@ * The constructed neighborhood is empty. You have to use insert() * to proceed to the neighborhood definition. */ - clock_neighb_(); + clock_neighb(); - /*! \brief Insert a delta-point \p dp in the neighborhood + /*! \brief Insert a delta-psite \p dp in the neighborhood * definition. * - * \param[in] dp The delta-point to insert. + * \param[in] dp The delta-psite to insert. * - * This method also insert the symmetrical delta-point, - \p dp, + * This method also insert the symmetrical delta-psite, - \p dp, * in the neighborhood definition; thus the client has not to * ensure the symmetry property; that is automatic. */ - clock_neighb_<D>& append(const D& dp); + clock_neighb<D>& append(const D& dp); /// \} const std::vector<D>& vect() const { @@ -106,14 +106,14 @@ template <typename D> inline - clock_neighb_<D>::clock_neighb_() + clock_neighb<D>::clock_neighb() { } template <typename D> inline - clock_neighb_<D>& - clock_neighb_<D>::append(const D& dp) + clock_neighb<D>& + clock_neighb<D>::append(const D& dp) { vec_.push_back(dp); return *this; Index: branches/cleanup-2008/milena/mln/math/all.hh =================================================================== --- branches/cleanup-2008/milena/mln/math/all.hh (revision 2823) +++ branches/cleanup-2008/milena/mln/math/all.hh (revision 2824) @@ -44,6 +44,7 @@ # include <mln/math/abs.hh> +# include <mln/math/diff_abs.hh> # include <mln/math/jacobi.hh> # include <mln/math/max.hh> # include <mln/math/min.hh> Index: branches/cleanup-2008/milena/mln/math/diff_abs.hh =================================================================== --- branches/cleanup-2008/milena/mln/math/diff_abs.hh (revision 0) +++ branches/cleanup-2008/milena/mln/math/diff_abs.hh (revision 2824) @@ -0,0 +1,63 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MATH_DIFF_ABS_HH +# define MLN_MATH_DIFF_ABS_HH + +/*! \file mln/math/diff_abs.hh + * + * \brief Define diff_abs routine. + */ + + +namespace mln +{ + + namespace math + { + + template <typename T> + T diff_abs(const T& v1, const T& v2); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + T diff_abs(const T& v1, const T& v2) + { + return abs(v1 - v2); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_DIFF_ABS_HH Index: branches/cleanup-2008/milena/mln/level/transform.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/transform.hh (revision 2823) +++ branches/cleanup-2008/milena/mln/level/transform.hh (revision 2824) @@ -67,6 +67,22 @@ transform(const Image& input, const Function_v2v<F>& f); + /*! Transform two images \p ima1 \p ima2 through a function \p f + * + * \param[in] input The input image. + * \param[in] f The function. + * + * This routine runs: \n + * for all p of \p input, \p output(p) = \p f( \p input(p) ). + * + */ + template <typename I, typename J, typename F> + mln_ch_value(I, mln_result(F)) + transform(const Image& ima1, + const Image<J>& ima2, + const Function_vv2v<F>& f); + + # ifndef MLN_INCLUDE_ONLY namespace internal @@ -97,6 +113,38 @@ mln_precondition(exact(input).has_data()); mln_precondition(exact(output).domain() >= exact(input).domain()); } + + template <typename I, typename J, typename F, typename O> + inline + void transform_tests(const Image& ima1, + const Image<J>& ima2, + const Function_v2v<F>& f, + Image<O>& output) + { + // Avoid a warning about an undefined variable when NDEBUG + // is not defined. + (void) ima1; + (void) ima2; + (void) f; + (void) output; + + // Properties check + mln_precondition((mlc_is(mln_trait_image_pw_io(O), + trait::image::pw_io::read_write)::value || + mlc_is(mln_trait_image_vw_io(O), + trait::image::vw_io::read_write)::value)); + + // FIXME Convert test + mlc_converts_to(mln_result(F), mln_value(O))::check(); + + + // Dynamic tests + mln_precondition(exact(ima1).has_data()); + mln_precondition(exact(ima2).has_data()); + mln_precondition(exact(ima1).domain() == exact(ima2).domain()); + mln_precondition(exact(output).domain() >= exact(ima1).domain()); + } + } // end of namespace mln::level::internal @@ -135,6 +183,35 @@ return output; } + + // Generic implementation. + template <typename I, typename J, typename F> + inline + mln_ch_value(I, mln_result(F)) + transform(const Image& ima1_, + const Image<J>& ima2_, + const Function_vv2v<F>& f_) + { + trace::entering("level::impl::generic::transform"); + + const I& ima1 = exact(ima1_); + const I& ima2 = exact(ima2_); + const F& f = exact(f_); + + mln_ch_value(I, mln_result(F)) output; + initialize(output, ima1); + +// level::internal::transform_tests(ima1, ima2, f, output); + + mln_piter(I) p(ima1.domain()); + for_all(p) + output(p) = f(ima1(p), ima2(p)); + + trace::exiting("level::impl::generic::transform"); + + return output; + } + } // end of namespace mln::level::impl::generic @@ -157,6 +234,24 @@ return output; } + template <typename I, typename J, typename F> + inline + mln_ch_value(I, mln_result(F)) + transform(const Image& ima1, + const Image<J>& ima2, + const Function_vv2v<F>& f) + { + trace::entering("level::transform"); + + mln_ch_value(I, mln_result(F)) output; + output = impl::generic::transform(exact(ima1), exact(ima2), exact(f)); + + trace::exiting("level::transform"); + + return output; + + } + # endif // ! MLN_INCLUDE_ONLY Index: branches/cleanup-2008/milena/mln/arith/all.hh =================================================================== --- branches/cleanup-2008/milena/mln/arith/all.hh (revision 2823) +++ branches/cleanup-2008/milena/mln/arith/all.hh (revision 2824) @@ -54,6 +54,7 @@ } +# include <mln/arith/diff_abs.hh> # include <mln/arith/min.hh> # include <mln/arith/minus.hh> # include <mln/arith/plus.hh> Index: branches/cleanup-2008/milena/mln/arith/diff_abs.hh =================================================================== --- branches/cleanup-2008/milena/mln/arith/diff_abs.hh (revision 0) +++ branches/cleanup-2008/milena/mln/arith/diff_abs.hh (revision 2824) @@ -0,0 +1,86 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_ARITH_DIFF_ABS_HH +# define MLN_ARITH_DIFF_ABS_HH + +/*! \file mln/arith/diff_abs.hh + * + * \brief Point-wise addition between images. + * + * \todo Speedup; some versions are not optimal. + */ + +# include <mln/arith/includes.hh> +# include <mln/fun/vv2v/diff_abs.hh> +# include <mln/level/transform.hh> + +namespace mln +{ + + namespace arith + { + + /*! Point-wise absolute difference of images \p lhs and \p rhs. + * + * \param[in] lhs First operand image. + * \param[in] rhs Second operand image. + * \result The result image. + * + * \pre \p lhs.domain == \p rhs.domain + */ + template <typename I> + mln_concrete(I) + diff_abs(const Image& lhs, const Image& rhs); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + inline + mln_concrete(I) + diff_abs(const Image& lhs, const Image& rhs) + { + trace::entering("arith::diff_abs"); + mln_precondition(exact(lhs).has_data()); + mln_precondition(exact(rhs).has_data()); + mln_precondition(exact(rhs).domain() == exact(lhs).domain()); + + mln_concrete(I) output = level::transform(lhs, rhs, fun::vv2v::diff_abs<mln_value(I)>()); + + trace::exiting("arith::diff_abs"); + return output; + } + + } // end of namespace mln::arith + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_ARITH_DIFF_ABS_HH Index: branches/cleanup-2008/milena/mln/fun/vv2v/diff_abs.hh =================================================================== --- branches/cleanup-2008/milena/mln/fun/vv2v/diff_abs.hh (revision 0) +++ branches/cleanup-2008/milena/mln/fun/vv2v/diff_abs.hh (revision 2824) @@ -0,0 +1,78 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_FUN_VV2V_DIFF_ABS_HH +# define MLN_FUN_VV2V_DIFF_ABS_HH + +/// \file mln/fun/vv2v/diff_abs.hh +/// \brief Computing the absolute difference between two values using +/// a functor. + +# include <mln/core/concept/function.hh> +# include <mln/math/diff_abs.hh> + + +namespace mln +{ + + namespace fun + { + + namespace vv2v + { + + // FIXME: Doc. + + /// \brief A functor computing the diff_absimum of two values. + template <typename V> + struct diff_abs : public Function_vv2v< diff_abs<V> > + { + typedef V result; + V operator()(const V& v1, const V& v2) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + inline + V + diff_abs<V>::operator()(const V& v1, const V& v2) const + { + return mln::math::diff_abs(v1, v2); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::vv2v + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_VV2V_DIFF_ABS_HH Index: branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2823) +++ branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2824) @@ -295,12 +295,13 @@ const I& input = exact(input_); - const unsigned len = win.length() / 3 + 1; + const unsigned len = (win.length() + 2) / 3; - mln_concrete(I) temp_1, temp_2, output; - temp_1 = morpho::erosion(input, win::hline2d(len)); - temp_2 = morpho::erosion(temp_1, win::diag2d(len)); - output = morpho::erosion(temp_2, win::backdiag2d(len)); + mln_concrete(I) output; + output = morpho::erosion(input, win::hline2d(len)); + output = morpho::erosion(output, win::vline2d(len)); + output = morpho::erosion(output, win::diag2d(len)); + output = morpho::erosion(output, win::backdiag2d(len)); trace::exiting("morpho::impl::erosion_(win::octagon2d)"); return output;

1 0

cleanup-2008 2823: Add fill_with_image_line specialization in fill_with_image routine.
by Nicolas Ballas 06 Nov '08

06 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Add fill_with_image_line specialization in fill_with_image routine. * tests/level/fill_with_image.cc: Add a new test. * mln/level/paste.spe.hh: Add tests in paste_line. * mln/level/fill_with_value.spe.hh: Update documentation. * mln/level/fill_with_image.spe.hh: Add fill_with_image_line. mln/level/fill_with_image.spe.hh | 49 +++++++++++++++++++++++++++++++-------- mln/level/fill_with_value.spe.hh | 1 mln/level/paste.spe.hh | 4 +-- tests/level/fill_with_image.cc | 15 +++++++++++ 4 files changed, 57 insertions(+), 12 deletions(-) Index: tests/level/fill_with_image.cc --- tests/level/fill_with_image.cc (revision 2822) +++ tests/level/fill_with_image.cc (working copy) @@ -57,6 +57,21 @@ using namespace mln; const unsigned size = 100; + // tests in two dimension + { + box2d b(point2d(1,2), point2d(2,4)); + image2d<int> ima(b, 2); + debug::iota(ima); + + box2d b2(point2d(-1,-2), point2d(3,6)); + image2d<int> ima2(b2, 0); + debug::iota(ima2); + + level::fill_with_image(ima, ima2); // Not so fast version... + mln_assertion(ima == (ima2 | b)); + } + + // 2d tests { image2d<unsigned int> ima(size, size); Index: mln/level/paste.spe.hh --- mln/level/paste.spe.hh (revision 2822) +++ mln/level/paste.spe.hh (working copy) @@ -32,7 +32,6 @@ * * \brief Specializations for mln::level::paste. * - * \todo Rewrite the dispatch!!! */ # ifndef MLN_LEVEL_PASTE_HH @@ -43,7 +42,7 @@ # include <mln/level/fill_with_value.hh> # include <mln/level/memcpy_.hh> # include <mln/core/box_runstart_piter.hh> -# include <mln/border/all.hh> +# include <mln/border/get.hh> @@ -125,6 +124,7 @@ const I& input = exact(input_); J& output = exact(output_); + level::internal::paste_tests(input, output); mln_box_runstart_piter(I) p(input.domain()); for_all(p) Index: mln/level/fill_with_value.spe.hh --- mln/level/fill_with_value.spe.hh (revision 2822) +++ mln/level/fill_with_value.spe.hh (working copy) @@ -31,7 +31,6 @@ /// \file mln/level/fill_with_value.spe.hh /// Specializations for mln::level::fill_with_value. /// -/// \todo See todos in mln/level/fill.hh # ifndef MLN_LEVEL_FILL_WITH_VALUE_HH # error "Forbidden inclusion of *.spe.hh" Index: mln/level/fill_with_image.spe.hh --- mln/level/fill_with_image.spe.hh (revision 2822) +++ mln/level/fill_with_image.spe.hh (working copy) @@ -32,7 +32,6 @@ * * \brief Specializations for mln::level::fill_with_image. * - * \todo Add specializations then rewrite the dispatch. */ # ifndef MLN_LEVEL_FILL_WITH_IMAGE_HH @@ -41,9 +40,9 @@ # include <mln/level/memcpy_.hh> # include <mln/level/fill_with_value.hh> - # include <mln/core/pixel.hh> - +# include <mln/core/box_runstart_piter.hh> +# include <mln/border/get.hh> # ifndef MLN_INCLUDE_ONLY @@ -116,6 +115,26 @@ trace::exiting("level::impl::fill_with_image_fast"); } + template <typename I, typename J> + inline + void fill_with_image_lines(Image& ima_, const Image<J>& data_) + { + trace::entering("level::impl::fill_with_image_lines"); + + I& ima = exact(ima_); + const J& data = exact(data_); + + level::internal::fill_with_image_tests(ima, data); + + mln_box_runstart_piter(I) p(ima.domain()); + for_all(p) + { + pixel<J> dst(ima, p); + memcpy_(dst, make::pixel(data, p), p.run_length()); + } + + trace::exiting("level::impl::fill_with_image_lines"); + } template <typename I, typename J> void fill_with_image_singleton(Image& ima_, @@ -149,10 +168,15 @@ I& ima = exact(ima_); const J& data = exact(data_); - if (ima.border() == data.border() && - sizeof(mln_value(I)) == sizeof(mln_value(J))) + if (sizeof(mln_value(I)) == sizeof(mln_value(J))) + { + if (border::get(ima) == border::get(data) && + ima.domain() == data.domain()) impl::fill_with_image_fastest(ima, data); else + impl::fill_with_image_lines(ima, data); + } + else impl::fill_with_image_fast(ima, data); } @@ -162,12 +186,20 @@ mln::trait::image::value_access::direct, mln::trait::image::ext_domain::none, mln::trait::image::ext_domain::none, - Image& ima, - const Image<J>& data) + Image& ima_, + const Image<J>& data_) { + I& ima = exact(ima_); + const J& data = exact(data_); + if (sizeof(mln_value(I)) == sizeof(mln_value(J))) + { + if (ima.domain() == data.domain()) impl::fill_with_image_fastest(ima, data); else + impl::fill_with_image_lines(ima, data); + } + else impl::fill_with_image_fast(ima, data); } @@ -219,8 +251,7 @@ if (mlc_is(mln_trait_image_value_alignement(I), trait::image::value_alignement::with_grid)::value && mlc_is(mln_trait_image_value_alignement(J), - trait::image::value_alignement::with_grid)::value && - ima.domain() == data.domain()) + trait::image::value_alignement::with_grid)::value) { fill_with_image_(mln_trait_image_value_access(I)(), mln_trait_image_value_access(J)(),

1 0

cleanup-2008 2822: Add paste_lines specialization for the level::paste routine.
by Nicolas Ballas 06 Nov '08

06 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Add paste_lines specialization for the level::paste routine. * mln/level/paste.spe.hh: Add paste_lines. * mln/level/fill_with_value.spe.hh: Fix a dispatch. fill_with_value.spe.hh | 4 -- paste.spe.hh | 75 ++++++++++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 34 deletions(-) Index: mln/level/paste.spe.hh --- mln/level/paste.spe.hh (revision 2821) +++ mln/level/paste.spe.hh (working copy) @@ -42,6 +42,8 @@ # include <mln/core/pixel.hh> # include <mln/level/fill_with_value.hh> # include <mln/level/memcpy_.hh> +# include <mln/core/box_runstart_piter.hh> +# include <mln/border/all.hh> @@ -71,28 +73,6 @@ void paste(const Image& input, Image<J>& output); } -// template <typename I, typename J> -// inline -// void paste_lines_(const I& data, J& destination) -// { -// trace::entering("level::impl::paste_lines_"); -// typedef mln_psite(I) P; -// unsigned n = data.bbox().len(P::dim - 1); -// // FIXME: Works only for raw data images -// // FIXME: For linear data images, we should get the len for each line... - -// typename I::line_piter p(data.domain()); // FIXME: Alias mln_line_piter! -// // mln_line_piter(I) p(data.domain()); -// for_all(p) -// { -// FIXME: TYPE pix = make::pixel(destination, p); -// memcpy_(pix, -// make::pixel(data, p), -// n); -// } -// trace::exiting("level::impl::paste_lines_"); -// } - template <typename I, typename J> void paste_fast(const Image& input_, Image<J>& output_) @@ -113,7 +93,7 @@ po.val() = pi.val(); po.next(); } - trace::entering("level::impl::paste_fast"); + trace::exiting("level::impl::paste_fast"); } template <typename I, typename J> @@ -133,7 +113,27 @@ memcpy_(dst, src, input.nelements()); - trace::entering("level::impl::paste_fastest"); + trace::exiting("level::impl::paste_fastest"); + } + + template <typename I, typename J> + inline + void paste_lines(const Image& input_, Image<J>& output_) + { + trace::entering("level::impl::paste_lines"); + + const I& input = exact(input_); + J& output = exact(output_); + + + mln_box_runstart_piter(I) p(input.domain()); + for_all(p) + { + pixel<J> dst(output, p); + memcpy_(dst, make::pixel(input, p), p.run_length()); + } + + trace::exiting("level::impl::paste_lines"); } template <typename I, typename J> @@ -145,7 +145,7 @@ level::fill_with_value(output_, input.val()); - trace::entering("level::impl::paste_singleton"); + trace::exiting("level::impl::paste_singleton"); } } // end of namespace impl. @@ -167,10 +167,15 @@ const I& input = exact(input_); J& output = exact(output_); - if (input.border() == output.border() && - sizeof(mln_value(I)) == sizeof(mln_value(J))) + if (sizeof(mln_value(I)) == sizeof(mln_value(J))) + { + if (border::get(input) == border::get(output) && + input.domain() == output.domain()) impl::paste_fastest(input, output); else + impl::paste_lines(input, output); + } + else impl::paste_fast(input, output); } @@ -180,12 +185,21 @@ mln::trait::image::value_access::direct, mln::trait::image::ext_domain::none, mln::trait::image::ext_domain::none, - const Image& input, - Image<J>& output) + const Image& input_, + Image<J>& output_) { + const I& input = exact(input_); + J& output = exact(output_); + + if (sizeof(mln_value(I)) == sizeof(mln_value(J))) + { + if (input.domain() == output.domain()) impl::paste_fastest(input, output); else + impl::paste_lines(input, output); + } + else impl::paste_fast(input, output); } @@ -238,8 +252,7 @@ if (mlc_is(mln_trait_image_value_alignement(I), trait::image::value_alignement::with_grid)::value && mlc_is(mln_trait_image_value_alignement(J), - trait::image::value_alignement::with_grid)::value && - input.domain() == output.domain()) + trait::image::value_alignement::with_grid)::value) { paste_(mln_trait_image_value_access(I)(), mln_trait_image_value_access(J)(), Index: mln/level/fill_with_value.spe.hh --- mln/level/fill_with_value.spe.hh (revision 2821) +++ mln/level/fill_with_value.spe.hh (working copy) @@ -194,9 +194,7 @@ trait::image::vw_io::read_write, Image& ima, const V& val) { - // FIXME - //impl::fill_with_value_cell_wise(ima, val); - impl::generic::fill_with_value(ima, val); + impl::fill_with_value_cell_wise(ima, val); }

1 0

cleanup-2008 2821: Tiny fix in windows.
by Thierry Geraud 06 Nov '08

06 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Tiny fix in windows. * mln/core/w_window.hh (is_symmetric): New. * mln/border/duplicate.hh: Fix typo. * mln/win/sym.hh: Fix copyright. (sym): Add trace. border/duplicate.hh | 2 +- core/w_window.hh | 18 +++++++++++++++++- win/sym.hh | 14 ++++++++++---- 3 files changed, 28 insertions(+), 6 deletions(-) Index: mln/core/w_window.hh --- mln/core/w_window.hh (revision 2820) +++ mln/core/w_window.hh (working copy) @@ -116,6 +116,9 @@ const mln::window<D>& win() const; + /// Test if the window is symmetric. + bool is_symmetric() const; + /// Apply a central symmetry to the window. void sym(); @@ -278,11 +281,24 @@ template <typename D, typename W> inline + bool + w_window<D,W>::is_symmetric() const + { + if (! win_.is_symmetric()) + return false; + w_window<D,W> tmp; + tmp.sym(); + return *this == tmp; + } + + template <typename D, typename W> + inline void w_window<D,W>::sym() { w_window<D,W> tmp; - for (unsigned i = 0; i < this->size(); ++i) + unsigned n = this->size(); + for (unsigned i = 0; i < n; ++i) tmp.insert(this->w(i), - this->dp(i)); *this = tmp; } Index: mln/border/duplicate.hh --- mln/border/duplicate.hh (revision 2820) +++ mln/border/duplicate.hh (working copy) @@ -46,7 +46,7 @@ { /*! Assign the virtual (outer) border of image \p ima with the - * dupplicate of the inner border of this image. + * duplicate of the inner border of this image. * * \param[in,out] ima The image whose border is to be duplicated. * Index: mln/win/sym.hh --- mln/win/sym.hh (revision 2820) +++ mln/win/sym.hh (working copy) @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_WIN_SYM_HH # define MLN_WIN_SYM_HH -/*! \file mln/win/sym.hh - * - * \brief Give the symmetrical object. - */ +/// \file mln/win/sym.hh +/// +/// Give the symmetrical object. # include <mln/core/concept/window.hh> # include <mln/core/concept/weighted_window.hh> @@ -61,8 +61,11 @@ inline W sym(const Window<W>& win) { + trace::entering("win::sym"); + // mln_precondition(win.is_valid()); W tmp = exact(win); tmp.sym(); + trace::exiting("win::sym"); return tmp; } @@ -70,8 +73,11 @@ inline W sym(const Weighted_Window<W>& w_win) { + trace::entering("win::sym"); + // mln_precondition(win.is_valid()); W tmp = exact(w_win); tmp.sym(); + trace::exiting("win::sym"); return tmp; }

1 0

Re: [Olena-patches] [Olena] #43: Fix the initialization of all global constants.
by Olena 05 Nov '08

05 Nov '08

#43: Fix the initialization of all global constants. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Comment (by levill_r): Good news. No fixing revision was mentioned; is there (are there) test(s) somewhere ensuring global constants are no longer a problem? -- Ticket URL: <https://trac.lrde.org/olena/ticket/43#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

milena r2820: Add bench on erosion with disk2d
by Matthieu Garrigues 05 Nov '08

05 Nov '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-05 Matthieu Garrigues <garrigues(a)lrde.epita.fr> * doc/benchmark/morpho/erosion.cc: Add bench on erosion with disk2d. --- erosion.cc | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) Index: branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc =================================================================== --- branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc (revision 2819) +++ branches/cleanup-2008/milena/doc/benchmark/morpho/erosion.cc (revision 2820) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -77,6 +78,7 @@ win::diag2d diag2d(31); win::backdiag2d backdiag2d(31); win::octagon2d oct(6 * 3 + 1); + win::disk2d disk(6 * 3 + 1); image2d<int_u8> out; image2d<int_u8> ref; // trace::quiet = false; @@ -289,4 +291,24 @@ std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; } + + std::cout << "-------------------------- Disk: " << std::endl; + + // Disk + { + t.start(); + ref = morpho::impl::generic::erosion_on_function(lena, disk); + std::cout << "generic on disk: " << t << std::endl; + io::pgm::save(ref, "out_disk_ref.pgm"); + } + + { + t.start(); + out = morpho::erosion(lena, disk); + std::cout << "dispach on disk: " << t << std::endl; + bool test = out == ref; + mln_assertion(test); + std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; + } + }

1 0

cleanup-2008 2819: Fix extension handling in fastest functors of morpho erosion.
by Thierry Geraud 05 Nov '08

05 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix extension handling in fastest functors of morpho erosion. * tests/morpho/erosion.cc: Stress test while setting border thickness to 0. Fix copyright layout. * mln/morpho/erosion.spe.hh (erosion_arbitrary_2d_fastest_functor): Move extension handling into... (erosion_arbitrary_2d_fastest): ...this routine. (erosion_directional_nd_fastest_functor): Move extension handling into... (erosion_directional_nd_fastest): ...this routine. mln/morpho/erosion.spe.hh | 19 ++++++++++++++++--- tests/morpho/erosion.cc | 15 +++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) Index: tests/morpho/erosion.cc --- tests/morpho/erosion.cc (revision 2818) +++ tests/morpho/erosion.cc (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/morpho/erosion.cc - * - * \brief Test on mln::morpho::erosion. - */ +/// \file tests/morpho/erosion.cc +/// +/// Test on mln::morpho::erosion. #include <mln/core/image/image2d.hh> #include <mln/win/all.hh> @@ -43,12 +43,14 @@ #include "tests/data.hh" + int main() { using namespace mln; using value::int_u8; - border::thickness = 20; + border::thickness = 0; + image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); @@ -61,6 +63,7 @@ image2d<int_u8> out; image2d<int_u8> ref; +// trace::quiet = false; // Rectangle { Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2818) +++ mln/morpho/erosion.spe.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -398,7 +399,9 @@ void init() { - extension::adjust_fill(input, win, accu); + // extension::adjust_fill is performed in the routine + // because it has to be done before the initialization of + // the fast iterators (q_*). initialize(output, input); accu.init(); p = input.domain().pmin() - dps[0]; @@ -457,6 +460,10 @@ trait::image::kind::binary) is_binary; typedef mlc_if(is_binary, accu::land, accu::min_h<mln_value(I)>) A; + extension::adjust_fill(input, + geom::delta(win) + 1, + A()); + typedef erosion_arbitrary_2d_fastest_functor<I, W, A> F; F f(exact(input), exact(win)); canvas::browsing::snake_generic(f); @@ -753,7 +760,9 @@ void init() { - extension::adjust_fill(input, win, accu); + // extension::adjust_fill is performed in the routine + // because it has to be done before the initialization of + // the fast iterators (q_l and q_r). initialize(output, input); } @@ -795,6 +804,10 @@ trait::image::kind::binary) is_binary; typedef mlc_if(is_binary, accu::land, accu::min_h<mln_value(I)>) A; + extension::adjust_fill(input, + geom::delta(win) + 1, + A()); + typedef erosion_directional_nd_fastest_functor<I, W, A> F; F f(exact(input), exact(win), dir); canvas::browsing::directional(f);

1 0

Re: [Olena-patches] [Olena] #43: Fix the initialization of all global constants.
by Olena 05 Nov '08

05 Nov '08

#43: Fix the initialization of all global constants. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: defect | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: fixed | Keywords: ------------------------+--------------------------------------------------- Changes (by lazzara): * status: new => closed * resolution: => fixed -- Ticket URL: <https://trac.lrde.org/olena/ticket/43#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

2818: Fix the initialization of all global constants. (#43)
by Guillaume Lazzara 05 Nov '08

05 Nov '08

* mln/border/thickness.hh, * mln/debug/colorize.hh, * mln/tag/init.hh, * mln/trace/quiet.hh: use extern and move implementation within MLN_INCLUDE_ONLY. --- milena/ChangeLog | 10 ++++++++++ milena/mln/border/thickness.hh | 9 +++++++-- milena/mln/debug/colorize.hh | 10 ++++++++-- milena/mln/tag/init.hh | 24 +++++++++++++++++------- milena/mln/trace/quiet.hh | 30 ++++++++++++++++++++++++------ 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6a7bde2..e14e709 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2008-11-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix the initialization of all global constants. (#43) + + * mln/border/thickness.hh, + * mln/debug/colorize.hh, + * mln/tag/init.hh, + * mln/trace/quiet.hh: use extern and move implementation within + MLN_INCLUDE_ONLY. + 2008-11-05 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix mln/accu/maj_h.hh. diff --git a/milena/mln/border/thickness.hh b/milena/mln/border/thickness.hh index 7f953f9..499c0e9 100644 --- a/milena/mln/border/thickness.hh +++ b/milena/mln/border/thickness.hh @@ -41,8 +41,13 @@ namespace mln namespace border { - // FIXME: Make this a proper global (issue #43). - static unsigned thickness = 3; + extern unsigned thickness; + +# ifndef MLN_INCLUDE_ONLY + + unsigned thickness = 3; + +# endif // !MLN_INCLUDE_ONLY } // end of namespace mln::border diff --git a/milena/mln/debug/colorize.hh b/milena/mln/debug/colorize.hh index 179518e..c997921 100644 --- a/milena/mln/debug/colorize.hh +++ b/milena/mln/debug/colorize.hh @@ -48,8 +48,8 @@ namespace mln namespace colorize_ { - static unsigned min_value = 20; - static unsigned max_value = 220; + extern unsigned min_value; + extern unsigned max_value; } @@ -70,6 +70,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + namespace colorize_ + { + unsigned min_value = 20; + unsigned max_value = 220; + } + namespace internal { diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index 37039d9..e6921a7 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -47,13 +47,23 @@ namespace mln struct extension_t {}; struct function_t {}; - // FIXME: Make these proper globals (issue #43). - static const image_t image = image_t(); - static const domain_t domain = domain_t(); - static const bbox_t bbox = bbox_t(); - static const border_t border = border_t(); - static const extension_t extension = extension_t(); - static const function_t function = function_t(); + extern const image_t& image; + extern const domain_t& domain; + extern const bbox_t& bbox; + extern const border_t& border; + extern const extension_t& extension; + extern const function_t& function; + +# ifndef MLN_INCLUDE_ONLY + + const image_t& image = image_t(); + const domain_t& domain = domain_t(); + const bbox_t& bbox = bbox_t(); + const border_t& border = border_t(); + const extension_t& extension = extension_t(); + const function_t& function = function_t(); + +# endif // !MLN_INCLUDE_ONLY } // end of namespace mln::tag diff --git a/milena/mln/trace/quiet.hh b/milena/mln/trace/quiet.hh index e7467f0..dfcca01 100644 --- a/milena/mln/trace/quiet.hh +++ b/milena/mln/trace/quiet.hh @@ -42,20 +42,38 @@ namespace mln namespace trace { - static bool quiet = true; - static unsigned tab = 0; - static bool full_trace = false; + extern bool quiet; + extern unsigned tab ; + extern bool full_trace; namespace internal { - static unsigned max_tab = 0; - static timeval start_time; - static bool is_quiet = quiet; + extern unsigned max_tab ; + extern timeval start_time; + extern bool is_quiet; } // end of namespace mln::trace::internal +# ifndef MLN_INCLUDE_ONLY + + bool quiet = true; + unsigned tab = 0; + bool full_trace = false; + + + namespace internal + { + + unsigned max_tab = 0; + timeval start_time; + bool is_quiet = quiet; + + } // end of namespace mln::trace::internal + +# endif // !MLN_INCLUDE_ONLY + } // end of namespace mln::trace } // end of namespace mln -- 1.5.6.5

1 0