Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

Start a nNew thread

branch unstable/scribo updated: olena-2.0-85-ge07c016

by git＠lrde.epita.fr

12 years, 2 months

olena-2.0-85-ge07c016 configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is enabled.

by Guillaume Lazzara

--- ChangeLog | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81e9545..8b27ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is + enabled. + +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * m4/oln-with-lib.m4: Lookup for multiple AND single libraries while checking Tesseract availability. diff --git a/configure.ac b/configure.ac index a53bcf8..8d7d60d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -212,7 +212,7 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) OLN_WITH_LIB_PKG_CONFIG([ImageMagick++], [Magick++.h], [Magick++], [imagemagickxx], [IMAGEMAGICKXX]) -OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [Magick++], +OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [GraphicsMagick++], [graphicsmagickxx], [GRAPHICSMAGICKXX]) # If both ImageMagick and GraphicsMagic are available, choose the -- 1.7.2.5

12 years, 2 months

olena-2.0-26-gce13c0e incomplete and unefficient implementation of the lpde inpainting method

by Coddy Levi

--- milena/mln/inpainting/inpaint.hh | 98 +++++++++++++++++++++++ milena/mln/inpainting/lpde.hh | 146 ++++++++++++++++++++++++++++++++++ milena/mln/inpainting/metric/psnr.hh | 51 ++++++++++++ 3 files changed, 295 insertions(+), 0 deletions(-) create mode 100644 milena/mln/inpainting/inpaint.hh create mode 100644 milena/mln/inpainting/lpde.hh create mode 100644 milena/mln/inpainting/metric/psnr.hh diff --git a/milena/mln/inpainting/inpaint.hh b/milena/mln/inpainting/inpaint.hh new file mode 100644 index 0000000..44f20a8 --- /dev/null +++ b/milena/mln/inpainting/inpaint.hh @@ -0,0 +1,98 @@ +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> + +#include <mln/literal/colors.hh> + +#include <mln/core/alias/box2d.hh> +#include <mln/accu/shape/bbox.hh> +#include <mln/value/label_8.hh> +#include <mln/labeling/compute.hh> + +#include <mln/pw/value.hh> +#include <mln/draw/box.hh> + +#include <mln/util/timer.hh> + +namespace mln +{ + namespace inpainting + { + /* + * Interface + */ + + template <template <typename> class I, typename T, typename F> + I<T> inpaint(const Image<I<T> >& src_, + const Image<I<bool> >& mask_, + F inpaint_method, + unsigned inpaint_radius); + + /* + * Implem + */ + + template <template <typename> class I, typename T, typename F> + I<T> inpaint(const Image<I<T> >& inpaint_src_, + const Image<I<bool> >& inpaint_mask_, + F inpaint_method, + unsigned inpaint_radius) + { + const I<T>& inpaint_src = exact(inpaint_src_); + const I<bool>& inpaint_mask = exact(inpaint_mask_); + + box2d roi; + { // Compute the region of interest + I<value::label_8> lbl(inpaint_mask.domain()); + + data::fill(lbl, 1); + data::fill((lbl | pw::value(inpaint_mask)).rw(), 0); + + value::label_8 nlabels = 2; + + util::array<box2d> roi_bboxes = + labeling::compute(accu::meta::shape::bbox(), + lbl, + nlabels); + + roi = roi_bboxes[0]; + roi.enlarge(inpaint_radius); + roi.crop_wrt(inpaint_src.domain()); + } + + I<mln_sum(T)> new_src(roi); + { // paste inpaint_src to new_src + mln_piter(I<T>) p(roi); + mln_pixter(I<mln_sum(T)>) p_new(new_src); + + for_all_2(p, p_new) + p_new.val() = inpaint_src(p); + } + + I<bool> new_mask(roi); + data::paste(inpaint_mask | roi, new_mask); + + mln::util::timer t; + t.start(); + + inpaint_method(new_src, new_mask); + + t.stop(); + std::cout << "inpaint time = " << t << std::endl; + + I<T> output(inpaint_src); + { // paste new_src to output + mln_piter(I<T>) p(roi); + mln_pixter(const I<mln_sum(T)>) p_new(new_src); + + for_all_2(p, p_new) + output(p) = p_new.val(); + } + + return output; + } + + } /* mln::inpainting */ + +} /* mln*/ diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh new file mode 100644 index 0000000..1f754d8 --- /dev/null +++ b/milena/mln/inpainting/lpde.hh @@ -0,0 +1,146 @@ +#include <algorithm> +#include <vector> + +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/literal/colors.hh> +#include <mln/literal/zero.hh> + +#include <mln/linear/convolve.hh> +#include <mln/linear/gaussian.hh> +#include <mln/core/alias/w_window2d_float.hh> + +#include <mln/pw/value.hh> + +#include <mln/value/int_u.hh> +#include <mln/algebra/vec.hh> + +#include <mln/data/paste.hh> + +#include <mln/core/alias/vec2d.hh> + +namespace mln +{ + namespace inpainting + { + struct lpde + { + public: + lpde(float dt = 1.0f, float dx = 1.0f, float t_f = 20.0); + + template <template <typename> class I, typename T> + void operator()(I<T>& src, + I<bool>& mask); + + void set(const std::vector<float>& w); + + private: + std::vector<float> w; + float dt; + float dx; + float t_f; + }; + + lpde::lpde(float dt, float dx, float t_f) + { + this->dt = dt; + this->dx = dx; + this->t_f = t_f; + } + + template <typename I> + void compute_diff_invariants(const I& u, + std::vector& invs, + const std::vector<float>& w) + { + const float sigma = 0.8; + + invs[0] = linear::gaussian_1st_derivative(u, sigma, 1); + invs[1] = linear::gaussian_1st_derivative(u, sigma, 0); + invs[2] = linear::gaussian_2nd_derivative(u, sigma, 1); + invs[3] = linear::gaussian_2nd_derivative(u, sigma, 0); + invs[4] = linear::gaussian_2nd_derivative(u, sigma); + + { // TV regularization term div ( \nabla u / | \nabla u | ) + + I u_xnx( invs[5].domain() ); + I u_yny( invs[5].domain() ); + + { + mln_piter(I) p( invs[5].domain() ); + + for_all(p) + { + for (unsigned i = 0; i < mln_dim(mln_value(I)); ++i) + { + float norm; + { + vec2d_f v; + + v[0] = invs[0](p)[i]; + v[1] = invs[1](p)[i]; + + norm = norm::l2(v); + } + + u_xnx(p)[i] = invs[0](p)[i] / norm; + u_yny(p)[i] = invs[1](p)[i] / norm; + } + } + } + + u_xnx = linear::gaussian_1st_derivative(u_xnx, sigma, 1); + u_yny = linear::gaussian_1st_derivative(u_yny, sigma, 0); + + mln_piter(I) p( invs[5].domain() ); + for_all(p) + { + invs[5](p) = u_xnx(p) + u_yny(p); + } + } + } + + template <template <typename> class I, typename T> + void lpde::operator()(I<T>& src, + I<bool>& mask) + { + + data::fill((src | pw::value(mask)).rw(), literal::zero); + + std::vector<I<T> > invs(w.size(), src.domain()); + + I<T>& u_t = src; + + float r = this->dt / (this->dx * this->dx); + + for (float t = 0; t < this->t_f; t += dt) + { + compute_diff_invariants(u_t, invs, this->w); + + mln_piter(I<T>) p(u_t.domain()); + + for_all(p) + { + if (mask(p)) + { + T contribution = literal::zero; + + for (unsigned k = 0; k < w.size(); ++k) + { + contribution += this->w[k] * invs[k](p); + } + + u_t(p) += r * contribution; + } + } + } + } + + void lpde::set(const std::vector<float>& w) + { + this->w = w; + } + } /* mln::inpainting */ + +} /* mln*/ diff --git a/milena/mln/inpainting/metric/psnr.hh b/milena/mln/inpainting/metric/psnr.hh new file mode 100644 index 0000000..4998b4a --- /dev/null +++ b/milena/mln/inpainting/metric/psnr.hh @@ -0,0 +1,51 @@ +#ifndef MLN_INPAINTING_METRIC_PSNR_HH +# define MLN_INPAINTING_METRIC_PSNR_HH + +# include <cmath> + +# include <mln/core/concept/image.hh> +# include <mln/norm/l1.hh> +# include <mln/trait/value_.hh> +# include <mln/algebra/vec.hh> + +namespace mln +{ + namespace inpainting + { + namespace metric + { + template <typename I> + double psnr(const Image& original_, + const Image& altered_) + { + const I& original = exact(original_); + const I& altered = exact(altered_); + + mln_piter(I) p( altered.domain() ); + + double mse = 0; + + const unsigned dim = mln_dim(mln_value(I)); + + for_all(p) + { + const mln_sum(mln_value(I)) diff = original(p) - altered(p); + + if (dim == 1) + mse += diff * diff; + else + for (unsigned i = 0; i < dim; ++i) + mse += diff[i] * diff[i]; + } + + mse /= ( altered.ncols() * altered.nrows() * dim); + + const unsigned max = pow(2, mln_nbits(mln_value(I)) / dim) - 1; + + return 20 * log10( max ) - 10 * log10(mse); + } + } + } +} + +#endif -- 1.7.2.5

12 years, 2 months

branch exp/inpainting created: olena-2.0-29-gff189ba

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/inpainting has been created at ff189ba30ee97d424fe6e480cabb0fc4cc49e2c3 (commit) - Log ----------------------------------------------------------------- ff189ba add float_type typedef for switching from float to double eeecbfb fix reading and writing the same image using neighbours 925e576 More efficient lpde inpainting method implementation ce13c0e incomplete and unefficient implementation of the lpde inpainting method ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 2 months

olena-2.0-29-gff189ba add float_type typedef for switching from float to double

by Coddy Levi

--- milena/mln/inpainting/inpaint.hh | 21 +++++++++++++---- milena/mln/inpainting/lpde.hh | 44 +++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/milena/mln/inpainting/inpaint.hh b/milena/mln/inpainting/inpaint.hh index 86398e5..f117cb7 100644 --- a/milena/mln/inpainting/inpaint.hh +++ b/milena/mln/inpainting/inpaint.hh @@ -63,13 +63,20 @@ namespace mln roi.crop_wrt(inpaint_src.domain()); } - I<mln_sum(T)> new_src(roi); + //typedef mln_sum(T) sum_type; + typedef algebra::vec<3u, typename F::float_type> sum_type; + + I<sum_type> new_src(roi); { // paste inpaint_src to new_src mln_piter(I<T>) p(roi); - mln_pixter(I<mln_sum(T)>) p_new(new_src); + mln_pixter(I<sum_type>) p_new(new_src); for_all_2(p, p_new) - p_new.val() = inpaint_src(p); + { + p_new.val()[0] = inpaint_src(p).comp(0); + p_new.val()[1] = inpaint_src(p).comp(1); + p_new.val()[2] = inpaint_src(p).comp(2); + } } I<bool> new_mask(roi); @@ -93,10 +100,14 @@ namespace mln I<T> output(inpaint_src); { // paste new_src to output mln_piter(I<T>) p(roi); - mln_pixter(const I<mln_sum(T)>) p_new(new_src); + mln_pixter(const I<sum_type>) p_new(new_src); for_all_2(p, p_new) - output(p) = p_new.val(); + { + output(p).comp(0) = p_new.val()[0]; + output(p).comp(1) = p_new.val()[1]; + output(p).comp(2) = p_new.val()[2]; + } } return output; diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh index 44d036e..65f6ab1 100644 --- a/milena/mln/inpainting/lpde.hh +++ b/milena/mln/inpainting/lpde.hh @@ -41,16 +41,18 @@ namespace mln struct lpde { public: + typedef double float_type; + lpde(float dt = 1.0f, float dx = 1.0f, float t_f = 20.0); template <template <typename> class I, typename T> void operator()(I<T>& src, I<bool>& mask); - void set(const std::vector<float>& w); + void set(const std::vector<float_type>& w); private: - std::vector<float> w; + std::vector<float_type> w; float dt; float dx; float t_f; @@ -94,24 +96,25 @@ namespace mln } template <typename I, typename M> - float diffuse(const I& u, - I& u_next, - //const I& f, - const std::vector<float>& w, - const M& mask) + lpde::float_type diffuse(const I& u, + I& u_next, + //const I& f, + const std::vector<lpde::float_type>& w, + const M& mask) { + typedef lpde::float_type float_type; typedef mln_value(I) T; - const float activation_threshold = 0.001; + const float_type activation_threshold = 0; const unsigned derivative_kernels_size = 5; - const float* derivative_kernel[derivative_kernels_size]; + const float_type* derivative_kernel[derivative_kernels_size]; - derivative_kernel[0] = make_dx_kernel(); - derivative_kernel[1] = make_dy_kernel(); - derivative_kernel[2] = make_dxx_kernel(); - derivative_kernel[3] = make_dyy_kernel(); - derivative_kernel[4] = make_dxy_kernel(); + derivative_kernel[0] = make_dx_kernel<float_type>(); + derivative_kernel[1] = make_dy_kernel<float_type>(); + derivative_kernel[2] = make_dxx_kernel<float_type>(); + derivative_kernel[3] = make_dyy_kernel<float_type>(); + derivative_kernel[4] = make_dxy_kernel<float_type>(); static window2d full3x3; static const bool vals[] = { 1, 1, 1, @@ -126,12 +129,11 @@ namespace mln mln_pixter(const M) p_m(mask); mln_qixter(const I, const window2d) q(p, full3x3); - float sse = 0; + float_type sse = 0; - unsigned car = 0; for_all_3 (p, p_next, p_m) { - //if (p_m.val()) + if (p_m.val()) { const T old = p.val(); @@ -208,9 +210,9 @@ namespace mln I<T>* u = &u_; I<T>* u_next = &u_next_; - float sse = std::numeric_limits<float>::max() / 2.0; + float_type sse = std::numeric_limits<float_type>::max() / 2.0; - float sse_old = std::numeric_limits<float>::max(); + float_type sse_old = std::numeric_limits<float_type>::max(); float t = 0; while (t < this->t_f && sse < sse_old && !std::isnan(sse)) @@ -223,7 +225,7 @@ namespace mln u = u_next; u_next = swap; - std::cout << "sse = " << sse << std::endl; + //std::cout << "sse = " << sse << std::endl; t += this->dt; } @@ -231,7 +233,7 @@ namespace mln std::cout << "Number of iterations: " << t << std::endl; } - void lpde::set(const std::vector<float>& w) + void lpde::set(const std::vector<float_type>& w) { this->w = w; } -- 1.7.2.5

12 years, 2 months

branch exp/khalimsky updated: olena-2.0-175-g6848315

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/khalimsky has been updated via 6848315e28283827bd81fd8f9d0d17edc9bf3346 (commit) via d821fead0f0deb1458d0f2a5cc25310df44bb1ef (commit) via 7510b01475b37915421d41b21d3b31110b87eeeb (commit) via 24fb78f220238a92fe6c47cb14d8c70c559fafb8 (commit) from ce9a6a4d73daaddac6be6d993cb2c2da1db11d42 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 6848315 mln/world/kn/dilate_0_from_1_faces.hh: New. d821fea mln/world/kn/fill_1_from_2_faces.hh: Rely on fill_1_from_aux_2_faces. 7510b01 Add world::kn::fill_2_from_aux_1_faces.hh. 24fb78f Various small fixes. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 68 ++++++++++ milena/mln/canvas/labeling/video.hh | 5 +- milena/mln/debug/filename.hh | 17 ++- milena/mln/fun/v2v/abs.hh | 21 ++-- milena/mln/labeling/colorize.hh | 6 +- milena/mln/value/intsub.hh | 16 +++ milena/mln/world/k1/fill_0_from_primary_faces.hh | 4 +- milena/mln/world/k1/neighb2d.hh | 51 ++++++-- .../k2/fill_non_primary_from_primary_2_faces.hh | 4 + .../world/kn/border/adjust_duplicate_2_faces.hh | 9 +- milena/mln/world/kn/border/duplicate_2_faces.hh | 6 +- ...duplicate_2_faces.hh => fill_1_from_2_faces.hh} | 47 ++++---- .../mln/world/kn/border/fill_1_from_aux_2_faces.hh | 133 ++++++++++++++++++++ milena/mln/world/kn/compute_tree_of_shapes.hh | 4 +- .../kn/{face_dim.hh => dilate_0_from_1_faces.hh} | 43 +++---- milena/mln/world/kn/fill_0_from_2_faces.hh | 6 +- milena/mln/world/kn/fill_1_from_2_faces.hh | 55 ++------- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 14 ++- milena/mln/world/kn/fill_2_from_1_faces.hh | 46 ++------ ..._from_1_faces.hh => fill_2_from_aux_1_faces.hh} | 78 +++++++----- milena/tests/value/intsub.cc | 10 ++ milena/tests/world/kn/Makefile.am | 2 + milena/tests/world/kn/display_enlarged.cc | 34 +++--- milena/tests/world/kn/fill_1_from_aux_2_faces.cc | 2 - milena/tests/world/kn/fill_2_from_1_faces.cc | 21 +--- ..._from_1_faces.cc => fill_2_from_aux_1_faces.cc} | 51 ++++---- 26 files changed, 479 insertions(+), 274 deletions(-) copy milena/mln/world/kn/border/{adjust_duplicate_2_faces.hh => fill_1_from_2_faces.hh} (59%) create mode 100644 milena/mln/world/kn/border/fill_1_from_aux_2_faces.hh copy milena/mln/world/kn/{face_dim.hh => dilate_0_from_1_faces.hh} (63%) copy milena/mln/world/kn/{fill_2_from_1_faces.hh => fill_2_from_aux_1_faces.hh} (52%) copy milena/tests/world/kn/{fill_0_from_1_faces.cc => fill_2_from_aux_1_faces.cc} (69%) hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 2 months

olena-2.0-175-g6848315 mln/world/kn/dilate_0_from_1_faces.hh: New.

by Guillaume Lazzara

--- milena/ChangeLog | 8 +++- .../kn/{face_dim.hh => dilate_0_from_1_faces.hh} | 43 ++++++++++---------- 2 files changed, 27 insertions(+), 24 deletions(-) copy milena/mln/world/kn/{face_dim.hh => dilate_0_from_1_faces.hh} (63%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0a784ae..39d9925 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,9 +1,13 @@ -2012-11-01 Guilelaume Lazzara <z(a)lrde.epita.fr> +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/world/kn/dilate_0_from_1_faces.hh: New. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/world/kn/fill_1_from_2_faces.hh: Rely on fill_1_from_aux_2_faces. -2012-11-01 Guilelaume Lazzara <z(a)lrde.epita.fr> +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> Add world::kn::fill_2_from_aux_1_faces.hh. diff --git a/milena/mln/world/kn/face_dim.hh b/milena/mln/world/kn/dilate_0_from_1_faces.hh similarity index 63% copy from milena/mln/world/kn/face_dim.hh copy to milena/mln/world/kn/dilate_0_from_1_faces.hh index 6a6c418..1acfd83 100644 --- a/milena/mln/world/kn/face_dim.hh +++ b/milena/mln/world/kn/dilate_0_from_1_faces.hh @@ -25,12 +25,17 @@ /// \file /// -/// \brief Returns the dimension of site in KN. +/// \brief Dilate 1-faces values to 0-faces. -#ifndef MLN_WORLD_KN_FACE_DIM_HH -# define MLN_WORLD_KN_FACE_DIM_HH +/// FIXME: to be optimized. We could stop looking in neighborhod +/// values once the first True is found. -# include <mln/core/alias/point2d.hh> +#ifndef MLN_WORLD_KN_DILATE_0_FROM_1_FACES_HH +# define MLN_WORLD_KN_DILATE_0_FROM_1_FACES_HH + +# include <mln/core/concept/image.hh> +# include <mln/accu/logic/lor.hh> +# include <mln/world/kn/fill_0_from_1_faces.hh> namespace mln { @@ -41,28 +46,24 @@ namespace mln namespace kn { - /// \brief Returns the dimension of site in KN. - unsigned face_dim(const point2d& p); - - /// \overload - unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col); + /// \brief Dilate 1-faces values to 0-faces. + template <typename I> + void dilate_0_from_1_faces(Image& inout); # ifndef MLN_INCLUDE_ONLY + template <typename I> + void dilate_0_from_1_faces(Image& inout_) + { + trace::entering("mln::world::kn::dilate_0_from_1_faces"); - // Facade + mln_precondition(exact(inout_).is_valid()); + I& inout = exact(inout_); - inline - unsigned face_dim(const point2d& p) - { - return face_dim(p.row(), p.col()); - } + fill_0_from_1_faces(inout, accu::logic::lor()); - inline - unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col) - { - return (row % 2 == 0) + (col % 2 == 0); + trace::exiting("mln::world::kn::dilate_0_from_1_faces"); } @@ -74,6 +75,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_FACE_DIM_HH - - +#endif // ! MLN_WORLD_KN_DILATE_0_FROM_1_FACES_HH -- 1.7.2.5

12 years, 2 months

olena-2.0-174-gd821fea mln/world/kn/fill_1_from_2_faces.hh: Rely on fill_1_from_aux_2_faces.

by Guillaume Lazzara

--- milena/ChangeLog | 7 +++- milena/mln/world/kn/fill_1_from_2_faces.hh | 55 +++++----------------------- 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fe23428..0a784ae 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,9 @@ -2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> +2012-11-01 Guilelaume Lazzara <z(a)lrde.epita.fr> + + * mln/world/kn/fill_1_from_2_faces.hh: Rely on + fill_1_from_aux_2_faces. + +2012-11-01 Guilelaume Lazzara <z(a)lrde.epita.fr> Add world::kn::fill_2_from_aux_1_faces.hh. diff --git a/milena/mln/world/kn/fill_1_from_2_faces.hh b/milena/mln/world/kn/fill_1_from_2_faces.hh index c190347..43dc6ac 100644 --- a/milena/mln/world/kn/fill_1_from_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_2_faces.hh @@ -30,11 +30,9 @@ #ifndef MLN_WORLD_KN_FILL_1_FROM_2_FACES_HH # define MLN_WORLD_KN_FILL_1_FROM_2_FACES_HH -# include <mln/core/alias/point2d.hh> -# include <mln/world/kn/is_1_face_vertical.hh> -# include <mln/world/kn/is_1_face_horizontal.hh> -# include <mln/world/kn/border/compute_1_faces.hh> -# include <mln/world/kn/safe_cast.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/function.hh> +# include <mln/world/kn/fill_1_from_aux_2_faces.hh> namespace mln { @@ -84,59 +82,26 @@ namespace mln template <typename I, typename A> - void fill_1_from_2_faces(Image& inout_, const Accumulator<A>& accu_) + void fill_1_from_2_faces(Image& inout, const Accumulator<A>& accu) { trace::entering("mln::world::kn::fill_1_from_2_faces"); - I& inout = exact(inout_); - mln_precondition(inout.is_valid()); - - A accu = exact(accu_); - typedef mln_argument(A) arg; - mln_piter(I) p(inout.domain()); - for_all(p) - if (kn::is_1_face_vertical(p)) - { - accu.init(); - if (inout.domain().has(p + left)) - accu.take(safe_cast_to<arg>(inout(p + left))); - if (inout.domain().has(p + right)) - accu.take(safe_cast_to<arg>(inout(p + right))); - inout(p) = safe_cast(accu.to_result()); - } - else if (is_1_face_horizontal(p)) - { - accu.init(); - if (inout.domain().has(p + up)) - accu.take(safe_cast_to<arg>(inout(p + up))); - if (inout.domain().has(p + down)) - accu.take(safe_cast_to<arg>(inout(p + down))); - inout(p) = safe_cast(accu.to_result()); - } + mln_precondition(exact(inout).is_valid()); + + kn::fill_1_from_aux_2_faces(inout, inout, accu); trace::exiting("mln::world::kn::fill_1_from_2_faces"); } template <typename I, typename F> - void fill_1_from_2_faces(Image& inout_, const Function_vv2v<F>& f_) + void fill_1_from_2_faces(Image& inout, const Function_vv2v<F>& f) { trace::entering("mln::world::kn::fill_1_from_2_faces"); - I& inout = exact(inout_); - const F& f = exact(f_); - mln_precondition(inout.is_valid()); - - kn::border::compute_1_faces(inout, f); + mln_precondition(exact(inout).is_valid()); - mln_piter(I) p(inout.domain()); - for_all(p) - if (kn::is_1_face_vertical(p)) - inout(p) = safe_cast(f(safe_cast(inout(p + left)), - safe_cast(inout(p + right)))); - else if (is_1_face_horizontal(p)) - inout(p) = safe_cast(f(safe_cast(inout(p + up)), - safe_cast(inout(p + down)))); + kn::fill_1_from_aux_2_faces(inout, inout, f); trace::exiting("mln::world::kn::fill_1_from_2_faces"); } -- 1.7.2.5

12 years, 2 months

olena-2.0-173-g7510b01 Add world::kn::fill_2_from_aux_1_faces.hh.

by Guillaume Lazzara

* mln/world/kn/fill_2_from_1_faces.hh: Rely on fill_2_from_aux_1_faces. * tests/world/kn/Makefile.am: New target. * mln/world/kn/fill_2_from_aux_1_faces.hh, * tests/world/kn/fill_2_from_aux_1_faces.cc: New. --- milena/ChangeLog | 12 +++ milena/mln/world/kn/fill_2_from_1_faces.hh | 46 +++--------- ..._from_1_faces.hh => fill_2_from_aux_1_faces.hh} | 78 ++++++++++++-------- milena/tests/world/kn/Makefile.am | 2 + ..._from_1_faces.cc => fill_2_from_aux_1_faces.cc} | 43 +++++------ 5 files changed, 90 insertions(+), 91 deletions(-) copy milena/mln/world/kn/{fill_2_from_1_faces.hh => fill_2_from_aux_1_faces.hh} (52%) copy milena/tests/world/kn/{fill_2_from_1_faces.cc => fill_2_from_aux_1_faces.cc} (74%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 63e9d85..fe23428 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Add world::kn::fill_2_from_aux_1_faces.hh. + + * mln/world/kn/fill_2_from_1_faces.hh: Rely on + fill_2_from_aux_1_faces. + + * tests/world/kn/Makefile.am: New target. + + * mln/world/kn/fill_2_from_aux_1_faces.hh, + * tests/world/kn/fill_2_from_aux_1_faces.cc: New. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle border value with auxiliary data images. * mln/world/kn/border/fill_1_from_2_faces.hh, diff --git a/milena/mln/world/kn/fill_2_from_1_faces.hh b/milena/mln/world/kn/fill_2_from_1_faces.hh index c38f69f..afbb711 100644 --- a/milena/mln/world/kn/fill_2_from_1_faces.hh +++ b/milena/mln/world/kn/fill_2_from_1_faces.hh @@ -30,9 +30,9 @@ #ifndef MLN_WORLD_KN_FILL_2_FROM_1_FACES_HH # define MLN_WORLD_KN_FILL_2_FROM_1_FACES_HH -# include <mln/core/alias/point2d.hh> -# include <mln/world/kn/is_2_face.hh> -# include <mln/world/kn/safe_cast.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/function.hh> +# include <mln/world/kn/fill_2_from_aux_1_faces.hh> namespace mln { @@ -59,7 +59,7 @@ namespace mln */ template <typename I, typename F> - void fill_2_from_1_faces(Image& inout, Function_vvvv2v<F>& f); + void fill_2_from_1_faces(Image& inout, const Function_vvvv2v<F>& f); /// \overload template <typename I, typename A> @@ -73,51 +73,25 @@ namespace mln template <typename I, typename F> - void fill_2_from_1_faces(Image& inout_, Function_vvvv2v<F>& f_) + void fill_2_from_1_faces(Image& inout, const Function_vvvv2v<F>& f) { trace::entering("mln::world::kn::fill_2_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); - I& inout = exact(inout_); - F& f = exact(f_); + mln_precondition(exact(inout).is_valid()); - mln_piter(I) p(inout.domain()); - for_all(p) - if (kn::is_2_face(p)) - inout(p) = safe_cast(f(safe_cast(inout(p + up)), - safe_cast(inout(p + left)), - safe_cast(inout(p + right)), - safe_cast(inout(p + down)))); + fill_2_from_aux_1_faces(inout, inout, f); trace::exiting("mln::world::kn::fill_2_from_1_faces"); } template <typename I, typename A> - void fill_2_from_1_faces(Image& inout_, const Accumulator<A>& accu_) + void fill_2_from_1_faces(Image& inout, const Accumulator<A>& accu) { trace::entering("mln::world::kn::fill_2_from_1_faces"); + mln_precondition(exact(inout).is_valid()); - I& inout = exact(inout_); - mln_precondition(inout.is_valid()); - - A accu = exact(accu_); - typedef mln_argument(A) arg; - mln_piter(I) p(inout.domain()); - for_all(p) - if (kn::is_2_face(p)) - { - accu.init(); - if (inout.domain().has(p + up)) - accu.take(safe_cast_to<arg>(inout(p + up))); - if (inout.domain().has(p + left)) - accu.take(safe_cast_to<arg>(inout(p + left))); - if (inout.domain().has(p + right)) - accu.take(safe_cast_to<arg>(inout(p + right))); - if (inout.domain().has(p + down)) - accu.take(safe_cast_to<arg>(inout(p + down))); - inout(p) = safe_cast(accu.to_result()); - } + fill_2_from_aux_1_faces(inout, inout, accu); trace::exiting("mln::world::kn::fill_2_from_1_faces"); } diff --git a/milena/mln/world/kn/fill_2_from_1_faces.hh b/milena/mln/world/kn/fill_2_from_aux_1_faces.hh similarity index 52% copy from milena/mln/world/kn/fill_2_from_1_faces.hh copy to milena/mln/world/kn/fill_2_from_aux_1_faces.hh index c38f69f..18c32f9 100644 --- a/milena/mln/world/kn/fill_2_from_1_faces.hh +++ b/milena/mln/world/kn/fill_2_from_aux_1_faces.hh @@ -25,14 +25,14 @@ /// \file /// -/// \brief Fill 2 faces in a KN 2D image using its 1 faces. +/// \brief Fill 0 faces in a KN 2D image using 2-faces values from an +/// auxiliary image. -#ifndef MLN_WORLD_KN_FILL_2_FROM_1_FACES_HH -# define MLN_WORLD_KN_FILL_2_FROM_1_FACES_HH +#ifndef MLN_WORLD_KN_FILL_2_FROM_AUX_1_FACES_HH +# define MLN_WORLD_KN_FILL_2_FROM_AUX_1_FACES_HH # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_2_face.hh> -# include <mln/world/kn/safe_cast.hh> namespace mln { @@ -43,10 +43,16 @@ namespace mln namespace kn { - /*! \brief Fill 0 faces in a KN 2D image using its 2 faces. + /*! \brief Fill 0 faces in a KN 2D image using 2-faces values + from an auxiliary image. \param[in,out] inout A 2D image immersed in KN. - \param[in,out] f A functor computing a result from four values. + \param[in] aux An auxiliary image with the same domain as \p + inout. + \param[in] f A functor computing a result from four values. + + Warning: This function considers that 1-faces values in \p aux + borders are initialized. This function use the following neighborhood: @@ -58,12 +64,14 @@ namespace mln */ - template <typename I, typename F> - void fill_2_from_1_faces(Image& inout, Function_vvvv2v<F>& f); + template <typename I, typename J, typename F> + void fill_2_from_aux_1_faces(Image& inout, const Image<J>& aux, + const Function_vvvv2v<F>& f); /// \overload - template <typename I, typename A> - void fill_2_from_1_faces(Image& inout, const Accumulator<A>& accu); + template <typename I, typename J, typename A> + void fill_2_from_aux_1_faces(Image& inout, const Image<J>& aux, + const Accumulator<A>& accu); # ifndef MLN_INCLUDE_ONLY @@ -72,54 +80,60 @@ namespace mln // Facade - template <typename I, typename F> - void fill_2_from_1_faces(Image& inout_, Function_vvvv2v<F>& f_) + template <typename I, typename J, typename F> + void fill_2_from_aux_1_faces(Image& inout_, const Image<J>& aux_, + const Function_vvvv2v<F>& f_) { - trace::entering("mln::world::kn::fill_2_from_1_faces"); + trace::entering("mln::world::kn::fill_2_from_aux_1_faces"); mln_precondition(exact(inout_).is_valid()); + mln_precondition(exact(inout_).domain() <= exact(aux_).domain()); I& inout = exact(inout_); - F& f = exact(f_); + const J& aux = exact(aux_); + const F& f = exact(f_); + + // FIXME: we cannot check if 1-faces in border are initialized + // in aux image. mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_2_face(p)) - inout(p) = safe_cast(f(safe_cast(inout(p + up)), - safe_cast(inout(p + left)), - safe_cast(inout(p + right)), - safe_cast(inout(p + down)))); + inout(p) = f(aux(p + up), aux(p + left), + aux(p + right), aux(p + down)); - trace::exiting("mln::world::kn::fill_2_from_1_faces"); + trace::exiting("mln::world::kn::fill_2_from_aux_1_faces"); } - template <typename I, typename A> - void fill_2_from_1_faces(Image& inout_, const Accumulator<A>& accu_) + template <typename I, typename J, typename A> + void fill_2_from_aux_1_faces(Image& inout_, const Image<J>& aux_, + const Accumulator<A>& accu_) { - trace::entering("mln::world::kn::fill_2_from_1_faces"); + trace::entering("mln::world::kn::fill_2_from_aux_1_faces"); + mln_precondition(exact(inout_).is_valid()); + mln_precondition(exact(inout_).domain() <= exact(aux_).domain()); I& inout = exact(inout_); - mln_precondition(inout.is_valid()); + const J& aux = exact(aux_); - A accu = exact(accu_); - typedef mln_argument(A) arg; + A accu(exact(accu_)); mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_2_face(p)) { accu.init(); if (inout.domain().has(p + up)) - accu.take(safe_cast_to<arg>(inout(p + up))); + accu.take(aux(p + up)); if (inout.domain().has(p + left)) - accu.take(safe_cast_to<arg>(inout(p + left))); + accu.take(aux(p + left)); if (inout.domain().has(p + right)) - accu.take(safe_cast_to<arg>(inout(p + right))); + accu.take(aux(p + right)); if (inout.domain().has(p + down)) - accu.take(safe_cast_to<arg>(inout(p + down))); - inout(p) = safe_cast(accu.to_result()); + accu.take(aux(p + down)); + inout(p) = accu.to_result(); } - trace::exiting("mln::world::kn::fill_2_from_1_faces"); + trace::exiting("mln::world::kn::fill_2_from_aux_1_faces"); } @@ -131,4 +145,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_FILL_2_FROM_1_FACES_HH +#endif // ! MLN_WORLD_KN_FILL_2_FROM_AUX_1_FACES_HH diff --git a/milena/tests/world/kn/Makefile.am b/milena/tests/world/kn/Makefile.am index 9a52eb6..cc216c7 100644 --- a/milena/tests/world/kn/Makefile.am +++ b/milena/tests/world/kn/Makefile.am @@ -28,6 +28,7 @@ check_PROGRAMS = \ fill_1_from_2_faces \ fill_1_from_aux_2_faces \ fill_2_from_1_faces \ + fill_2_from_aux_1_faces \ holes \ immerse \ immerse_with_inner_border \ @@ -49,6 +50,7 @@ fill_0_from_2_faces_SOURCES = fill_0_from_2_faces.cc fill_1_from_2_faces_SOURCES = fill_1_from_2_faces.cc fill_1_from_aux_2_faces_SOURCES = fill_1_from_aux_2_faces.cc fill_2_from_1_faces_SOURCES = fill_2_from_1_faces.cc +fill_2_from_aux_1_faces_SOURCES = fill_2_from_aux_1_faces.cc holes_SOURCES = holes.cc immerse_SOURCES = immerse.cc immerse_with_inner_border_SOURCES = immerse_with_inner_border.cc diff --git a/milena/tests/world/kn/fill_2_from_1_faces.cc b/milena/tests/world/kn/fill_2_from_aux_1_faces.cc similarity index 74% copy from milena/tests/world/kn/fill_2_from_1_faces.cc copy to milena/tests/world/kn/fill_2_from_aux_1_faces.cc index d8a3bef..29b2121 100644 --- a/milena/tests/world/kn/fill_2_from_1_faces.cc +++ b/milena/tests/world/kn/fill_2_from_aux_1_faces.cc @@ -26,51 +26,48 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> #include <mln/fun/vvvv2v/sum.hh> -#include <mln/world/kn/fill_2_from_1_faces.hh> -#include <mln/border/fill.hh> - +#include <mln/world/kn/fill_2_from_aux_1_faces.hh> int main() { using namespace mln; - int refvals[5][5] = { - {0, 1, 0, 1, 0}, - {1, 4, 1, 4, 1}, - {0, 1, 0, 1, 0}, - {1, 4, 1, 4, 1}, - {0, 1, 0, 1, 0} + int auxvals[5][5] = { + {0, 1, 0, 4, 0 }, + {1, 0, 1, 0, 4 }, + {0, 4, 0, 1, 0 }, + {4, 0, 4, 0, 1 }, + {0, 4, 0, 1, 0 } }; - image2d<int> ref = make::image(refvals, point2d(-1, -1)); + image2d<int> aux = make::image(auxvals, point2d(-1, -1)); - int vals[5][5] = { - {0, 1, 0, 1, 0 }, - {1, 0, 1, 0, 1 }, - {0, 1, 0, 1, 0 }, - {1, 0, 1, 0, 1 }, - {0, 1, 0, 1, 0 } - }; - image2d<int> imakn = make::image(vals, point2d(-1, -1)); + image2d<int> imakn(aux.domain()); - /// Make sure the border is set to 0 to get deterministic results. - border::fill(imakn, 0); + int refvals[5][5] = { + {0, 0, 0, 0, 0}, + {0, 7, 0, 10, 0}, + {0, 0, 0, 0, 0}, + {0, 16, 0, 7, 0}, + {0, 0, 0, 0, 0} + }; + image2d<int> ref = make::image(refvals, point2d(-1, -1)); // Overload with accumulator { accu::math::sum<int> accu; - world::kn::fill_2_from_1_faces(imakn, accu); + world::kn::fill_2_from_aux_1_faces(imakn, aux, accu); mln_assertion(ref == imakn); } // Overload with function { fun::vvvv2v::sum<int> f; - world::kn::fill_2_from_1_faces(imakn, f); + world::kn::fill_2_from_aux_1_faces(imakn, aux, f); + mln_assertion(ref == imakn); } -- 1.7.2.5

12 years, 2 months

olena-2.0-172-g24fb78f Various small fixes.

by Guillaume Lazzara

* mln/canvas/labeling/video.hh: Remove a useless variable. * mln/debug/filename.hh: Add an overload. * mln/fun/v2v/abs.hh: Add the return type as template parameter. * mln/labeling/colorize.hh: Fix an include. * mln/value/intsub.hh: Add operator*(). * mln/world/k2/fill_non_primary_from_primary_2_faces.hh: Duplicate 2-faces in border. * mln/world/k1/fill_0_from_primary_faces.hh, * mln/world/kn/fill_0_from_2_faces.hh: Make the function argument const. * mln/world/k1/neighb2d.hh: Fix names. * mln/world/kn/border/adjust_duplicate_2_faces.hh, * mln/world/kn/border/duplicate_2_faces.hh: Revamp. * mln/world/kn/compute_tree_of_shapes.hh: Update reference to hqueue. * tests/value/intsub.cc: Add more tests. * tests/world/kn/display_enlarged.cc: Fix test. * tests/world/kn/fill_1_from_aux_2_faces.cc: Do not initialize borders. * tests/world/kn/fill_2_from_1_faces.cc: Use pre-defined functions. --- milena/ChangeLog | 47 +++++++ milena/mln/canvas/labeling/video.hh | 5 +- milena/mln/debug/filename.hh | 17 ++- milena/mln/fun/v2v/abs.hh | 21 ++-- milena/mln/labeling/colorize.hh | 6 +- milena/mln/value/intsub.hh | 16 +++ milena/mln/world/k1/fill_0_from_primary_faces.hh | 4 +- milena/mln/world/k1/neighb2d.hh | 51 ++++++-- .../k2/fill_non_primary_from_primary_2_faces.hh | 4 + .../world/kn/border/adjust_duplicate_2_faces.hh | 9 +- milena/mln/world/kn/border/duplicate_2_faces.hh | 6 +- ...duplicate_2_faces.hh => fill_1_from_2_faces.hh} | 47 ++++---- .../mln/world/kn/border/fill_1_from_aux_2_faces.hh | 133 ++++++++++++++++++++ milena/mln/world/kn/compute_tree_of_shapes.hh | 4 +- milena/mln/world/kn/fill_0_from_2_faces.hh | 6 +- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 14 ++- milena/tests/value/intsub.cc | 10 ++ milena/tests/world/kn/display_enlarged.cc | 34 +++--- milena/tests/world/kn/fill_1_from_aux_2_faces.cc | 2 - milena/tests/world/kn/fill_2_from_1_faces.cc | 21 +--- 20 files changed, 341 insertions(+), 116 deletions(-) copy milena/mln/world/kn/border/{adjust_duplicate_2_faces.hh => fill_1_from_2_faces.hh} (59%) create mode 100644 milena/mln/world/kn/border/fill_1_from_aux_2_faces.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index f42284d..63e9d85 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,52 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle border value with auxiliary data images. + + * mln/world/kn/border/fill_1_from_2_faces.hh, + * mln/world/kn/border/fill_1_from_aux_2_faces.hh: New. + + * mln/world/k2/fill_non_primary_from_primary_2_faces.hh, + * mln/world/kn/fill_1_from_aux_2_faces.hh: Initialize borders + properly. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Various small fixes. + + * mln/canvas/labeling/video.hh: Remove a useless variable. + + * mln/debug/filename.hh: Add an overload. + + * mln/fun/v2v/abs.hh: Add the return type as template parameter. + + * mln/labeling/colorize.hh: Fix an include. + + * mln/value/intsub.hh: Add operator*(). + + * mln/world/k1/fill_0_from_primary_faces.hh, + * mln/world/kn/fill_0_from_2_faces.hh: Make the function argument + const. + + * mln/world/k1/neighb2d.hh: Fix names. + + * mln/world/kn/border/adjust_duplicate_2_faces.hh, + * mln/world/kn/border/duplicate_2_faces.hh: Revamp. + + * mln/world/kn/compute_tree_of_shapes.hh: Update reference to + hqueue. + + * tests/value/intsub.cc: Add more tests. + + * tests/world/kn/display_enlarged.cc: Fix test. + + * tests/world/kn/fill_1_from_aux_2_faces.cc: Do not initialize + borders. + + * tests/world/kn/fill_2_from_1_faces.cc: Use pre-defined + functions. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/debug/println.hh: Handle images based on any site sets. diff --git a/milena/mln/canvas/labeling/video.hh b/milena/mln/canvas/labeling/video.hh index b46e930..7093b67 100644 --- a/milena/mln/canvas/labeling/video.hh +++ b/milena/mln/canvas/labeling/video.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -87,7 +87,6 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; // Initialization. { @@ -155,7 +154,6 @@ namespace mln { if (nlabels == mln_max(L)) { - status = false; trace::warning("labeling aborted! Too many labels for \ this label type: nlabels > \ max(label_type)."); @@ -172,7 +170,6 @@ namespace mln f.set_label_(p, lbl); } } - status = true; } f.finalize(); diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index 1fc268b..b49b3a2 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -58,6 +58,10 @@ namespace mln std::string filename(const std::string& filename, int id); + /// \overload + std::string + filename(const std::string& filename); + namespace internal { @@ -83,7 +87,7 @@ namespace mln inline std::string - filename(const std::string& filename, int id = -1) + filename(const std::string& filename, int id) { static int file_id = 1; @@ -111,6 +115,13 @@ namespace mln } + inline + std::string + filename(const std::string& name) + { + return filename(name, -1); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::debug diff --git a/milena/mln/fun/v2v/abs.hh b/milena/mln/fun/v2v/abs.hh index d5bc3be..c2b34b3 100644 --- a/milena/mln/fun/v2v/abs.hh +++ b/milena/mln/fun/v2v/abs.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -46,22 +47,24 @@ namespace mln // FIXME: Doc! - template <typename V> - struct abs : public Function_v2v< abs<V> > + template <typename V, typename R> + struct abs : public Function_v2v< abs<V,R> >, + private mlc_converts_to(R,V)::check_t { - typedef V result; - V operator()(const V& v) const; + typedef R result; + typedef V argument; + R operator()(const V& v) const; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> + template <typename V, typename R> inline - V - abs<V>::operator()(const V& v) const + R + abs<V,R>::operator()(const V& v) const { - return mln::math::abs(v); + return R(mln::math::abs(v)); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index ba876a7..fe3f6b4 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -40,7 +40,7 @@ # include <mln/accu/stat/max.hh> # include <mln/util/array.hh> # include <mln/util/set.hh> -# include <mln/value/next.hh> +# include <mln/value/succ.hh> namespace mln diff --git a/milena/mln/value/intsub.hh b/milena/mln/value/intsub.hh index 0a1dabc..721b4bd 100644 --- a/milena/mln/value/intsub.hh +++ b/milena/mln/value/intsub.hh @@ -192,6 +192,22 @@ namespace mln // Safety template <> struct intsub<0>; + + // Ops + + template <unsigned n1, unsigned n2> + intsub<n1*n2> operator*(const intsub<n1>& lhs, const intsub<n2>& rhs) + { + return intsub<n1*n2>::make_from_enc_(lhs.to_enc() * rhs.to_enc()); + } + + template <unsigned n, typename S> + intsub<n> operator*(const intsub<n>& lhs, const value::scalar_<S>& rhs) + { + return intsub<n>::make_from_enc_(lhs.to_enc() * rhs); + } + + // rounding /// Re-implementation of the floor function. \sa math::floor diff --git a/milena/mln/world/k1/fill_0_from_primary_faces.hh b/milena/mln/world/k1/fill_0_from_primary_faces.hh index 12dcc5f..6410c4d 100644 --- a/milena/mln/world/k1/fill_0_from_primary_faces.hh +++ b/milena/mln/world/k1/fill_0_from_primary_faces.hh @@ -59,7 +59,7 @@ namespace mln */ template <typename I, typename F> - void fill_0_from_primary_faces(Image& inout, Function_vvvv2v<F>& f); + void fill_0_from_primary_faces(Image& inout, const Function_vvvv2v<F>& f); /// \overload template <typename I, typename A> @@ -73,7 +73,7 @@ namespace mln template <typename I, typename F> - void fill_0_from_primary_faces(Image& inout, Function_vvvv2v<F>& f) + void fill_0_from_primary_faces(Image& inout, const Function_vvvv2v<F>& f) { trace::entering("mln::world::k1::fill_0_from_primary_faces"); diff --git a/milena/mln/world/k1/neighb2d.hh b/milena/mln/world/k1/neighb2d.hh index 7681af1..eaf1ea4 100644 --- a/milena/mln/world/k1/neighb2d.hh +++ b/milena/mln/world/k1/neighb2d.hh @@ -44,6 +44,8 @@ namespace mln namespace k1 { + typedef neighb< win::multiple<window2d, bool(*)(const point2d&)> > dbl_neighb2d; + /*! \brief 2 faces to 1 faces neighborhood. \verbatim @@ -52,7 +54,7 @@ namespace mln - \endverbatim */ - const neighb2d& 2to1_faces(); + const neighb2d& faces_2to1(); /*! \brief 1 faces to 2 faces neighborhood. @@ -64,7 +66,7 @@ namespace mln \endverbatim */ - const dbl_neighb2d& 1to2_faces(); + const dbl_neighb2d& faces_1to2(); /*! \brief 1 faces to 1 faces neighborhood. @@ -77,7 +79,20 @@ namespace mln | \endverbatim */ - const dbl_neighb2d& 1to1_faces() + const dbl_neighb2d& faces_1to1(); + + + /*! \brief 2 faces to 2 faces neighborhood (4-connectivity). + + \verbatim + x + - + x|o|x + - + x + \endverbatim + */ + const neighb2d& faces_2to2_c4(); # ifndef MLN_INCLUDE_ONLY @@ -93,28 +108,27 @@ namespace mln } - typedef neighb< win::multiple<window2d, bool(*)(const point2d&)> > dbl_neighb2d; - - const neighb2d& 2to1_faces() + const neighb2d& faces_2to1() { return c4(); } - const dbl_neighb2d& 1to2_faces() + const dbl_neighb2d& faces_1to2() { - static bool 1face_h[] = { 0, 1, 0, + static bool face1_h[] = { 0, 1, 0, 0, 0, 0, 0, 1, 0 }; - static bool 1face_v[] = { 0, 0, 0, + static bool face1_v[] = { 0, 0, 0, 1, 0, 1, 0, 0, 0 }; - static dbl_neighb2d nbh = make::double_neighb2d(internal::is_row_odd, e2p_h, e2p_v); + static dbl_neighb2d + nbh = make::double_neighb2d(internal::is_row_odd, face1_h, face1_v); return nbh; } - const dbl_neighb2d& 1to1_faces() + const dbl_neighb2d& faces_1to1() { static bool e2e_h[] = { 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, @@ -130,7 +144,20 @@ namespace mln return nbh; } - + const neighb2d& faces_2to2_c4() + { + static neighb2d it; + if (it.size() == 0) + { + static bool vals[] = { 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, + 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0 }; + convert::from_to(vals, it); + } + return it; + } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh b/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh index f218fd5..41221d0 100644 --- a/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh +++ b/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh @@ -35,6 +35,7 @@ # include <mln/world/k2/is_non_primary_2_face_horizontal.hh> # include <mln/world/k2/is_non_primary_2_face_center.hh> # include <mln/world/kn/safe_cast.hh> +# include <mln/world/kn/border/adjust_duplicate_2_faces.hh> namespace mln { @@ -140,6 +141,9 @@ namespace mln kn::safe_cast(ima(p + 2 * down_right)))); } + // Initialize border. + kn::border::adjust_duplicate_2_faces(ima, 1); + trace::exiting("mln::world::k2::fill_non_primary_from_primary_2_faces"); } diff --git a/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh b/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh index ca900f6..bb7f43c 100644 --- a/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh +++ b/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh @@ -59,7 +59,8 @@ namespace mln */ template <typename I> - void adjust_duplicate_2_faces(Image& inout, unsigned min_thickness); + void adjust_duplicate_2_faces(const Image& inout, + unsigned min_thickness); @@ -67,13 +68,13 @@ namespace mln template <typename I> - void adjust_duplicate_2_faces(Image& inout_, unsigned min_thickness) + void adjust_duplicate_2_faces(const Image& inout, + unsigned min_thickness) { trace::entering("mln::world::kn::adjust_duplicate_2_faces"); - mln_precondition(exact(inout_).is_valid()); + mln_precondition(exact(inout).is_valid()); mln_precondition(min_thickness > 0); - I& inout = exact(inout_); mln::border::adjust(inout, min_thickness); kn::border::duplicate_2_faces(inout); diff --git a/milena/mln/world/kn/border/duplicate_2_faces.hh b/milena/mln/world/kn/border/duplicate_2_faces.hh index b8ff7d3..ff505d0 100644 --- a/milena/mln/world/kn/border/duplicate_2_faces.hh +++ b/milena/mln/world/kn/border/duplicate_2_faces.hh @@ -56,7 +56,7 @@ namespace mln */ template <typename I> - void duplicate_2_faces(Image& inout); + void duplicate_2_faces(const Image& inout); @@ -64,13 +64,13 @@ namespace mln template <typename I> - void duplicate_2_faces(Image& inout_) + void duplicate_2_faces(const Image& inout_) { trace::entering("mln::world::kn::duplicate_2_faces"); mln_precondition(exact(inout_).is_valid()); mln_precondition(exact(inout_).border() >= 1); - I& inout = exact(inout_); + I& inout = const_cast<I&>(exact(inout_)); def::coord min_row_1 = geom::min_row(inout) + 1, diff --git a/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh b/milena/mln/world/kn/border/fill_1_from_2_faces.hh similarity index 59% copy from milena/mln/world/kn/border/adjust_duplicate_2_faces.hh copy to milena/mln/world/kn/border/fill_1_from_2_faces.hh index ca900f6..9bb5bea 100644 --- a/milena/mln/world/kn/border/adjust_duplicate_2_faces.hh +++ b/milena/mln/world/kn/border/fill_1_from_2_faces.hh @@ -25,14 +25,15 @@ /// \file /// -/// \brief Adjust border size and duplicate 2 faces in Kn 2D images -/// borders. +/// \brief Duplicate 2 faces in KN 2D images borders. -#ifndef MLN_WORLD_KN_BORDER_ADJUST_DUPLICATE_2_FACES_HH -# define MLN_WORLD_KN_BORDER_ADJUST_DUPLICATE_2_FACES_HH +#ifndef MLN_WORLD_KN_BORDER_FILL_1_FROM_2_FACES_HH +# define MLN_WORLD_KN_BORDER_FILL_1_FROM_2_FACES_HH + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/function.hh> +# include <mln/world/kn/border/fill_1_from_aux_2_faces.hh> -# include <mln/border/adjust.hh> -# include <mln/world/kn/border/duplicate_2_faces.hh> namespace mln @@ -47,38 +48,34 @@ namespace mln namespace border { - /*! \brief Adjust border size and duplicate 2 faces in Kn 2D - * images borders. + /*! \brief Compute 1 faces in Kn 2D images borders. \param[in,out] inout A 2D image immersed in KN. - \param[in] min_thickness The minimum border thickness of \p - inout. - - if \p inout has a border thickness higher than \p - min_thickness, the border size is not adjusted. + \param[in,out] f A function computing 1-faces values from 2 + 2-faces values. */ - template <typename I> - void adjust_duplicate_2_faces(Image& inout, unsigned min_thickness); + template <typename I, typename F> + void fill_1_from_2_faces(const Image& inout, + const Function_vv2v<F>& f); # ifndef MLN_INCLUDE_ONLY - template <typename I> - void adjust_duplicate_2_faces(Image& inout_, unsigned min_thickness) + template <typename I, typename F> + void fill_1_from_2_faces(const Image& inout, + const Function_vv2v<F>& f) { - trace::entering("mln::world::kn::adjust_duplicate_2_faces"); + trace::entering("mln::world::kn::fill_1_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); - mln_precondition(min_thickness > 0); - I& inout = exact(inout_); + mln_precondition(exact(inout).is_valid()); + mln_precondition(exact(inout).border() >= 1); - mln::border::adjust(inout, min_thickness); - kn::border::duplicate_2_faces(inout); + border::fill_1_from_aux_2_faces(inout, inout, f); - trace::exiting("mln::world::kn::adjust_duplicate_2_faces"); + trace::exiting("mln::world::kn::fill_1_from_2_faces"); } @@ -92,4 +89,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_BORDER_ADJUST_DUPLICATE_2_FACES_HH +#endif // ! MLN_WORLD_KN_BORDER_FILL_1_FROM_2_FACES_HH diff --git a/milena/mln/world/kn/border/fill_1_from_aux_2_faces.hh b/milena/mln/world/kn/border/fill_1_from_aux_2_faces.hh new file mode 100644 index 0000000..629a11d --- /dev/null +++ b/milena/mln/world/kn/border/fill_1_from_aux_2_faces.hh @@ -0,0 +1,133 @@ +// Copyright (C) 2012 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/>. +// +// As a special exception, you may use this file as part of a free +// software project 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 +/// +/// \brief Duplicate 2 faces in KN 2D images borders. + +#ifndef MLN_WORLD_KN_BORDER_FILL_1_FROM_AUX_2_FACES_HH +# define MLN_WORLD_KN_BORDER_FILL_1_FROM_AUX_2_FACES_HH + +# include <mln/core/concept/image.hh> +# include <mln/world/kn/is_2_face.hh> +# include <mln/world/kn/is_1_face_horizontal.hh> +# include <mln/world/kn/is_1_face_vertical.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/max_col.hh> + + +namespace mln +{ + + namespace world + { + + namespace kn + { + + namespace border + { + + /*! \brief Compute 1 faces in Kn 2D images borders. + + \param[in,out] inout A 2D image immersed in KN. + \param[in,out] aux A 2D image with the same domain as \p + inout. + \param[in,out] f A function computing 1-faces values from 2 + 2-faces values. + + */ + template <typename I, typename J, typename F> + void fill_1_from_aux_2_faces(const Image& inout, + const Image<J>& aux, + const Function_vv2v<F>& f); + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename J, typename F> + void fill_1_from_aux_2_faces(const Image& inout_, + const Image<J>& aux_, + const Function_vv2v<F>& f_) + { + trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); + + mln_precondition(exact(inout_).is_valid()); + mln_precondition(exact(inout_).border() >= 1); + mln_precondition(exact(aux_).border() >= 1); + mln_precondition(exact(inout_).domain() == exact(aux_).domain()); + I& inout = const_cast<I&>(exact(inout_)); + J& aux = const_cast<J&>(exact(aux_)); + const F& f = exact(f_); + + def::coord + min_row_1 = geom::min_row(inout) - 1, + max_row_1 = geom::max_row(inout) + 1, + min_col_1 = geom::min_col(inout) - 1, + max_col_1 = geom::max_col(inout) + 1; + + // Fill horizontal border + for (def::coord col = min_col_1; col <= max_col_1; ++col) + if (is_1_face_vertical(min_row_1, col)) + { + // First row + inout.at_(min_row_1, col) = f(aux.at_(min_row_1, col - 1), + aux.at_(min_row_1, col + 1)); + // Last row + inout.at_(max_row_1, col) = f(aux.at_(max_row_1, col - 1), + aux.at_(max_row_1, col + 1)); + } + + // Fill vertical border + for (def::coord row = min_row_1; row <= max_row_1; ++row) + if (is_1_face_horizontal(row, min_col_1)) + { + // First col + inout.at_(row, min_col_1) = f(aux.at_(row - 1, min_col_1), + aux.at_(row + 1, min_col_1)); + // Last col + inout.at_(row, max_col_1) = f(aux.at_(row - 1, max_col_1), + aux.at_(row + 1, max_col_1)); + } + + trace::exiting("mln::world::kn::fill_1_from_aux_2_faces"); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::border + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_KN_BORDER_FILL_1_FROM_AUX_2_FACES_HH diff --git a/milena/mln/world/kn/compute_tree_of_shapes.hh b/milena/mln/world/kn/compute_tree_of_shapes.hh index d6a5984..9c686f2 100644 --- a/milena/mln/world/kn/compute_tree_of_shapes.hh +++ b/milena/mln/world/kn/compute_tree_of_shapes.hh @@ -41,7 +41,7 @@ # include <mln/value/interval.hh> # include <mln/value/is_degenerated.hh> -# include <mln/world/kn/internal/hqueue.hh> +# include <mln/world/kn/hqueue.hh> # include <mln/util/tree_of_shapes.hh> # include <mln/world/kn/is_2_face.hh> @@ -95,7 +95,7 @@ namespace mln typedef mln_ch_value(I,P) T; typedef mln_ch_value(I,unsigned) U; typedef std::vector Array_P; - typedef world::kn::internal::hqueue<P,EV> q_type; + typedef world::kn::hqueue<P,EV> q_type; compute_tree_of_shapes_t(); diff --git a/milena/mln/world/kn/fill_0_from_2_faces.hh b/milena/mln/world/kn/fill_0_from_2_faces.hh index 7164309..b8b9aaf 100644 --- a/milena/mln/world/kn/fill_0_from_2_faces.hh +++ b/milena/mln/world/kn/fill_0_from_2_faces.hh @@ -59,7 +59,7 @@ namespace mln */ template <typename I, typename F> - void fill_0_from_2_faces(Image& inout, Function_vvvv2v<F>& f); + void fill_0_from_2_faces(Image& inout, const Function_vvvv2v<F>& f); /// \overload template <typename I, typename A> @@ -73,12 +73,12 @@ namespace mln template <typename I, typename F> - void fill_0_from_2_faces(Image& inout_, Function_vvvv2v<F>& f_) + void fill_0_from_2_faces(Image& inout_, const Function_vvvv2v<F>& f_) { trace::entering("mln::world::kn::fill_0_from_2_faces"); I& inout = exact(inout_); - F& f = exact(f_); + const F& f = exact(f_); mln_precondition(inout.is_valid()); diff --git a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh index d18e3c8..d1a12b6 100644 --- a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh @@ -34,8 +34,9 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> -# include <mln/world/kn/border/compute_1_faces.hh> # include <mln/world/kn/safe_cast.hh> +# include <mln/world/kn/border/fill_1_from_aux_2_faces.hh> +# include <mln/world/kn/border/duplicate_2_faces.hh> namespace mln { @@ -51,7 +52,7 @@ namespace mln \param[in,out] inout A 2D image immersed in KN. \param[in] aux A 2D image with the same domain as \p inout. - \param[in,out] f A functor computing a result from two values. + \param[in] f A functor computing a result from two values. Warning: \p aux borders must have been initialized with kn::border::duplicate_2_faces or have been immersed in Kn in @@ -77,7 +78,7 @@ namespace mln */ template <typename I, typename J, typename F> void fill_1_from_aux_2_faces(Image& inout, const Image<J>& aux, - Function_vv2v<F>& f); + const Function_vv2v<F>& f); /// \overload template <typename I, typename J, typename A> @@ -93,19 +94,20 @@ namespace mln template <typename I, typename J, typename F> void fill_1_from_aux_2_faces(Image& inout_, const Image<J>& aux_, - Function_vv2v<F>& f_) + const Function_vv2v<F>& f_) { trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); I& inout = exact(inout_); const J& aux = exact(aux_); - F& f = exact(f_); + const F& f = exact(f_); mln_precondition(inout.is_valid()); mln_precondition(aux.is_valid()); mln_precondition(inout.domain() == aux.domain()); - kn::border::compute_1_faces(inout, f); + kn::border::duplicate_2_faces(aux); + kn::border::fill_1_from_aux_2_faces(inout, aux, f); mln_piter(I) p(inout.domain()); for_all(p) diff --git a/milena/tests/value/intsub.cc b/milena/tests/value/intsub.cc index 06b8f1a..2ec4671 100644 --- a/milena/tests/value/intsub.cc +++ b/milena/tests/value/intsub.cc @@ -107,4 +107,14 @@ int main() // median(6,2) = 4 mln_assertion(math::median(i, intsub<2>(2)) == 4); + + + // 2.5 * 3 + mln_assertion((l * 3) == 7.5); + + // 4 * 2.5 + mln_assertion((4 * l) == 10); + + // 2.5 * 10.25 + mln_assertion((l * k) == 25.625); } diff --git a/milena/tests/world/kn/display_enlarged.cc b/milena/tests/world/kn/display_enlarged.cc index 33b5909..9f73f00 100644 --- a/milena/tests/world/kn/display_enlarged.cc +++ b/milena/tests/world/kn/display_enlarged.cc @@ -53,24 +53,20 @@ int main() {1, 2, 2, 2, 1, 2, 2, 2, 1} }; - int vals5[17][17] = { - {1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {2, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 3, 3, 2}, - {1, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 1} + int vals5[13][13] = { + {1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 1}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 1}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {2, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2}, + {1, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 1} }; image2d<int> ima = make::image(vals, point2d(-1, -1)); @@ -87,7 +83,7 @@ int main() } { - image2d<int> ref5 = make::image(vals5, point2d(-4, -4)); + image2d<int> ref5 = make::image(vals5, point2d(-3, -3)); image2d<int> enlarged = world::kn::display_enlarged(ima, 5); mln_assertion(ref5 == enlarged); } diff --git a/milena/tests/world/kn/fill_1_from_aux_2_faces.cc b/milena/tests/world/kn/fill_1_from_aux_2_faces.cc index 20e1c2a..8d41599 100644 --- a/milena/tests/world/kn/fill_1_from_aux_2_faces.cc +++ b/milena/tests/world/kn/fill_1_from_aux_2_faces.cc @@ -30,7 +30,6 @@ #include <mln/accu/math/sum.hh> #include <mln/fun/vv2v/sum.hh> #include <mln/world/kn/fill_1_from_aux_2_faces.hh> -#include <mln/world/kn/border/duplicate_2_faces.hh> int main() { @@ -44,7 +43,6 @@ int main() {0, 0, 0, 0, 0 } }; image2d<int> aux = make::image(auxvals, point2d(-1, -1)); - world::kn::border::duplicate_2_faces(aux); int vals[5][5] = { {1, 0, 1, 0, 1 }, diff --git a/milena/tests/world/kn/fill_2_from_1_faces.cc b/milena/tests/world/kn/fill_2_from_1_faces.cc index 1f0d170..d8a3bef 100644 --- a/milena/tests/world/kn/fill_2_from_1_faces.cc +++ b/milena/tests/world/kn/fill_2_from_1_faces.cc @@ -29,28 +29,11 @@ #include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vvvv2v/sum.hh> #include <mln/world/kn/fill_2_from_1_faces.hh> #include <mln/border/fill.hh> -namespace mln -{ - - struct sum_t : Function_vvvv2v<sum_t> - { - typedef int result; - - int operator()(const int& v1, const int& v2, const int& v3, const int& v4) const - { - return v1 + v2 + v3 + v4; - } - - }; - -} - - - int main() { using namespace mln; @@ -86,7 +69,7 @@ int main() // Overload with function { - sum_t f; + fun::vvvv2v::sum<int> f; world::kn::fill_2_from_1_faces(imakn, f); mln_assertion(ref == imakn); } -- 1.7.2.5

12 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches