- Olena-patches

r4515: Add disk_ima test, improve HSL operations
by Fabien Freling 21 Sep '09

21 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-09-21 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add disk_ima test, improve HSL operations. * fabien/igr/color/find_color.cc: Add operations on HSL values. * fabien/mln/core/image/disk_ima.hh: Implement an image directly mapped on disk. * fabien/tests/core/image/Makefile: Add `disk_ima' target. * fabien/tests/core/image/disk_ima.cc: New test file for the disk_ima class. --- igr/color/find_color.cc | 54 ++++++++++++++++++++++++++++++++++++++++++ mln/core/image/disk_ima.hh | 54 ++++++++++++++++++++++++++++++++++++++++++ tests/core/image/Makefile | 5 +++ tests/core/image/disk_ima.cc | 55 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+), 1 deletion(-) Index: trunk/milena/sandbox/fabien/igr/color/find_color.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/color/find_color.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/color/find_color.cc (revision 4515) @@ -0,0 +1,54 @@ +#include <mln/core/image/image2d.hh> + +#include <mln/io/ppm/all.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/hsl.hh> + +#include <mln/convert/from_to.hh> +#include <mln/data/convert.hh> + +using namespace mln; +using value::rgb8; +using value::hsl_; + + +bool +is_green(hsl_<float, float, float> value) +{ + if (value.hue() > 75 && value.hue() < 170 && + value.sat() > 0.5 && + value.lum() > 0.3 && value.lum() < 0.7) + return true; + + return false; +} + +int main(int argc, char* argv[]) +{ + if (argc != 3) + { + std::cout << "Usage: " << argv[0] << " input output" << std::endl; + return 1; + } + + image2d<rgb8> input; + io::ppm::load(input, argv[1]); + + typedef image2d<hsl_<float, float, float> > H; + H ima_hsl = data::convert(hsl_<float, float, float>(), input); + mln_piter_(H) p(ima_hsl.domain()); + for_all(p) + { + if (!is_green(ima_hsl(p))) + { + ima_hsl(p).sat() = 0.3; + ima_hsl(p).lum() = 0.3; + } + } + + image2d<rgb8> output = data::convert(rgb8(), ima_hsl); + io::ppm::save(output, argv[2]); + + return 0; +} Index: trunk/milena/sandbox/fabien/tests/core/image/disk_ima.cc =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/disk_ima.cc (revision 0) +++ trunk/milena/sandbox/fabien/tests/core/image/disk_ima.cc (revision 4515) @@ -0,0 +1,55 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/image/disk_ima.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/literal/colors.hh> +#include <mln/value/rgb8.hh> + +#include <mln/debug/quiet.hh> + + +using namespace mln; +using value::rgb8; + + +int main(int argc, char* argv[]) +{ + if (argc != 2) + { + std::cout << "Usage: " << argv[0] << " input" << std::endl; + return 1; + } + + //image2d<rgb8> ima; + disk_ima<rgb8> tiled_ima; + + //io::ppm::load(ima, argv[1]); + io::ppm::load(tiled_ima, argv[1]); + + //std::cout << "bbox: " << tiled_ima.bbox() << std::endl; + //std::cout << "file: " << tiled_ima.file_() << std::endl; + + /*point2d pt0(0, 0); + mln_assertion(tiled_ima(pt0) == ima(pt0)); + + point2d pt(0, 1); + mln_assertion(tiled_ima(pt) == ima(pt)); + + point2d pt2(1, 0); + mln_assertion(tiled_ima(pt2) == ima(pt2)); + + point2d pt3(1, 1); + mln_assertion(tiled_ima(pt3) == ima(pt3));*/ + + mln_piter_(disk_ima<rgb8>) p(tiled_ima.domain()); + for_all(p) + if (p.row() % 16 == 0) + { + //std::cout << tiled_ima(p); + tiled_ima(p) = literal::green; + //std::cout << " -> " << tiled_ima(p) << std::endl; + //mln_assertion(tiled_ima(p) == ima(p)); + } + + return 0; +} Index: trunk/milena/sandbox/fabien/tests/core/image/Makefile =================================================================== --- trunk/milena/sandbox/fabien/tests/core/image/Makefile (revision 4514) +++ trunk/milena/sandbox/fabien/tests/core/image/Makefile (revision 4515) @@ -3,7 +3,10 @@ LIBS = `Magick++-config --cppflags --cxxflags --ldflags --libs` INC = -I../../../ -I../../../../../ -all: tiled2d +all: tiled2d disk_ima tiled2d: tiled2d.cc ${CXX} ${CXXFLAGS} ${INC} $^ -o tiled2d + +disk_ima: disk_ima.cc + ${CXX} ${CXXFLAGS} ${INC} $^ -o disk_ima Index: trunk/milena/sandbox/fabien/mln/core/image/disk_ima.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/core/image/disk_ima.hh (revision 0) +++ trunk/milena/sandbox/fabien/mln/core/image/disk_ima.hh (revision 4515) @@ -0,0 +1,643 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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. + +#ifndef MLN_CORE_IMAGE_DISK_IMA_HH +# define MLN_CORE_IMAGE_DISK_IMA_HH + +/// \file +/// Definition of the basic mln::disk_ima class. + +# include <mln/core/internal/image_primary.hh> +# include <mln/core/internal/fixme.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/core/routine/init.hh> + +# include <mln/border/thickness.hh> +# include <mln/value/set.hh> +# include <mln/fun/i2v/all_to.hh> +# include <mln/value/proxy.hh> + + + +namespace mln +{ + + // Forward declaration. + template <typename T> struct disk_ima; + + + namespace internal + { + + /// Data structure for \c mln::disk_ima<T>. + template <typename T> + struct data< disk_ima<T> > + { + data(const box2d& b, unsigned bdr); + ~data(); + + std::fstream* f_; + std::streampos pos_; + std::string file_; + bool loaded_; + T value_; + + box2d b_; // theoretical box + unsigned bdr_; + box2d vb_; // virtual box, i.e., box including the virtual border + + void update_vb_(); + void allocate_(); + void deallocate_(); + void swap_(data< disk_ima<T> >& other_); + void reallocate_(unsigned new_border); + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename T> + struct image_< disk_ima<T> > : default_image_< T, disk_ima<T> > + { + // misc + typedef trait::image::category::primary category; + typedef trait::image::speed::slow speed; + typedef trait::image::size::regular size; + + // value + typedef trait::image::vw_io::none vw_io; + typedef trait::image::vw_set::none vw_set; + typedef trait::image::value_access::direct value_access; + typedef trait::image::value_storage::one_block value_storage; + typedef trait::image::value_browsing::site_wise_only value_browsing; + typedef trait::image::value_alignment::with_grid value_alignment; + typedef trait::image::value_io::read_only value_io; + + // site / domain + typedef trait::image::pw_io::read_write pw_io; + typedef trait::image::localization::basic_grid localization; + typedef trait::image::dimension::two_d dimension; + + // extended domain + typedef trait::image::ext_domain::extendable ext_domain; + typedef trait::image::ext_value::multiple ext_value; + typedef trait::image::ext_io::read_only ext_io; + }; + + } // end of namespace mln::trait + + + + /// Basic 2D image class. + /// + /// The parameter \c T is the type of pixel values. This image class + /// stores data in memory and has a virtual border with constant + /// thickness around data. + /// + /// \ingroup modimageconcrete + // + template <typename T> + class disk_ima : public internal::image_primary< T, mln::box2d, disk_ima<T> > + { + typedef internal::image_primary< T, mln::box2d, disk_ima<T> > super_; + public: + + /// Value associated type. + typedef T value; + + /// Return type of read-only access. + typedef const T& rvalue; + + /// Return type of read-write access. + typedef mln::value::proxy< disk_ima<T> > lvalue; + + + /// Skeleton. + typedef disk_ima< tag::value_<T> > skeleton; + + + /// Constructor without argument. + disk_ima(); + + /// Constructor with a box and the border thickness (default is + /// 3). + disk_ima(const box2d& b, unsigned bdr = border::thickness); + + + /// Initialize an empty image. + void init_(const box2d& b, unsigned bdr = border::thickness); + + /// Initialize an empty image. + //void init_(const std::string& filename); + + + /// Test if \p p is valid. + bool has(const point2d& p) const; + + /// Give the definition domain. + const box2d& domain() const; + + /// Give the bounding box domain. + const box2d& bbox() const; + + /// Read-only access to the image value located at point \p p. + const T& operator()(const point2d& p) const; + + /// Read-write access to the image value located at point \p p. + mln::value::proxy< disk_ima<T> > operator()(const point2d& p); + + // Read access to the image value located at point \p p. + const T& read_(const point2d& p) const; + + // Write access to the image value located at point \p p. + void write_(const point2d& p, const T& value); + + + template <typename P> + T& alt(const P& p) + { + typedef def::coord coord_t; + mln_precondition(this->has(p)); + + return this->data_->array_ [*(coord_t*)(&p.p_hook_())] [*((coord_t*)(&p.p_hook_()) + 1)]; + } + + + // Specific methods: + // ----------------- + + /// Read-only access to the image value located at (\p row, \p col). + const T& at_(unsigned row, unsigned col) const; + + /// Read-write access to the image value located at (\p row, \p col). + T& at_(unsigned row, unsigned col); + + /// Give the number of rows. + unsigned nrows() const; + + /// Give the number of columns. + unsigned ncols() const; + + + + /// Give the border thickness. + unsigned border() const; + + /// Give the number of elements (points including border ones). + unsigned nelements() const; + + /// Read-only access to the image value located at index \p i. + const T& element(unsigned i) const; + + /// Read-write access to the image value located at index \p i. + T& element(unsigned i); + + /// Give the delta-index corresponding to the delta-point \p dp. + int delta_index(const dpoint2d& dp) const; + + /// Give the point corresponding to the index \p i. + point2d point_at_index(unsigned i) const; + + + // Hooks + + /// Give a hook to the offset for accessing data. + const std::streampos& pos_() const; + + /// Give a hook to the offset for accessing data. + std::streampos& pos_(); + + /// Give a hook to the filename. + const std::string& file_() const; + + /// Give a hook to the filename. + std::string& file_(); + + + /// Resize image border with new_border. + void resize_(unsigned new_border); + }; + + + + // Forward declaration + + template <typename T> + void init_(tag::border_t, unsigned& bdr, const disk_ima<T>& model); + + template <typename T, typename J> + void init_(tag::image_t, mln::disk_ima<T>& target, const J& model); + + + +# ifndef MLN_INCLUDE_ONLY + + // init_ + + template <typename T> + inline + void init_(tag::border_t, unsigned& bdr, const disk_ima<T>& model) + { + bdr = model.border(); + } + + template <typename T, typename J> + inline + void init_(tag::image_t, disk_ima<T>& target, const J& model) + { + box2d b; + init_(tag::bbox, b, model); + unsigned bdr; + init_(tag::border, bdr, model); + target.init_(b, bdr); + } + + + // internal::data< disk_ima<T> > + + namespace internal + { + template <typename T> + inline + data< disk_ima<T> >::data(const box2d& b, unsigned bdr) + : b_ (b), + bdr_ (bdr) + { + allocate_(); + } + + template <typename T> + inline + data< disk_ima<T> >::~data() + { + deallocate_(); + } + + template <typename T> + inline + void + data< disk_ima<T> >::update_vb_() + { + vb_.pmin() = b_.pmin() - dpoint2d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint2d(all_to(bdr_)); + } + + template <typename T> + inline + void + data< disk_ima<T> >::allocate_() + { + update_vb_(); + mln_postcondition(vb_.len(0) == b_.len(0) + 2 * bdr_); + mln_postcondition(vb_.len(1) == b_.len(1) + 2 * bdr_); + } + + template <typename T> + inline + void + data< disk_ima<T> >::deallocate_() + { + if (this->loaded_) + { + this->f_->close(); + } + } + + template <typename T> + inline + void + data< disk_ima<T> >::swap_(data< disk_ima<T> >& other_) + { + data< disk_ima<T> > self_ = *this; + *this = other_; + other_ = self_; + } + + template <typename T> + inline + void + data< disk_ima<T> >::reallocate_(unsigned new_border) + { + data< disk_ima<T> >& tmp = *(new data< disk_ima<T> >(this->b_, new_border)); + this->swap_(tmp); + } + + + } // end of namespace mln::internal + + + // disk_ima<T> + + template <typename T> + inline + disk_ima<T>::disk_ima() + { + } + + template <typename T> + inline + disk_ima<T>::disk_ima(const box2d& b, unsigned bdr) + { + init_(b, bdr); + } + + template <typename T> + inline + void + disk_ima<T>::init_(const box2d& b, unsigned bdr) + { + mln_precondition(! this->is_valid()); + this->data_ = new internal::data< disk_ima<T> >(b, bdr); + this->data_->loaded_ = false; + } + + template <typename T> + inline + const box2d& + disk_ima<T>::domain() const + { + mln_precondition(this->is_valid()); + return this->data_->b_; + } + + template <typename T> + inline + const box2d& + disk_ima<T>::bbox() const + { + mln_precondition(this->is_valid()); + return this->data_->b_; + } + + template <typename T> + inline + bool + disk_ima<T>::has(const point2d& p) const + { + mln_precondition(this->is_valid()); + return this->data_->vb_.has(p); + } + + template <typename T> + inline + const T& + disk_ima<T>::operator()(const point2d& p) const + { + return read_(p); + } + + template <typename T> + inline + mln::value::proxy< disk_ima<T> > + disk_ima<T>::operator()(const point2d& p) + { + mln::value::proxy<disk_ima> prx(*this, p); + return prx; + } + + template <typename T> + inline + const T& + disk_ima<T>::read_(const point2d& p) const + { + mln::disk_ima<T>* this_ = const_cast<mln::disk_ima<T>* >(this); // Trust me, I have to do this(_). + if (!this_->data_->loaded_) + { + this_->data_->f_ = new std::fstream(this->data_->file_.c_str()); + this_->data_->loaded_ = true; + } + std::streampos offset = this_->data_->pos_; + offset += (this_->ncols() * p.row() + p.col()) * sizeof(T); + this_->data_->f_->seekg(offset); + this_->data_->f_->get((char*)(&this_->data_->value_), sizeof(T) + 1); // FIXME: I don't know why + // I have to add +1. + return this_->data_->value_; + } + + template <typename T> + inline + void + disk_ima<T>::write_(const point2d& p, const T& value) + { + mln::disk_ima<T>* this_ = const_cast<mln::disk_ima<T>* >(this); // Trust me, I have to do this(_). + if (!this_->data_->loaded_) + { + this_->data_->f_ = new std::fstream(this->data_->file_.c_str()); + this_->data_->loaded_ = true; + } + std::streampos offset = this_->data_->pos_; + offset += (this_->ncols() * p.row() + p.col()) * sizeof(T); + this_->data_->f_->seekg(offset); + this_->data_->f_->write((char*)(&value), sizeof(T) + 1); // FIXME: I don't know why + // I have to add +1. + } + + + // Specific methods: + + template <typename T> + inline + const T& + disk_ima<T>::at_(unsigned row, unsigned col) const + { + mln_precondition(this->has(point2d(row, col))); + return this->data_->cache_(point2d(row, col)); + } + + template <typename T> + inline + T& + disk_ima<T>::at_(unsigned row, unsigned col) + { + mln_precondition(this->has(point2d(row, col))); + return this->data_->cache_(point2d(row, col)); + } + + template <typename T> + inline + unsigned + disk_ima<T>::nrows() const + { + mln_precondition(this->is_valid()); + return this->data_->b_.len(0); + } + + template <typename T> + inline + unsigned + disk_ima<T>::ncols() const + { + mln_precondition(this->is_valid()); + return this->data_->b_.len(1); + } + + + // Hooks. + + template <typename T> + inline + const std::streampos& + disk_ima<T>::pos_() const + { + mln_precondition(this->is_valid()); + return this->data_->pos_; + } + + template <typename T> + inline + std::streampos& + disk_ima<T>::pos_() + { + mln_precondition(this->is_valid()); + return this->data_->pos_; + } + + template <typename T> + inline + const std::string& + disk_ima<T>::file_() const + { + mln_precondition(this->is_valid()); + return this->data_->file_; + } + + template <typename T> + inline + std::string& + disk_ima<T>::file_() + { + mln_precondition(this->is_valid()); + return this->data_->file_; + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + + +# include <mln/core/trait/pixter.hh> +# include <mln/core/dpoints_pixter.hh> +# include <mln/core/pixter2d.hh> +// # include <mln/core/w_window.hh> + + +namespace mln +{ + + namespace trait + { + + // pixter + + template <typename T> + struct fwd_pixter< disk_ima<T> > + { + typedef fwd_pixter2d< disk_ima<T> > ret; + }; + + template <typename T> + struct fwd_pixter< const disk_ima<T> > + { + typedef fwd_pixter2d< const disk_ima<T> > ret; + }; + + template <typename T> + struct bkd_pixter< disk_ima<T> > + { + typedef bkd_pixter2d< disk_ima<T> > ret; + }; + + template <typename T> + struct bkd_pixter< const disk_ima<T> > + { + typedef bkd_pixter2d< const disk_ima<T> > ret; + }; + + // qixter + + template <typename T, typename W> + struct fwd_qixter< disk_ima<T>, W > + { + typedef dpoints_fwd_pixter< disk_ima<T> > ret; + }; + + template <typename T, typename W> + struct fwd_qixter< const disk_ima<T>, W > + { + typedef dpoints_fwd_pixter< const disk_ima<T> > ret; + }; + + template <typename T, typename W> + struct bkd_qixter< disk_ima<T>, W > + { + typedef dpoints_bkd_pixter< disk_ima<T> > ret; + }; + + template <typename T, typename W> + struct bkd_qixter< const disk_ima<T>, W > + { + typedef dpoints_bkd_pixter< const disk_ima<T> > ret; + }; + + // nixter + + template <typename T, typename N> + struct fwd_nixter< disk_ima<T>, N > + { + typedef dpoints_fwd_pixter< disk_ima<T> > ret; + }; + + template <typename T, typename N> + struct fwd_nixter< const disk_ima<T>, N > + { + typedef dpoints_fwd_pixter< const disk_ima<T> > ret; + }; + + template <typename T, typename N> + struct bkd_nixter< disk_ima<T>, N > + { + typedef dpoints_bkd_pixter< disk_ima<T> > ret; + }; + + template <typename T, typename N> + struct bkd_nixter< const disk_ima<T>, N > + { + typedef dpoints_bkd_pixter< const disk_ima<T> > ret; + }; + + } // end of namespace mln::trait + +} // end of namespace mln + + +# include <mln/make/image.hh> + + +#endif // ! MLN_CORE_IMAGE_DISK_IMA_HH

1 0

milena r4514: Add new algorithm for conversion HSL to RGB
by Fabien Freling 21 Sep '09

21 Sep '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-09-21 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add new algorithm for conversion HSL to RGB. * mln/fun/v2v/hsl_to_rgb.hh: Add new algorithm for conversion. * mln/value/rgb.hh: Enable convertion to HSL. --- fun/v2v/hsl_to_rgb.hh | 87 +++++++++++++++++++++++++++++++++++--------------- value/rgb.hh | 50 ++++++++++++++-------------- 2 files changed, 86 insertions(+), 51 deletions(-) Index: trunk/milena/mln/value/rgb.hh =================================================================== --- trunk/milena/mln/value/rgb.hh (revision 4513) +++ trunk/milena/mln/value/rgb.hh (revision 4514) @@ -29,7 +29,7 @@ # include <mln/value/ops.hh> -// # include <mln/fun/v2v/hsl_to_rgb.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/value/concept/vectorial.hh> # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> @@ -42,24 +42,24 @@ -// namespace fun -// { + namespace fun + { -// namespace v2v -// { + namespace v2v + { -// template <typename T_rgb> -// struct f_hsl_to_rgb_; + template <typename T_rgb> + struct f_hsl_to_rgb_; -// typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; + typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; // typedef f_hsl_to_rgb_< value::rgb<16> > f_hsl_to_rgb_3x16_t; -// extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; + extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; // extern f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; -// } + } -// } + } namespace literal @@ -90,11 +90,11 @@ } -// // Forward declaration. -// namespace value -// { -// template <typename H, typename S, typename L> class hsl_; -// } + // Forward declaration. + namespace value + { + template <typename H, typename S, typename L> class hsl_; + } namespace convert @@ -115,9 +115,9 @@ template <unsigned m> void from_to_(const value::int_u<m>& from, value::rgb<m>& to); -// // hsl -> rgb8. -// template <typename H, typename S, typename L> -// void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); + // hsl -> rgb8. + template <typename H, typename S, typename L> + void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); // // hsl -> rgb16. // template <typename H, typename S, typename L> @@ -791,12 +791,12 @@ to = value::rgb<m>(from, from, from); } -// template <typename H, typename S, typename L> -// void -// from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) -// { -// to = fun::v2v::f_hsl_to_rgb_3x8(from); -// } + template <typename H, typename S, typename L> + void + from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) + { + to = fun::v2v::f_hsl_to_rgb_3x8(from); + } // template <typename H, typename S, typename L> // void Index: trunk/milena/mln/fun/v2v/hsl_to_rgb.hh =================================================================== --- trunk/milena/mln/fun/v2v/hsl_to_rgb.hh (revision 4513) +++ trunk/milena/mln/fun/v2v/hsl_to_rgb.hh (revision 4514) @@ -92,40 +92,75 @@ /// \} + // This method implement the conversion from HSL to RGB + // explained by Wikipedia. + // url: http://en.wikipedia.org/wiki/HSL_and_HSV template <typename T_rgb> template <typename T_hsl> inline T_rgb f_hsl_to_rgb_<T_rgb>::operator()(const T_hsl& hsl) const { - typedef typename T_rgb::red_t red_t; - typedef typename T_rgb::green_t green_t; - typedef typename T_rgb::blue_t blue_t; - - static math::round<red_t> to_r; - static math::round<green_t> to_g; - static math::round<blue_t> to_b; - - static const float - sqrt3_3 = std::sqrt(3.0f) / 3.0f, - inv_sqrt6 = 1 / std::sqrt(6.0f), - inv_sqrt2 = 1 / std::sqrt(2.0f); - - float - h = hsl.hue() / 180.0 * 3.1415, - alpha = hsl.sat() * std::cos(h), - beta = hsl.sat() * std::sin(h); - - - red_t r = to_r(sqrt3_3 * hsl.lum() + 2 * inv_sqrt6 * beta); - green_t g = - to_g(sqrt3_3 * hsl.lum() + inv_sqrt2 * alpha - inv_sqrt6 * beta); - blue_t b = - to_b(sqrt3_3 * hsl.lum() - inv_sqrt2 * alpha - inv_sqrt6 * beta); + const float q = (hsl.lum() < 0.5) ? hsl.lum() * (1.0 + hsl.sat()) : + hsl.lum() + hsl.sat() - (hsl.lum() * hsl.sat()); + const float p = 2.0 * hsl.lum() - q; + const float hk = hsl.hue() / 360.0; // hk = normalized hue + float tr = hk + (1.0 / 3.0); + float tg = hk; + float tb = hk - (1.0 / 3.0); + + if (tr < 0.0) + tr += 1.0; + if (tr > 1.0) + tr -= 1.0; + + if (tg < 0.0) + tg += 1.0; + if (tg > 1.0) + tg -= 1.0; + + if (tb < 0.0) + tb += 1.0; + if (tb > 1.0) + tb -= 1.0; + + // Red. + float red; + if (tr < (1.0 / 6.0)) + red = p + ((q - p) * 6 * tr); + else if (tr < (1.0 / 2.0)) + red = q; + else if (tr < (2.0 / 3.0)) + red = p + ((q - p) * 6 * ((2.0 / 3.0) - tr)); + else + red = p; + + // Green. + float green; + if (tg < (1.0 / 6.0)) + green = p + ((q - p) * 6 * tg); + else if (tg < (1.0 / 2.0)) + green = q; + else if (tg < (2.0 / 3.0)) + green = p + ((q - p) * 6 * ((2.0 / 3.0) - tg)); + else + green = p; + + // Blue. + float blue; + if (tb < (1.0 / 6.0)) + blue = p + ((q - p) * 6 * tb); + else if (tb < (1.0 / 2.0)) + blue = q; + else if (tb < (2.0 / 3.0)) + blue = p + ((q - p) * 6 * ((2.0 / 3.0) - tb)); + else + blue = p; - T_rgb rgb(r, g, b); + // Each component is in [0, 1]. + T_rgb rgb_result(red * 255, green * 255, blue * 255); - return rgb; + return rgb_result; } # endif // !MLN_INCLUDE_ONLY

1 0

[PATCH 19/19] New application: apps/graph-morpho/asf-image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/asf-image2d.cc: New. * apps/graph-morpho/Makefile.am (noinst_PROGRAMS): Add asf-image2d. (asf_image2d_SOURCES): New. (TESTS): Remove asf-complex1d. --- milena/ChangeLog | 10 +++++ milena/apps/graph-morpho/Makefile.am | 5 ++- milena/apps/graph-morpho/asf-image2d.cc | 57 +++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 milena/apps/graph-morpho/asf-image2d.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 64302c1..4b18664 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + New application: apps/graph-morpho/asf-image2d. + + * apps/graph-morpho/asf-image2d.cc: New. + * apps/graph-morpho/Makefile.am + (noinst_PROGRAMS): Add asf-image2d. + (asf_image2d_SOURCES): New. + (TESTS): Remove asf-complex1d. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + New application: apps/graph-morpho/samples-image2d. * apps/graph-morpho/samples-image2d.cc: New. diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 3c2ee26..70e177e 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -22,12 +22,13 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = io.hh morpho.hh make_complex2d.hh -noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d +noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d asf-image2d samples_complex1d_SOURCES = samples-complex1d.cc samples_image2d_SOURCES = samples-image2d.cc asf_complex1d_SOURCES = asf-complex1d.cc +asf_image2d_SOURCES = asf-image2d.cc -TESTS = samples-complex1d asf-complex1d samples-image2d +TESTS = samples-complex1d samples-image2d # Graph images stored in 2D PBM files. EXTRA_DIST = x.pbm y.pbm z.pbm diff --git a/milena/apps/graph-morpho/asf-image2d.cc b/milena/apps/graph-morpho/asf-image2d.cc new file mode 100644 index 0000000..395d20d --- /dev/null +++ b/milena/apps/graph-morpho/asf-image2d.cc @@ -0,0 +1,57 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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 Alternate Sequential Filters in graph space implemented on +/// mln::image2d-based cubical complexes. + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + +#include "apps/graph-morpho/morpho.hh" + +#include "apps/graph-morpho/make_complex2d.hh" +#include "apps/data.hh" + + +int main() +{ + using namespace mln; + + // Remove borders so as to avoid side effects. + border::thickness = 0; + + // Input image. + image2d<bool> input = + io::pbm::load(MLN_APPS_DIR "/graph-morpho/zebra-noisy.pbm"); + + // Create an binary 2d image representing a 4-connexity graph image + // (actually, a cubical 2-complex) by doubling the resolution of the + // input image to insert edges (and squares) between pixels. + image2d<bool> input_x2 = make_complex2d(input); + + // ASF. + io::pbm::save(unmake_complex2d(asf(input_x2, 2)), "asf_ima_2.pbm"); +} -- 1.6.4.2

1 0

[PATCH 18/19] New application: apps/graph-morpho/samples-image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/samples-image2d.cc: New. * apps/graph-morpho/Makefile.am (noinst_PROGRAMS): Add samples-image2d. (samples_image2d_SOURCES): New. (TESTS): Add samples-image2d. --- milena/ChangeLog | 10 +++ milena/apps/graph-morpho/Makefile.am | 5 +- milena/apps/graph-morpho/samples-image2d.cc | 94 +++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 milena/apps/graph-morpho/samples-image2d.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 84d0dc2..64302c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + New application: apps/graph-morpho/samples-image2d. + + * apps/graph-morpho/samples-image2d.cc: New. + * apps/graph-morpho/Makefile.am + (noinst_PROGRAMS): Add samples-image2d. + (samples_image2d_SOURCES): New. + (TESTS): Add samples-image2d. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have dilations and erosions delegate to the right implementations. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index d87d61b..3c2ee26 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -22,11 +22,12 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = io.hh morpho.hh make_complex2d.hh -noinst_PROGRAMS = samples-complex1d asf-complex1d +noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d samples_complex1d_SOURCES = samples-complex1d.cc +samples_image2d_SOURCES = samples-image2d.cc asf_complex1d_SOURCES = asf-complex1d.cc -TESTS = samples-complex1d asf-complex1d +TESTS = samples-complex1d asf-complex1d samples-image2d # Graph images stored in 2D PBM files. EXTRA_DIST = x.pbm y.pbm z.pbm diff --git a/milena/apps/graph-morpho/samples-image2d.cc b/milena/apps/graph-morpho/samples-image2d.cc new file mode 100644 index 0000000..455a147 --- /dev/null +++ b/milena/apps/graph-morpho/samples-image2d.cc @@ -0,0 +1,94 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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 Morphological operators in graph space implemented on +/// mln::image2d-based cubical complexes. + +#include <mln/io/pbm/load.hh> + +#include <mln/debug/println.hh> + +#include "apps/graph-morpho/morpho.hh" + +#include "apps/graph-morpho/io.hh" +#include "apps/data.hh" + + +int main() +{ + using namespace mln; + + // Remove borders so as to avoid side effects. + border::thickness = 0; + + /* Binary graph-based image with vertices aligned on a discrete 2D grid. + + Of course, it would have been better, simpler and faster to use a + cubical 1-complex here, but they are not yet available (as of + 2009-09-10). */ + typedef mln::bin_1complex_image2d ima_t; + + // ------------------------ // + // Dilations and erosions. // + // ------------------------ // + + /* Create an image corresponding to the graph X of the ISMM 2009 + paper from Jean Cousty et al. */ + image2d<bool> x = io::pbm::load(MLN_APPS_DIR "/graph-morpho/x.pbm"); + debug::println("x:", x); + + debug::println("dilation_e2v(x):", dilation_e2v(x)) ; + debug::println("erosion_v2e(x):", erosion_v2e(x)); + + debug::println("erosion_e2v(x):", erosion_e2v(x)); + debug::println("dilation_v2e(x):", dilation_v2e(x)); + + debug::println("dilation_graph(x):", dilation_graph(x)); + debug::println("erosion_graph(x):", erosion_graph(x)); + + debug::println("alpha3(x):", alpha3(x)); + debug::println("beta3(x):", beta3(x)); + + // --------- // + // Filters. // + // --------- // + + // Create an image corresponding to the graph Y. + image2d<bool> y = io::pbm::load(MLN_APPS_DIR "/graph-morpho/y.pbm"); + debug::println("y:", y); + + debug::println("opening_graph(y):", opening_graph(y)); + debug::println("half_opening_graph(y):", half_opening_graph(y)); + debug::println("beta3(alpha3(y)):", beta3(alpha3(y))); + + // Create an image corresponding to the graph Z. + image2d<bool> z = io::pbm::load(MLN_APPS_DIR "/graph-morpho/z.pbm"); + debug::println("z:", z); + + debug::println("closing_graph(z):", closing_graph(z)); + debug::println("half_closing_graph(z):", half_closing_graph(z)); + debug::println("alpha3(beta3(z)):", alpha3(beta3(z))); +} -- 1.6.4.2

1 0

[PATCH 17/19] Have dilations and erosions delegate to the right implementations.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (dilation_e2v(const mln::Image&)) (erosion_v2e(const mln::Image&)) (erosion_e2v(const mln::Image&)) (dilation_v2e(const mln::Image&)): Here. --- milena/ChangeLog | 11 ++++ milena/apps/graph-morpho/morpho.hh | 105 +++++++---------------------------- 2 files changed, 32 insertions(+), 84 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 116f75a..84d0dc2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have dilations and erosions delegate to the right implementations. + + * apps/graph-morpho/morpho.hh + (dilation_e2v(const mln::Image&)) + (erosion_v2e(const mln::Image&)) + (erosion_e2v(const mln::Image&)) + (dilation_v2e(const mln::Image&)): + Here. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on mln::image2d<T>. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 8457c55..d0c1a1d 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -53,6 +53,10 @@ // and might be changed. # include "apps/graph-morpho/cplx2d.hh" +// FIXME: Instead of providing several implementation, move specific +// parts (neighborhoods, etc.) to a graph_traits class, and write +// generic version of combine, dilation_e2v, erosion_v2e, etc. + /*----------------------------. | Vertices-edges combinator. | @@ -400,119 +404,52 @@ namespace impl } + +// ------------------------------------------ // +// Facades of (core) dilations and erosions. // +// ------------------------------------------ // + /// Dilation from edges to vertices (\f$\delta^\bullet\f$). template <typename I> inline mln_concrete(I) -dilation_e2v(const mln::Image& input_) +dilation_e2v(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on vertices. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(input.domain(), 0); - // Vertex-to-edges neighborhood. - typedef mln::complex_higher_neighborhood<I::dim, mln_geom(I)> v2e_t; - const v2e_t v2e; - mln_niter(v2e_t) e(v2e, v); - for_all(v) - { - output(v) = false; - for_all(e) - if (input(e)) - { - output(v) = true; - break; - } - } - return output; + return impl::dilation_e2v(mln::exact(input)); } /// Erosion from vertices to edges (\f$\epsilon^\times\f$). template <typename I> inline mln_concrete(I) -erosion_v2e(const mln::Image& input_) +erosion_v2e(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on edges. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(input.domain(), 1); - // Edge-to-vertices neighborhood. - typedef mln::complex_lower_neighborhood<I::dim, mln_geom(I)> e2v_t; - const e2v_t e2v; - mln_niter(e2v_t) v(e2v, e); - for_all(e) - { - output(e) = true; - for_all(v) - if (!input(v)) - { - output(e) = false; - break; - } - } - return output; + return impl::erosion_v2e(mln::exact(input)); } /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$). template <typename I> inline mln_concrete(I) -erosion_e2v(const mln::Image& input_) +erosion_e2v(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on vertices. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(input.domain(), 0); - // Vertex-to-edges neighborhood. - typedef mln::complex_higher_neighborhood<I::dim, mln_geom(I)> v2e_t; - const v2e_t v2e; - mln_niter(v2e_t) e(v2e, v); - for_all(v) - { - output(v) = true; - for_all(e) - if (!input(e)) - { - output(v) = false; - break; - } - } - return output; + return impl::erosion_e2v(mln::exact(input)); } /// Dilation from vertices to edges (\f$\delta^\times\f$). template <typename I> inline mln_concrete(I) -dilation_v2e(const mln::Image& input_) +dilation_v2e(const mln::Image& input) { - const I& input = mln::exact(input_); - mln_concrete(I) output; - mln::initialize(output, input); - // Iterator on edges. - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(input.domain(), 1); - // Edge-to-vertices neighborhood. - typedef mln::complex_lower_neighborhood<I::dim, mln_geom(I)> e2v_t; - const e2v_t e2v; - mln_niter(e2v_t) v(e2v, e); - for_all(e) - { - output(e) = false; - for_all(v) - if (input(v)) - { - output(e) = true; - break; - } - } - return output; + return impl::dilation_v2e(mln::exact(input)); } +// ------------------------------ // +// Other dilations and erosions. // +// ------------------------------ // + /// Vertex dilation (\f$delta\f$). template <typename I> inline -- 1.6.4.2

1 0

[PATCH 16/19] Add implementations of dilations/erosions on mln::image2d<T>.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (impl::dilation_e2v(const mln::image2d<T>&)) (impl::erosion_v2e(const mln::image2d<T>&)) (impl::erosion_e2v(const mln::image2d<T>&)) (impl::dilation_v2e(const mln::image2d<T>&)): New functions. --- milena/ChangeLog | 11 ++++++ milena/apps/graph-morpho/morpho.hh | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b623361..116f75a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on mln::image2d<T>. + + * apps/graph-morpho/morpho.hh + (impl::dilation_e2v(const mln::image2d<T>&)) + (impl::erosion_v2e(const mln::image2d<T>&)) + (impl::erosion_e2v(const mln::image2d<T>&)) + (impl::dilation_v2e(const mln::image2d<T>&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a ``tolerant'' image_if morpher. * apps/graph-morpho/image_if_large.hh: New. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 277bd36..8457c55 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -47,6 +47,8 @@ # include <mln/data/paste.hh> +# include "apps/graph-morpho/image_if_large.hh" + // FIXME: Careful, cplx2d.hh is a symlink to a file in Théo's sandbox, // and might be changed. # include "apps/graph-morpho/cplx2d.hh" @@ -327,6 +329,75 @@ namespace impl return output; } + // ------------------------------------------------------------- // + // Implementations on (mln::image2d-based) cubical 2-complexes. // + // ------------------------------------------------------------- // + + /* Note the operator `||' in the following routines: we have to use + our own ``tolerant'' version of mln::image_if (namely + mln::image_if_large) for these dilations and erosions to + work. */ + + /// Dilation from edges to vertices (\f$\delta^\bullet\f$) on + /// an mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + dilation_e2v(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(dilation(input || mln::cplx2d::is_pixel, + mln::cplx2d::p2e()), + output); + return output; + } + + /// Erosion from vertices to edges (\f$\epsilon^\times\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + erosion_v2e(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(erosion(input || mln::cplx2d::is_edge, + mln::cplx2d::e2p()), + output); + return output; + } + + /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + erosion_e2v(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(erosion(input || mln::cplx2d::is_pixel, + mln::cplx2d::p2e()), + output); + return output; + } + + /// Dilation from vertices to edges (\f$\delta^\times\f$) on an + /// mln::image2d<T>-based cubical complex. + template <typename T> + inline + mln::image2d<T> + dilation_v2e(const mln::image2d<T>& input) + { + mln::image2d<T> output(input.domain()); + mln::data::fill(output, false); + mln::data::paste(dilation(input || mln::cplx2d::is_edge, + mln::cplx2d::e2p()), + output); + return output; + } + } /// Dilation from edges to vertices (\f$\delta^\bullet\f$). -- 1.6.4.2

1 0

[PATCH 15/19] Introduce a ``tolerant'' image_if morpher.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/image_if_large.hh: New. --- milena/ChangeLog | 6 + milena/apps/graph-morpho/image_if_large.hh | 307 ++++++++++++++++++++++++++++ 2 files changed, 313 insertions(+), 0 deletions(-) create mode 100644 milena/apps/graph-morpho/image_if_large.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 1707c7b..b623361 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a ``tolerant'' image_if morpher. + + * apps/graph-morpho/image_if_large.hh: New. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood-aware and graph-friendly dilation & erosion. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/image_if_large.hh b/milena/apps/graph-morpho/image_if_large.hh new file mode 100644 index 0000000..37c2d63 --- /dev/null +++ b/milena/apps/graph-morpho/image_if_large.hh @@ -0,0 +1,307 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// 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. + +#ifndef APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH +# define APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH + +/// \file +/// +/// \brief Definition of a image which domain is restricted by a +/// function 'site -> Boolean', but where routine has() returns true +/// for sites of the underlying (morphed) image even if they are not +/// validating the predicate. + +// FIXME: This file is a workaround for the lack of ``tolerant'' +// image_if, but there must be a better way. + +# include <mln/core/internal/image_domain_morpher.hh> +# include <mln/core/site_set/p_if.hh> +# include <mln/pw/all.hh> + + +namespace mln +{ + + // Forward declaration. + template <typename I, typename F> struct image_if_large; + + + namespace internal + { + + /// Data structure for \c mln::image_if_large<I,F>. + template <typename I, typename F> + struct data< image_if_large<I,F> > + { + data(I& ima, const F& f); + + I ima_; + p_if<mln_domain(I), F> domain_; + }; + + } // end of namespace mln::internal + + + namespace trait + { + + template <typename I, typename F> + struct image_< image_if_large<I,F> > + : default_image_morpher< I, + mln_value(I), + image_if_large<I,F> > + { + typedef trait::image::category::domain_morpher category; + + // No extension of domain. + typedef trait::image::ext_domain::none ext_domain; + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; + + typedef trait::image::vw_io::none vw_io; + typedef trait::image::vw_set::none vw_set; + typedef trait::image::value_alignment::not_aligned value_alignment; + typedef trait::image::value_storage::disrupted value_storage; + }; + + } // end of namespace mln::trait + + + + /// Image which domain is restricted by a function 'site -> + /// Boolean', but where routine has() returns true for sites of the + /// underlying (morphed) image even if they are not validating the + /// predicate. + /// + /// \ingroup modimagedomainmorpher + // + template <typename I, typename F> + struct image_if_large + : public mln::internal::image_domain_morpher< I, + p_if<mln_domain(I), F>, + image_if_large<I, F> > + { + typedef image_if_large<I, F> self; + typedef mln_psite(self) psite; + + /// Skeleton. + typedef image_if_large< tag::image_, tag::function_<F> > skeleton; + + /// Constructor without argument. + image_if_large(); + + /// Constructor from an image \p ima and a predicate \p f. + image_if_large(I& ima, const F& f); + + void init_(I& ima, const F& f); + + /// \brief Redefined psite membership method, returning true for + /// sites of the underlying (morphed) image even if they are not + /// validating the predicate. + /// + /// This is the only difference with mln::image_if. + bool has(const psite& p) const; + + /// Give the definition domain. + const p_if<mln_domain(I), F>& domain() const; + + /// Const promotion via conversion. + operator image_if_large<const I, F>() const; + }; + + + // Image || Function_v2b. + + /// ima || f creates an image_if_large with the image ima and the function + /// f. + // + template <typename I, typename F> + image_if_large<I,F> + operator || (Image& ima, const Function_v2b<F>& f); + + /// ima || f creates an image_if_large with the image ima and the function + /// f. + // + template <typename I, typename F> + image_if_large<const I,F> + operator || (const Image& ima, const Function_v2b<F>& f); + + + + template <typename I, typename A> + image_if_large< const I, fun::C<bool(*)(A)> > + operator || (const Image& ima, bool (*f)(A) ); + + template <typename I, typename A> + image_if_large< I, fun::C<bool(*)(A)> > + operator || (Image& ima, bool (*f)(A) ); + +// // Construction helpers. + +// template <typename I, typename A> +// image_if_large< const I, fun::C<bool(*)(A)> > +// make_image_if_large(const Image& ima, bool (*f)(A) ); + +// template <typename I, typename A> +// image_if_large< I, fun::C<bool(*)(A)> > +// make_image_if_large(Image& ima, bool (*f)(A) ); + + + +# ifndef MLN_INCLUDE_ONLY + + // init_. + + template <typename I, typename F> + void init_(tag::function_t, F& f, const image_if_large<I,F>& model) + { + f = model.domain().predicate(); + } + + template <typename I, typename F, typename J> + void init_(tag::image_t, image_if_large<I,F>& target, const J& model) + { + I ima; + init_(tag::image, ima, exact(model)); + F f; + init_(tag::function, f, exact(model)); + target.init_(ima, f); + } + + // internal::data< image_if_large<I,F> > + + namespace internal + { + + template <typename I, typename F> + inline + data< image_if_large<I,F> >::data(I& ima, const F& f) + : ima_(ima), + domain_(ima.domain() | f) + { + } + + } + + + // image_if_large<I,F> + + template <typename I, typename F> + inline + image_if_large<I,F>::image_if_large() + { + } + + template <typename I, typename F> + inline + image_if_large<I,F>::image_if_large(I& ima, const F& f) + { + init_(ima, f); + } + + template <typename I, typename F> + inline + void + image_if_large<I,F>::init_(I& ima, const F& f) + { + mln_precondition(! this->is_valid()); + this->data_ = new internal::data< image_if_large<I,F> >(ima, f); + } + + template <typename I, typename F> + inline + bool + image_if_large<I,F>::has(const typename image_if_large<I,F>::psite& p) const + { + mln_precondition(exact(this)->is_valid()); + // This method is more tolerant than mln::image_if's one (which + // returns this->domain().has(p)). + return this->data_->ima_.has(p); + } + + + template <typename I, typename F> + inline + const p_if<mln_domain(I), F>& + image_if_large<I,F>::domain() const + { + mln_precondition(this->is_valid()); + return this->data_->domain_; + } + + template <typename I, typename F> + inline + image_if_large<I,F>::operator image_if_large<const I,F>() const + { + mln_precondition(this->is_valid()); + image_if_large<const I,F> tmp(this->data_->ima_, + this->data_->domain_.predicate()); + return tmp; + } + + + // Operators. + + template <typename I, typename F> + inline + image_if_large<I,F> + operator || (Image& ima, const Function_v2b<F>& f) + { + image_if_large<I,F> tmp(exact(ima), exact(f)); + return tmp; + } + + template <typename I, typename F> + inline + image_if_large<const I, F> + operator || (const Image& ima, const Function_v2b<F>& f) + { + image_if_large<const I, F> tmp(exact(ima), exact(f)); + return tmp; + } + + + template <typename I, typename A> + image_if_large< const I, fun::C<bool(*)(A)> > + operator || (const Image& ima, bool (*f)(A) ) + { + return exact(ima) || convert::to_fun(f); + } + + template <typename I, typename A> + image_if_large< I, fun::C<bool(*)(A)> > + operator || (Image& ima, bool (*f)(A) ) + { + return exact(ima) || convert::to_fun(f); + } + + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! APPS_GRAPH_MORPHO_IMAGE_IF_LARGE_HH -- 1.6.4.2

1 0

[PATCH 14/19] Add neighborhood-aware and graph-friendly dilation & erosion.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (dilation(const mln::Image&, const mln::Neighborhood<N>&)) (erosion(const mln::Image&, const mln::Neighborhood<N>&)): New functions. --- milena/ChangeLog | 9 +++++ milena/apps/graph-morpho/morpho.hh | 66 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d2f72bc..1707c7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add neighborhood-aware and graph-friendly dilation & erosion. + + * apps/graph-morpho/morpho.hh + (dilation(const mln::Image&, const mln::Neighborhood<N>&)) + (erosion(const mln::Image&, const mln::Neighborhood<N>&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on bin_1complex_image2d. * apps/graph-morpho/morpho.hh diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index e043d95..277bd36 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -126,6 +126,72 @@ combine(const mln::Image& vertices, const mln::Image& edges) | Dilations and erosions. | `-------------------------*/ +/// A neighborhood-aware and graph-friendly version of the binary dilation. +template <typename I, typename N> +mln_concrete(I) +dilation(const mln::Image& input_, const mln::Neighborhood<N>& nbh_) +{ + using namespace mln; + + typedef mln_concrete(I) O; + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + O output; + initialize(output, input); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + /* There is a slight difference with Milena's classical binary + dilation here: instead of initializing OUTPUT with INPUT, we + fill it with default (here, false) values. */ + output(p) = false; + for_all(n) if (input.has(n)) + if (input(n) == true) + { + output(p) = true; + break; + } + } + return output; +} + + +/// A neighborhood-aware and graph-friendly version of the binary erosion. +template <typename I, typename N> +mln_concrete(I) +erosion(const mln::Image& input_, const mln::Neighborhood<N>& nbh_) +{ + using namespace mln; + + typedef mln_concrete(I) O; + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + O output; + initialize(output, input); + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + /* There is a slight difference with Milena's classical erosion + here: instead of initializing OUTPUT with INPUT, we fill it + with default (here, true) values. */ + output(p) = true; + for_all(n) if (input.has(n)) + if (input(n) == false) + { + output(p) = false; + break; + } + } + return output; +} + + namespace impl { // ------------------------------------------ // -- 1.6.4.2

1 0

[PATCH 13/19] Add implementations of dilations/erosions on bin_1complex_image2d.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (impl::dilation_e2v(const mln::bin_1complex_image2d&)) (impl::erosion_v2e(const mln::bin_1complex_image2d&)) (impl::erosion_e2v(const mln::bin_1complex_image2d&)) (impl::dilation_v2e(const mln::bin_1complex_image2d&)): New functions. --- milena/ChangeLog | 11 +++ milena/apps/graph-morpho/morpho.hh | 144 +++++++++++++++++++++++++++++++++--- 2 files changed, 143 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba395d1..d2f72bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add implementations of dilations/erosions on bin_1complex_image2d. + + * apps/graph-morpho/morpho.hh + (impl::dilation_e2v(const mln::bin_1complex_image2d&)) + (impl::erosion_v2e(const mln::bin_1complex_image2d&)) + (impl::erosion_e2v(const mln::bin_1complex_image2d&)) + (impl::dilation_v2e(const mln::bin_1complex_image2d&)): + New functions. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have combine delegate to impl::combine. * apps/graph-morpho/morpho.hh (combine): Here. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 718323c..e043d95 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -126,22 +126,142 @@ combine(const mln::Image& vertices, const mln::Image& edges) | Dilations and erosions. | `-------------------------*/ -/* FIXME: By constraining the domain of the input and passing the - neighborhood, one should be able to use a truly generic dilation - (resp. erosion), or even use Milena's standard morpho::dilation - (resp. morpho::erosion). +namespace impl +{ + // ------------------------------------------ // + // Implementations on (general) 2-complexes. // + // ------------------------------------------ // - It'd be convenient to write something like this: + /* FIXME: By constraining the domain of the input and passing the + neighborhood, one should be able to use a truly generic dilation + (resp. erosion), or even use Milena's standard morpho::dilation + (resp. morpho::erosion). + + It'd be convenient to write something like this: + + dilation(ima | vertices); + + We can /actually/ write this, but `vertices' has to be a predicate + on sites (p2b function), which is not efficient, since both + vertices and edges will be browsed. + + It would be very nice if `vertices' could be an actual site set, + so that `ima | vertices' creates a morpher smart enough to + browse /only/ vertices. */ + + /// Dilation from edges to vertices (\f$\delta^\bullet\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + dilation_e2v(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on vertices. + mln::p_n_faces_fwd_piter<1, geom_t> v(input.domain(), 0); + // Vertex-to-edges neighborhood. + typedef mln::complex_higher_neighborhood<1, geom_t> v2e_t; + const v2e_t v2e; + mln_niter_(v2e_t) e(v2e, v); + for_all(v) + { + output(v) = false; + for_all(e) + if (input(e)) + { + output(v) = true; + break; + } + } + return output; + } - dilation(ima | vertices); + /// Erosion from vertices to edges (\f$\epsilon^\times\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + erosion_v2e(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on edges. + mln::p_n_faces_fwd_piter<1, geom_t> e(input.domain(), 1); + // Edge-to-vertices neighborhood. + typedef mln::complex_lower_neighborhood<1, geom_t> e2v_t; + const e2v_t e2v; + mln_niter_(e2v_t) v(e2v, e); + for_all(e) + { + output(e) = true; + for_all(v) + if (!input(v)) + { + output(e) = false; + break; + } + } + return output; + } - We can /actually/ write this, but `vertices' has to be a predicate - on sites (p2b function), which is not efficient, since both - vertices and edges will be browsed. + /// Erosion from edges to vertices (\f$\epsilon^\bullet\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + erosion_e2v(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on vertices. + mln::p_n_faces_fwd_piter<1, geom_t> v(input.domain(), 0); + // Vertex-to-edges neighborhood. + typedef mln::complex_higher_neighborhood<1, geom_t> v2e_t; + const v2e_t v2e; + mln_niter_(v2e_t) e(v2e, v); + for_all(v) + { + output(v) = true; + for_all(e) + if (!input(e)) + { + output(v) = false; + break; + } + } + return output; + } - It would be very nice if `vertices' could be an actual site set, - so that `ima | vertices' creates a morpher smart enough to - browse /only/ vertices. */ + /// Dilation from vertices to edges (\f$\delta^\times\f$) on + /// mln::bin_1complex_image2d. + inline + mln::bin_1complex_image2d + dilation_v2e(const mln::bin_1complex_image2d& input) + { + mln::bin_1complex_image2d output; + mln::initialize(output, input); + typedef mln_geom_(mln::bin_1complex_image2d) geom_t; + // Iterator on edges. + mln::p_n_faces_fwd_piter<1, geom_t> e(input.domain(), 1); + // Edge-to-vertices neighborhood. + typedef mln::complex_lower_neighborhood<1, geom_t> e2v_t; + const e2v_t e2v; + mln_niter_(e2v_t) v(e2v, e); + for_all(e) + { + output(e) = false; + for_all(v) + if (input(v)) + { + output(e) = true; + break; + } + } + return output; + } + +} /// Dilation from edges to vertices (\f$\delta^\bullet\f$). template <typename I> -- 1.6.4.2

1 0

[PATCH 12/19] Have combine delegate to impl::combine.
by Roland Levillain 21 Sep '09

21 Sep '09

* apps/graph-morpho/morpho.hh (combine): Here. --- milena/ChangeLog | 6 ++++++ milena/apps/graph-morpho/morpho.hh | 20 ++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b1c3939..ba395d1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Have combine delegate to impl::combine. + + * apps/graph-morpho/morpho.hh (combine): Here. + +2009-09-21 Roland Levillain <roland(a)lrde.epita.fr> + Add impl::combine for mln::image2d<T>. * apps/graph-morpho/cplx2d.hh: New symlink to... diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index 70d19b1..718323c 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -107,26 +107,18 @@ namespace impl } } +// -------- // +// Facade. // +// -------- // + /// Combine the vertices and the edges of two images to create a new /// graph image (``operator'' \f$\ovee\f$). template <typename I> inline mln_concrete(I) -combine(const mln::Image& vertices_, const mln::Image& edges_) +combine(const mln::Image& vertices, const mln::Image& edges) { - const I vertices = mln::exact(vertices_); - const I edges = mln::exact(edges_); - mln_precondition(vertices.domain() == edges.domain()); - - mln_concrete(I) output; - mln::initialize(output, vertices); - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> v(output.domain(), 0); - for_all(v) - output(v) = vertices(v); - mln::p_n_faces_fwd_piter<I::dim, mln_geom(I)> e(output.domain(), 1); - for_all(e) - output(e) = edges(e); - return output; + return impl::combine(mln::exact(vertices), mln::exact(edges)); } -- 1.6.4.2

1 0