- Olena-patches

branch exp/khalimsky updated: olena-2.0-171-gce9a6a4
by git＠lrde.epita.fr 01 Nov '12

01 Nov '12

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 ce9a6a4d73daaddac6be6d993cb2c2da1db11d42 (commit) via 26f70522325508f0c54ba23806b7a842aece7911 (commit) via dc08d9b5b295a70f0da2bd6c954c99c4799ceb6a (commit) via 8a4190ed21cbf4d337ea80d1edf077acec8431cb (commit) via 9726f7e04c8fee068a497276259f15cce9ff4522 (commit) from f550cfab304c3851c40b188029790114f74c17de (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 ----------------------------------------------------------------- ce9a6a4 mln/world/kn/debug/println.hh: Handle images based on any site sets. 26f7052 Add preconditions. dc08d9b Move files to proper directories. 8a4190e Revamp Code. 9726f7e Make use of safe_cast. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 52 ++++++ milena/mln/accu/stat/median_few.hh | 147 ----------------- milena/mln/world/k1/fill_0_from_1_faces.hh | 26 ++-- milena/mln/world/k1/fill_1_from_2_faces.hh | 31 ++-- milena/mln/world/k1/immerse_with.hh | 3 +- milena/mln/world/k1/un_immerse.hh | 4 +- .../k2/fill_non_primary_from_primary_2_faces.hh | 63 ++++---- milena/mln/world/kn/accu/max_interval.hh | 12 +- milena/mln/world/kn/accu/median_few.hh | 152 ++++++++++++++++++ milena/mln/world/kn/accu/min_interval.hh | 12 +- milena/mln/world/kn/debug/println.hh | 2 +- milena/mln/world/kn/display_enlarged.hh | 13 +- .../mln/world/kn/fill_0_1_faces_internal_border.hh | 2 +- milena/mln/world/kn/fill_0_from_1_faces.hh | 29 ++-- milena/mln/world/kn/fill_0_from_2_faces.hh | 26 ++-- milena/mln/world/kn/fill_1_from_2_faces.hh | 26 ++-- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 39 +++-- milena/mln/world/kn/fill_2_from_1_faces.hh | 23 ++-- milena/mln/world/kn/hqueue.hh | 160 +++++++++++++++++++ .../kn/internal/fill_primary_2_faces_from_input.hh | 13 +- milena/mln/world/kn/internal/hqueue.hh | 165 -------------------- milena/mln/world/kn/safe_cast.hh | 64 +++++++- milena/mln/world/kn/un_immerse.hh | 6 +- 23 files changed, 608 insertions(+), 462 deletions(-) delete mode 100644 milena/mln/accu/stat/median_few.hh create mode 100644 milena/mln/world/kn/accu/median_few.hh create mode 100644 milena/mln/world/kn/hqueue.hh delete mode 100644 milena/mln/world/kn/internal/hqueue.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-171-gce9a6a4 mln/world/kn/debug/println.hh: Handle images based on any site sets.
by Guillaume Lazzara 01 Nov '12

01 Nov '12

--- milena/ChangeLog | 5 +++++ milena/mln/world/kn/debug/println.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d925cb5..f42284d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/debug/println.hh: Handle images based on any site + sets. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Add preconditions. * mln/world/kn/accu/max_interval.hh, diff --git a/milena/mln/world/kn/debug/println.hh b/milena/mln/world/kn/debug/println.hh index c603722..f0533a7 100644 --- a/milena/mln/world/kn/debug/println.hh +++ b/milena/mln/world/kn/debug/println.hh @@ -96,7 +96,7 @@ namespace mln { std::cout << bdr; for (col = min_col; col <= max_col; ++col) - if (ima(p)) + if (ima.domain().has(p) && ima(p)) switch (face_dim(p)) { case 0: -- 1.7.2.5

1 0

olena-2.0-170-g26f7052 Add preconditions.
by Guillaume Lazzara 01 Nov '12

01 Nov '12

* mln/world/kn/accu/max_interval.hh, * mln/world/kn/accu/min_interval.hh: Here. --- milena/ChangeLog | 7 +++++++ milena/mln/world/kn/accu/max_interval.hh | 6 ++++++ milena/mln/world/kn/accu/min_interval.hh | 5 +++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b3bc9f7..d925cb5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Add preconditions. + + * mln/world/kn/accu/max_interval.hh, + * mln/world/kn/accu/min_interval.hh: Here. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Move files to proper directories. * mln/accu/stat/median_few.hh, diff --git a/milena/mln/world/kn/accu/max_interval.hh b/milena/mln/world/kn/accu/max_interval.hh index e53be7e..dc183ef 100644 --- a/milena/mln/world/kn/accu/max_interval.hh +++ b/milena/mln/world/kn/accu/max_interval.hh @@ -147,6 +147,7 @@ namespace mln { mlc_converts_to(U,T)::check(); mlc_converts_to(V,T)::check(); + mln_precondition(first <= last); inter_ = value::interval<T>(first, last); init(); } @@ -164,6 +165,7 @@ namespace mln void max_interval<T>::take_as_init_(const argument& t) { + mln_precondition(inter_.has(t)); t_ = t; } @@ -172,6 +174,7 @@ namespace mln void max_interval<T>::take(const argument& t) { + mln_precondition(inter_.has(t)); if (t > t_) t_ = t; } @@ -181,6 +184,8 @@ namespace mln void max_interval<T>::take(const max_interval<T>& other) { + mln_precondition(inter_.first() <= other.inter_.first()); + mln_precondition(inter_.last() >= other.inter_.last()); if (other.t_ > t_) t_ = other.t_; } @@ -190,6 +195,7 @@ namespace mln void max_interval<T>::set_value(const T& t) { + mln_precondition(inter_.has(t)); t_ = t; } diff --git a/milena/mln/world/kn/accu/min_interval.hh b/milena/mln/world/kn/accu/min_interval.hh index 7081a07..e95fe34 100644 --- a/milena/mln/world/kn/accu/min_interval.hh +++ b/milena/mln/world/kn/accu/min_interval.hh @@ -145,6 +145,7 @@ namespace mln { mlc_converts_to(U,T)::check(); mlc_converts_to(V,T)::check(); + mln_precondition(first <= last); inter_ = value::interval<T>(first, last); init(); } @@ -161,6 +162,7 @@ namespace mln inline void min_interval<T>::take_as_init_(const argument& t) { + mln_precondition(inter_.has(t)); t_ = t; } @@ -168,6 +170,7 @@ namespace mln inline void min_interval<T>::take(const argument& t) { + mln_precondition(inter_.has(t)); if (t < t_) t_ = t; } @@ -177,6 +180,8 @@ namespace mln void min_interval<T>::take(const min_interval<T>& other) { + mln_precondition(inter_.first() <= other.inter_.first()); + mln_precondition(inter_.last() >= other.inter_.last()); if (other.t_ < t_) t_ = other.t_; } -- 1.7.2.5

1 0

olena-2.0-169-gdc08d9b Move files to proper directories.
by Guillaume Lazzara 01 Nov '12

01 Nov '12

* mln/accu/stat/median_few.hh, * mln/world/kn/internal/hqueue.hh: Move... * mln/world/kn/accu/median_few.hh, * mln/world/kn/hqueue.hh: ... here. --- milena/ChangeLog | 10 ++ milena/mln/accu/stat/median_few.hh | 147 ---------------------------- milena/mln/world/kn/accu/median_few.hh | 152 +++++++++++++++++++++++++++++ milena/mln/world/kn/hqueue.hh | 160 +++++++++++++++++++++++++++++++ milena/mln/world/kn/internal/hqueue.hh | 165 -------------------------------- 5 files changed, 322 insertions(+), 312 deletions(-) delete mode 100644 milena/mln/accu/stat/median_few.hh create mode 100644 milena/mln/world/kn/accu/median_few.hh create mode 100644 milena/mln/world/kn/hqueue.hh delete mode 100644 milena/mln/world/kn/internal/hqueue.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index addbfff..b3bc9f7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Move files to proper directories. + + * mln/accu/stat/median_few.hh, + * mln/world/kn/internal/hqueue.hh: Move... + + * mln/world/kn/accu/median_few.hh, + * mln/world/kn/hqueue.hh: ... here. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Revamp Code. * mln/world/k1/immerse_with.hh, diff --git a/milena/mln/accu/stat/median_few.hh b/milena/mln/accu/stat/median_few.hh deleted file mode 100644 index dd3c16f..0000000 --- a/milena/mln/accu/stat/median_few.hh +++ /dev/null @@ -1,147 +0,0 @@ -// 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. - -#ifndef MLN_ACCU_STAT_MEDIAN_FEW_HH -# define MLN_ACCU_STAT_MEDIAN_FEW_HH - -/// \file -/// -/// \brief Define a median accumulator class to be used with few -/// values. - -# include <iostream> -# include <vector> -# include <algorithm> - -# include <mln/trait/routine/mean.hh> -# include <mln/accu/internal/base.hh> - - -namespace mln -{ - - namespace accu - { - - namespace stat - { - - /// \brief Define a median accumulator class to be used with few - /// values. - template <typename T, - typename R = mln_trait_routine_mean(2,T) > - struct median_few - : public mln::accu::internal::base< R, median_few<T,R> > - { - typedef T argument; - typedef R result; - - median_few(); - - void reserve(unsigned n); - void init(); - - void take(const argument& v); - void take(const median_few<T,R>& other); - // nota bene: no possible untake with this accumulator - - result to_result() const; - - bool is_valid() const; - - protected: - - mutable std::vector<argument> v_; - }; - - -# ifndef MLN_INCLUDE_ONLY - - template <typename T, typename R> - median_few<T,R>::median_few() - { - init(); - } - - template <typename T, typename R> - void - median_few<T,R>::reserve(unsigned n) - { - v_.reserve(n); - } - - template <typename T, typename R> - void - median_few<T,R>::init() - { - v_.clear(); - } - - template <typename T, typename R> - void - median_few<T,R>::take(const argument& v) - { - v_.push_back(v); - } - - template <typename T, typename R> - void - median_few<T,R>::take(const median_few<T,R>& other) - { - v_.insert(v_.end(), other.v_.begin(), other.v_.end()); - } - - - template <typename T, typename R> - typename median_few<T,R>::result - median_few<T,R>::to_result() const - { - mln_precondition(is_valid()); - std::sort(v_.begin(), v_.end()); - // indices 0 1 2 => size = 3 => mid = 1 - // 0 1 => size = 2 => mid = 0 - unsigned mid = (v_.size() - 1) / 2; - if (v_.size() % 2) - return v_[mid]; - else - return (R(v_[mid]) + R(v_[mid + 1])) / 2; - } - - template <typename T, typename R> - bool - median_few<T,R>::is_valid() const - { - return v_.size() != 0; - } - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::accu::stat - - } // end of namespace mln::accu - -} // end of namespace mln - -#endif // ! MLN_ACCU_STAT_MEDIAN_FEW_HH diff --git a/milena/mln/world/kn/accu/median_few.hh b/milena/mln/world/kn/accu/median_few.hh new file mode 100644 index 0000000..31dfd68 --- /dev/null +++ b/milena/mln/world/kn/accu/median_few.hh @@ -0,0 +1,152 @@ +// 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. + +#ifndef MLN_WORLD_KN_ACCU_MEDIAN_FEW_HH +# define MLN_WORLD_KN_ACCU_MEDIAN_FEW_HH + +/// \file +/// +/// \brief Define a median accumulator class to be used with few +/// values. + +# include <iostream> +# include <vector> +# include <algorithm> + +# include <mln/trait/routine/mean.hh> +# include <mln/accu/internal/base.hh> + + +namespace mln +{ + + namespace world + { + + namespace kn + { + + namespace accu + { + + /// \brief Define a median accumulator class to be used with few + /// values. + template <typename T, + typename R = mln_trait_routine_mean(2,T) > + struct median_few + : public mln::accu::internal::base< R, median_few<T,R> > + { + typedef T argument; + typedef R result; + + median_few(); + + void reserve(unsigned n); + void init(); + + void take(const argument& v); + void take(const median_few<T,R>& other); + // nota bene: no possible untake with this accumulator + + result to_result() const; + + bool is_valid() const; + + protected: + + mutable std::vector<argument> v_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T, typename R> + median_few<T,R>::median_few() + { + init(); + } + + template <typename T, typename R> + void + median_few<T,R>::reserve(unsigned n) + { + v_.reserve(n); + } + + template <typename T, typename R> + void + median_few<T,R>::init() + { + v_.clear(); + } + + template <typename T, typename R> + void + median_few<T,R>::take(const argument& v) + { + v_.push_back(v); + } + + template <typename T, typename R> + void + median_few<T,R>::take(const median_few<T,R>& other) + { + v_.insert(v_.end(), other.v_.begin(), other.v_.end()); + } + + + template <typename T, typename R> + typename median_few<T,R>::result + median_few<T,R>::to_result() const + { + mln_precondition(is_valid()); + std::sort(v_.begin(), v_.end()); + // indices 0 1 2 => size = 3 => mid = 1 + // 0 1 => size = 2 => mid = 0 + unsigned mid = (v_.size() - 1) / 2; + if (v_.size() % 2) + return v_[mid]; + else + return (R(v_[mid]) + R(v_[mid + 1])) / 2; + } + + template <typename T, typename R> + bool + median_few<T,R>::is_valid() const + { + return v_.size() != 0; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::accu + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_KN_ACCU_MEDIAN_FEW_HH diff --git a/milena/mln/world/kn/hqueue.hh b/milena/mln/world/kn/hqueue.hh new file mode 100644 index 0000000..dc2b365 --- /dev/null +++ b/milena/mln/world/kn/hqueue.hh @@ -0,0 +1,160 @@ +// 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. + +#ifndef MLN_WORLD_KN_HQUEUE_HH +# define MLN_WORLD_KN_HQUEUE_HH + +/// \file +/// \brief Class for hierarchical queues. + + +# include <iostream> +# include <vector> +# include <mln/world/kn/internal/queue.hh> + +namespace mln +{ + + namespace world + { + + namespace kn + { + + /// \internal + /// \brief Class for hierarchical queues. + template <typename T, typename P> + class hqueue + { + public: + hqueue(); + hqueue(const value::interval& inter); + hqueue(const P& first, const P& last); + + unsigned nelements() const; + + bool is_empty() const; + bool is_empty_at(const P& bucket) const; + + void push(const T& t, const P& bucket); + T pop(const P& bucket); + + // FIXME: add some reserve strategies... + + private: + std::vector< internal::queue_<T> > v_; + value::interval inter_; + unsigned n_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename T, typename P> + hqueue<T,P>::hqueue() + { + n_ = 0; + } + + template <typename T, typename P> + hqueue<T,P>::hqueue(const value::interval& inter) + { + v_.resize(inter.nelements()); + inter_ = inter; + n_ = 0; + } + + template <typename T, typename P> + hqueue<T,P>::hqueue(const P& first, const P& last) + { + v_.resize(inter_.nelements()); + inter_ = value::interval(first, last); + n_ = 0; + } + + template <typename T, typename P> + unsigned + hqueue<T,P>::nelements() const + { + return n_; + } + + template <typename T, typename P> + bool + hqueue<T,P>::is_empty_at(const P& bucket) const + { + unsigned i = inter_.index_of(bucket); + mln_precondition(i < v_.size()); + return v_[i].is_empty(); + } + + template <typename T, typename P> + bool + hqueue<T,P>::is_empty() const + { + return n_ == 0; + } + + template <typename T, typename P> + void + hqueue<T,P>::push(const T& t, const P& bucket) + { + unsigned i = inter_.index_of(bucket); + mln_precondition(i < v_.size()); + v_[i].push(t); + } + + template <typename T, typename P> + T + hqueue<T,P>::pop(const P& bucket) + { + mln_precondition(! is_empty_at(bucket)); + unsigned i = inter_.index_of(bucket); + mln_precondition(i < v_.size()); + return v_[i].pop(); + } + + // template <typename T, typename P> + // std::ostream& + // operator<<(std::ostream& ostr, const hqueue<T,P>& q) + // { + // unsigned n = q.size(); + // ostr << '('; + // for (unsigned i = 0; i < n; ++i) + // ostr << q.v_[i] << (i + 1 == n ? "" : ", "); + // return ostr << ')'; + // } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_KN_HQUEUE_HH diff --git a/milena/mln/world/kn/internal/hqueue.hh b/milena/mln/world/kn/internal/hqueue.hh deleted file mode 100644 index fe29376..0000000 --- a/milena/mln/world/kn/internal/hqueue.hh +++ /dev/null @@ -1,165 +0,0 @@ -// 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. - -#ifndef MLN_WORLD_KN_INTERNAL_HQUEUE_HH -# define MLN_WORLD_KN_INTERNAL_HQUEUE_HH - -/// \file -/// \brief Class for hierarchical queues. - - -# include <iostream> -# include <vector> -# include <mln/world/kn/internal/queue.hh> - -namespace mln -{ - - namespace world - { - - namespace kn - { - - namespace internal - { - - /// \internal - /// \brief Class for hierarchical queues. - template <typename T, typename P> - class hqueue - { - public: - hqueue(); - hqueue(const value::interval& inter); - hqueue(const P& first, const P& last); - - unsigned nelements() const; - - bool is_empty() const; - bool is_empty_at(const P& bucket) const; - - void push(const T& t, const P& bucket); - T pop(const P& bucket); - - // FIXME: add some reserve strategies... - - private: - std::vector< internal::queue_<T> > v_; - value::interval inter_; - unsigned n_; - }; - - -# ifndef MLN_INCLUDE_ONLY - - - template <typename T, typename P> - hqueue<T,P>::hqueue() - { - n_ = 0; - } - - template <typename T, typename P> - hqueue<T,P>::hqueue(const value::interval& inter) - { - v_.resize(inter.nelements()); - inter_ = inter; - n_ = 0; - } - - template <typename T, typename P> - hqueue<T,P>::hqueue(const P& first, const P& last) - { - v_.resize(inter_.nelements()); - inter_ = value::interval(first, last); - n_ = 0; - } - - template <typename T, typename P> - unsigned - hqueue<T,P>::nelements() const - { - return n_; - } - - template <typename T, typename P> - bool - hqueue<T,P>::is_empty_at(const P& bucket) const - { - unsigned i = inter_.index_of(bucket); - mln_precondition(i < v_.size()); - return v_[i].is_empty(); - } - - template <typename T, typename P> - bool - hqueue<T,P>::is_empty() const - { - return n_ == 0; - } - - template <typename T, typename P> - void - hqueue<T,P>::push(const T& t, const P& bucket) - { - unsigned i = inter_.index_of(bucket); - mln_precondition(i < v_.size()); - v_[i].push(t); - } - - template <typename T, typename P> - T - hqueue<T,P>::pop(const P& bucket) - { - mln_precondition(! is_empty_at(bucket)); - unsigned i = inter_.index_of(bucket); - mln_precondition(i < v_.size()); - return v_[i].pop(); - } - - // template <typename T, typename P> - // std::ostream& - // operator<<(std::ostream& ostr, const hqueue<T,P>& q) - // { - // unsigned n = q.size(); - // ostr << '('; - // for (unsigned i = 0; i < n; ++i) - // ostr << q.v_[i] << (i + 1 == n ? "" : ", "); - // return ostr << ')'; - // } - - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::world::kn::internal - - } // end of namespace mln::world::kn - - } // end of namespace mln::world - -} // end of namespace mln - -#endif // ! MLN_WORLD_KN_INTERNAL_HQUEUE_HH -- 1.7.2.5

1 0

olena-2.0-168-g8a4190e Revamp Code.
by Guillaume Lazzara 01 Nov '12

01 Nov '12

* mln/world/k1/immerse_with.hh, * mln/world/k1/un_immerse.hh, * mln/world/kn/display_enlarged.hh, * mln/world/kn/fill_0_1_faces_internal_border.hh: Avoid the use of exact() in preconditions. * mln/world/kn/accu/max_interval.hh * mln/world/kn/accu/min_interval.hh: Improve comments. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/world/k1/immerse_with.hh | 3 ++- milena/mln/world/k1/un_immerse.hh | 4 ++-- milena/mln/world/kn/accu/max_interval.hh | 6 +++--- milena/mln/world/kn/accu/min_interval.hh | 7 ++++--- milena/mln/world/kn/display_enlarged.hh | 13 +++++++------ .../mln/world/kn/fill_0_1_faces_internal_border.hh | 2 +- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d0db77e..addbfff 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Revamp Code. + + * mln/world/k1/immerse_with.hh, + * mln/world/k1/un_immerse.hh, + * mln/world/kn/display_enlarged.hh, + * mln/world/kn/fill_0_1_faces_internal_border.hh: Avoid the use of + exact() in preconditions. + + * mln/world/kn/accu/max_interval.hh + * mln/world/kn/accu/min_interval.hh: Improve comments. + +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of safe_cast. * mln/world/k1/fill_0_from_1_faces.hh, diff --git a/milena/mln/world/k1/immerse_with.hh b/milena/mln/world/k1/immerse_with.hh index aa9658b..1e3fd5d 100644 --- a/milena/mln/world/k1/immerse_with.hh +++ b/milena/mln/world/k1/immerse_with.hh @@ -125,7 +125,6 @@ namespace mln const Function_vvvv2v<F4>& f_0faces_) { trace::entering("mln::world::k1::immerse_with"); - mln_precondition(exact(ima_).is_valid()); // FIXME: we cannot write that test because we rely on // safe_convert. So, even though some types may not @@ -138,6 +137,8 @@ namespace mln const F2& f_1faces = exact(f_1faces_); const F4& f_0faces = exact(f_0faces_); + mln_precondition(ima.is_valid()); + mln_ch_value(I,V) output = k1::immerse(ima, new_value_type, default_value); k1::fill_1_from_2_faces(output, f_1faces); k1::fill_0_from_1_faces(output, f_0faces); diff --git a/milena/mln/world/k1/un_immerse.hh b/milena/mln/world/k1/un_immerse.hh index 767e4f5..8c352ca 100644 --- a/milena/mln/world/k1/un_immerse.hh +++ b/milena/mln/world/k1/un_immerse.hh @@ -76,8 +76,8 @@ namespace mln un_immerse(const Image& ima_, const V& new_value_type) { trace::entering("mln::world::k1::un_immerse"); - mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); mln_ch_value(I,V) output = kn::un_immerse(ima, 2, new_value_type); @@ -91,8 +91,8 @@ namespace mln un_immerse(const Image& ima_) { trace::entering("mln::world::k1::un_immerse"); - mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); + mln_precondition(ima.is_valid()); mln_concrete(I) output = kn::un_immerse(ima, 1); diff --git a/milena/mln/world/kn/accu/max_interval.hh b/milena/mln/world/kn/accu/max_interval.hh index 8d49932..e53be7e 100644 --- a/milena/mln/world/kn/accu/max_interval.hh +++ b/milena/mln/world/kn/accu/max_interval.hh @@ -28,7 +28,7 @@ /// \file /// -/// \brief Define an accumulator that computes a max on a specific +/// \brief Maximum accumulator restricted to a specific /// interval. # include <mln/core/concept/meta_accumulator.hh> @@ -78,8 +78,8 @@ namespace mln namespace accu { - /// \brief Minimum accumulator restricted to a specific - /// interval. + /// \brief Maximum accumulator restricted to a specific + /// interval. /// /// The parameter \c T is the type of values. /// diff --git a/milena/mln/world/kn/accu/min_interval.hh b/milena/mln/world/kn/accu/min_interval.hh index df6120d..7081a07 100644 --- a/milena/mln/world/kn/accu/min_interval.hh +++ b/milena/mln/world/kn/accu/min_interval.hh @@ -28,7 +28,8 @@ /// \file /// -/// Define an accumulator that computes a min on a specific interval. +/// \brief An accumulator that computes a min within specific +/// interval. # include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> @@ -76,8 +77,8 @@ namespace mln namespace accu { - /// \brief Minimum accumulator restricted to a specific - /// interval. + /// \brief An accumulator that computes a min within specific + /// interval. /*! * The parameter \c T is the type of values. * diff --git a/milena/mln/world/kn/display_enlarged.hh b/milena/mln/world/kn/display_enlarged.hh index e1b122a..00e3f24 100644 --- a/milena/mln/world/kn/display_enlarged.hh +++ b/milena/mln/world/kn/display_enlarged.hh @@ -89,10 +89,10 @@ namespace mln { trace::entering("mln::world::kn::display_enlarged"); - mln_precondition(exact(ima_kn_).is_valid()); + const I& ima_kn = exact(ima_kn_); + mln_precondition(ima_kn.is_valid()); mln_assertion(zoom_ % 2); - const I& ima_kn = exact(ima_kn_); int shift = zoom_ + 1, mult = shift / 2; @@ -101,10 +101,11 @@ namespace mln if (zoom_ == 1) return duplicate(ima_kn); - mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * mult, - ima_kn.domain().pmin().col() * mult, - ima_kn.domain().pmax().row() * mult, - ima_kn.domain().pmax().col() * mult)); + mln_concrete(I) + output(make::box2d(ima_kn.domain().pmin().row() * mult, + ima_kn.domain().pmin().col() * mult, + ima_kn.domain().pmax().row() * mult, + ima_kn.domain().pmax().col() * mult)); const mln::def::coord min_row = geom::min_row(ima_kn), diff --git a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh b/milena/mln/world/kn/fill_0_1_faces_internal_border.hh index 915a69a..f991ecb 100644 --- a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh +++ b/milena/mln/world/kn/fill_0_1_faces_internal_border.hh @@ -74,8 +74,8 @@ namespace mln { trace::entering("mln::world::kn::fill_0_1_faces_internal_border"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); + mln_precondition(inout.is_valid()); inner_border::fill(inout, v); -- 1.7.2.5

1 0

olena-2.0-167-g9726f7e Make use of safe_cast.
by Guillaume Lazzara 01 Nov '12

01 Nov '12

* mln/world/k1/fill_0_from_1_faces.hh, * mln/world/k1/fill_1_from_2_faces.hh, * mln/world/k2/fill_non_primary_from_primary_2_faces.hh, * mln/world/kn/fill_0_from_1_faces.hh, * mln/world/kn/fill_0_from_2_faces.hh, * mln/world/kn/fill_1_from_2_faces.hh, * mln/world/kn/fill_1_from_aux_2_faces.hh, * mln/world/kn/fill_2_from_1_faces.hh, * mln/world/kn/internal/fill_primary_2_faces_from_input.hh, * mln/world/kn/un_immerse.hh: Here. * mln/world/kn/safe_cast.hh: Add safe_cast overloads. --- milena/ChangeLog | 17 +++++ milena/mln/world/k1/fill_0_from_1_faces.hh | 26 +++++---- milena/mln/world/k1/fill_1_from_2_faces.hh | 31 ++++++---- .../k2/fill_non_primary_from_primary_2_faces.hh | 63 +++++++++---------- milena/mln/world/kn/fill_0_from_1_faces.hh | 29 +++++---- milena/mln/world/kn/fill_0_from_2_faces.hh | 26 +++++---- milena/mln/world/kn/fill_1_from_2_faces.hh | 26 +++++---- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 39 +++++++----- milena/mln/world/kn/fill_2_from_1_faces.hh | 23 ++++--- .../kn/internal/fill_primary_2_faces_from_input.hh | 13 ++-- milena/mln/world/kn/safe_cast.hh | 64 +++++++++++++++++++- milena/mln/world/kn/un_immerse.hh | 6 +- 12 files changed, 230 insertions(+), 133 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6dedd0d..d0db77e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2012-11-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make use of safe_cast. + + * mln/world/k1/fill_0_from_1_faces.hh, + * mln/world/k1/fill_1_from_2_faces.hh, + * mln/world/k2/fill_non_primary_from_primary_2_faces.hh, + * mln/world/kn/fill_0_from_1_faces.hh, + * mln/world/kn/fill_0_from_2_faces.hh, + * mln/world/kn/fill_1_from_2_faces.hh, + * mln/world/kn/fill_1_from_aux_2_faces.hh, + * mln/world/kn/fill_2_from_1_faces.hh, + * mln/world/kn/internal/fill_primary_2_faces_from_input.hh, + * mln/world/kn/un_immerse.hh: Here. + + * mln/world/kn/safe_cast.hh: Add safe_cast overloads. + 2012-10-31 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/world/kn/display_enlarged.hh: Fix. diff --git a/milena/mln/world/k1/fill_0_from_1_faces.hh b/milena/mln/world/k1/fill_0_from_1_faces.hh index c906461..a0c3179 100644 --- a/milena/mln/world/k1/fill_0_from_1_faces.hh +++ b/milena/mln/world/k1/fill_0_from_1_faces.hh @@ -32,6 +32,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> +# include <mln/world/kn/safe_cast.hh> # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> @@ -85,15 +86,18 @@ namespace mln { trace::entering("mln::world::k1::fill_0_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); const F& f = exact(f_); + mln_precondition(inout.is_valid()); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) - inout(p) = f(inout(p + up), inout(p + left), - inout(p + right), inout(p + down)); + inout(p) = kn::safe_cast(f(kn::safe_cast(inout(p + up)), + kn::safe_cast(inout(p + left)), + kn::safe_cast(inout(p + right)), + kn::safe_cast(inout(p + down)))); trace::exiting("mln::world::k1::fill_0_from_1_faces"); } @@ -103,24 +107,24 @@ namespace mln { trace::entering("mln::world::k1::fill_0_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); + mln_precondition(inout.is_valid()); - A accu(exact(accu_)); - + A accu = exact(accu_); + typedef mln_argument(A) arg; mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) { if (inout.domain().has(p + up)) - accu.take(inout(p + up)); + accu.take(kn::safe_cast_to<arg>(inout(p + up))); if (inout.domain().has(p + left)) - accu.take(inout(p + left)); + accu.take(kn::safe_cast_to<arg>(inout(p + left))); if (inout.domain().has(p + right)) - accu.take(inout(p + right)); + accu.take(kn::safe_cast_to<arg>(inout(p + right))); if (inout.domain().has(p + down)) - accu.take(inout(p + down)); - inout(p) = accu.to_result(); + accu.take(kn::safe_cast_to<arg>(inout(p + down))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::k1::fill_0_from_1_faces"); diff --git a/milena/mln/world/k1/fill_1_from_2_faces.hh b/milena/mln/world/k1/fill_1_from_2_faces.hh index 72922ec..a4873c2 100644 --- a/milena/mln/world/k1/fill_1_from_2_faces.hh +++ b/milena/mln/world/k1/fill_1_from_2_faces.hh @@ -34,6 +34,7 @@ # 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> namespace mln { @@ -87,19 +88,21 @@ namespace mln { trace::entering("mln::world::k1::fill_1_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); const F& f = exact(f_); + mln_precondition(inout.is_valid()); + kn::border::compute_1_faces(inout, f); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) - inout(p) = f(inout(p + left), inout(p + right)); + inout(p) = kn::safe_cast(f(kn::safe_cast(inout(p + left)), + kn::safe_cast(inout(p + right)))); else if (kn::is_1_face_horizontal(p)) - inout(p) = f(inout(p + up), inout(p + down)); + inout(p) = kn::safe_cast(f(kn::safe_cast(inout(p + up)), + kn::safe_cast(inout(p + down)))); trace::exiting("mln::world::k1::fill_1_from_2_faces"); } @@ -109,29 +112,31 @@ namespace mln { trace::entering("mln::world::k1::fill_1_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - A accu(exact(accu_)); + A accu = exact(accu_); + + mln_precondition(inout.is_valid()); + 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(inout(p + left)); + accu.take(kn::safe_cast_to<arg>(inout(p + left))); if (inout.domain().has(p + right)) - accu.take(inout(p + right)); - inout(p) = accu.to_result(); + accu.take(kn::safe_cast_to<arg>(inout(p + right))); + inout(p) = kn::safe_cast(accu.to_result()); } else if (kn::is_1_face_horizontal(p)) { accu.init(); if (inout.domain().has(p + up)) - accu.take(inout(p + up)); + accu.take(kn::safe_cast_to<arg>(inout(p + up))); if (inout.domain().has(p + down)) - accu.take(inout(p + down)); - inout(p) = accu.to_result(); + accu.take(kn::safe_cast_to<arg>(inout(p + down))); + inout(p) = kn::safe_cast(accu.to_result()); } trace::exiting("mln::world::k1::fill_1_from_2_faces"); 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 0f8d71c..f218fd5 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 @@ -111,36 +111,33 @@ namespace mln { trace::entering("mln::world::k2::fill_non_primary_from_primary_2_faces"); - mln_precondition(exact(ima_).is_valid()); I& ima = exact(ima_); const F2& f_intermediate = exact(f_intermediate_); const F4& f_center = exact(f_center_); - typedef mln_value(I) VI; - typedef mln_argument(F2) V2; - typedef mln_argument(F4) V4; - mln_box(I) b = ima.domain(); - mln_piter(I) p(b); + mln_precondition(ima.is_valid()); + + mln_piter(I) p(ima.domain()); for_all(p) if (is_non_primary_2_face_vertical(p)) { - ima(p) = kn::safe_cast_to<VI>( - f_intermediate(kn::safe_cast_to<V2>(ima(p + 2 * left)), - kn::safe_cast_to<V2>(ima(p + 2 * right)))); + ima(p) = kn::safe_cast( + f_intermediate(kn::safe_cast(ima(p + 2 * left)), + kn::safe_cast(ima(p + 2 * right)))); } else if (is_non_primary_2_face_horizontal(p)) { - ima(p) = kn::safe_cast_to<VI>( - f_intermediate(kn::safe_cast_to<V2>(ima(p + 2 * up)), - kn::safe_cast_to<V2>(ima(p + 2 * down)))); + ima(p) = kn::safe_cast( + f_intermediate(kn::safe_cast(ima(p + 2 * up)), + kn::safe_cast(ima(p + 2 * down)))); } else if (is_non_primary_2_face_center(p)) { - ima(p) = kn::safe_cast_to<VI>( - f_center(kn::safe_cast_to<V4>(ima(p + 2 * up_left)), - kn::safe_cast_to<V4>(ima(p + 2 * up_right)), - kn::safe_cast_to<V4>(ima(p + 2 * down_left)), - kn::safe_cast_to<V4>(ima(p + 2 * down_right)))); + ima(p) = kn::safe_cast( + f_center(kn::safe_cast(ima(p + 2 * up_left)), + kn::safe_cast(ima(p + 2 * up_right)), + kn::safe_cast(ima(p + 2 * down_left)), + kn::safe_cast(ima(p + 2 * down_right)))); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_2_faces"); @@ -152,46 +149,44 @@ namespace mln const Accumulator<A>& accu_) { trace::entering("mln::world::k2::fill_non_primary_from_primary_2_faces"); - - mln_precondition(exact(ima_).is_valid()); I& ima = exact(ima_); A accu = exact(accu_); - typedef mln_value(I) VI; - typedef mln_argument(A) V; - mln_box(I) b = ima.domain(); - mln_piter(I) p(b); + mln_precondition(ima.is_valid()); + + typedef mln_argument(A) arg; + mln_piter(I) p(ima.domain()); for_all(p) if (is_non_primary_2_face_vertical(p)) { accu.init(); if (ima.domain().has(p + 2 * left)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * left))); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * left))); if (ima.domain().has(p + 2 * right)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * right))); - ima(p) = kn::safe_cast_to<VI>(accu.to_result()); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * right))); + ima(p) = kn::safe_cast(accu.to_result()); } else if (is_non_primary_2_face_horizontal(p)) { accu.init(); if (ima.domain().has(p + 2 * up)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up))); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * up))); if (ima.domain().has(p + 2 * down)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down))); - ima(p) = kn::safe_cast_to<VI>(accu.to_result()); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * down))); + ima(p) = kn::safe_cast(accu.to_result()); } else if (is_non_primary_2_face_center(p)) { accu.init(); if (ima.domain().has(p + 2 * up_left)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_left))); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * up_left))); if (ima.domain().has(p + 2 * up_right)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_right))); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * up_right))); if (ima.domain().has(p + 2 * down_left)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_left))); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * down_left))); if (ima.domain().has(p + 2 * down_right)) - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_right))); - ima(p) = kn::safe_cast_to<VI>(accu.to_result()); + accu.take(kn::safe_cast_to<arg>(ima(p + 2 * down_right))); + ima(p) = kn::safe_cast(accu.to_result()); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_2_faces"); diff --git a/milena/mln/world/kn/fill_0_from_1_faces.hh b/milena/mln/world/kn/fill_0_from_1_faces.hh index adcea78..188c4a6 100644 --- a/milena/mln/world/kn/fill_0_from_1_faces.hh +++ b/milena/mln/world/kn/fill_0_from_1_faces.hh @@ -32,6 +32,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> +# include <mln/world/kn/safe_cast.hh> namespace mln { @@ -85,26 +86,25 @@ namespace mln { trace::entering("mln::world::kn::fill_0_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; + mln_precondition(inout.is_valid()); - A accu = A(); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + A accu = exact(accu_); + typedef mln_argument(A) arg; + mln_piter(I) p(inout.domain()); for_all(p) if (is_0_face(p)) { accu.init(); if (inout.domain().has(p + left)) - accu.take(inout(p + left)); + accu.take(safe_cast_to<arg>(inout(p + left))); if (inout.domain().has(p + right)) - accu.take(inout(p + right)); + accu.take(safe_cast_to<arg>(inout(p + right))); if (inout.domain().has(p + up)) - accu.take(inout(p + up)); + accu.take(safe_cast_to<arg>(inout(p + up))); if (inout.domain().has(p + down)) - accu.take(inout(p + down)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(inout(p + down))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::kn::fill_0_from_1_faces"); @@ -117,15 +117,18 @@ namespace mln { trace::entering("mln::world::kn::fill_0_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); const F& f = exact(f_); + mln_precondition(inout.is_valid()); + mln_piter(I) p(inout.domain()); for_all(p) if (is_0_face(p)) - inout(p) = f(inout(p + left), inout(p + right), - inout(p + up), inout(p + down)); + inout(p) = safe_cast(f(safe_cast(inout(p + left)), + safe_cast(inout(p + right)), + safe_cast(inout(p + up)), + safe_cast(inout(p + down)))); trace::exiting("mln::world::kn::fill_0_from_1_faces"); } 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 6e6ee82..7164309 100644 --- a/milena/mln/world/kn/fill_0_from_2_faces.hh +++ b/milena/mln/world/kn/fill_0_from_2_faces.hh @@ -32,6 +32,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> +# include <mln/world/kn/safe_cast.hh> namespace mln { @@ -76,15 +77,18 @@ namespace mln { trace::entering("mln::world::kn::fill_0_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); F& f = exact(f_); + mln_precondition(inout.is_valid()); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) - inout(p) = f(inout(p + up_left), inout(p + up_right), - inout(p + down_left), inout(p + down_right)); + inout(p) = safe_cast(f(safe_cast(inout(p + up_left)), + safe_cast(inout(p + up_right)), + safe_cast(inout(p + down_left)), + safe_cast(inout(p + down_right)))); trace::exiting("mln::world::kn::fill_0_from_2_faces"); } @@ -95,25 +99,25 @@ namespace mln { trace::entering("mln::world::kn::fill_0_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; + mln_precondition(inout.is_valid()); - A accu = A(); + A accu = exact(accu_); + typedef mln_argument(A) arg; mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) { accu.init(); if (inout.domain().has(p + up_left)) - accu.take(inout(p + up_left)); + accu.take(safe_cast_to<arg>(inout(p + up_left))); if (inout.domain().has(p + up_right)) - accu.take(inout(p + up_right)); + accu.take(safe_cast_to<arg>(inout(p + up_right))); if (inout.domain().has(p + down_left)) - accu.take(inout(p + down_left)); + accu.take(safe_cast_to<arg>(inout(p + down_left))); if (inout.domain().has(p + down_right)) - accu.take(inout(p + down_right)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(inout(p + down_right))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::kn::fill_0_from_2_faces"); 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 2177f48..c190347 100644 --- a/milena/mln/world/kn/fill_1_from_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_2_faces.hh @@ -34,6 +34,7 @@ # 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> namespace mln { @@ -87,29 +88,30 @@ namespace mln { trace::entering("mln::world::kn::fill_1_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); + mln_precondition(inout.is_valid()); - A accu(exact(accu_)); + 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(inout(p + left)); + accu.take(safe_cast_to<arg>(inout(p + left))); if (inout.domain().has(p + right)) - accu.take(inout(p + right)); - inout(p) = accu.to_result(); + 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(inout(p + up)); + accu.take(safe_cast_to<arg>(inout(p + up))); if (inout.domain().has(p + down)) - accu.take(inout(p + down)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(inout(p + down))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::kn::fill_1_from_2_faces"); @@ -121,18 +123,20 @@ namespace mln { trace::entering("mln::world::kn::fill_1_from_2_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); const F& f = exact(f_); + mln_precondition(inout.is_valid()); kn::border::compute_1_faces(inout, f); mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) - inout(p) = f(inout(p + left), inout(p + right)); + inout(p) = safe_cast(f(safe_cast(inout(p + left)), + safe_cast(inout(p + right)))); else if (is_1_face_horizontal(p)) - inout(p) = f(inout(p + up), inout(p + down)); + inout(p) = safe_cast(f(safe_cast(inout(p + up)), + safe_cast(inout(p + down)))); trace::exiting("mln::world::kn::fill_1_from_2_faces"); } 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 820e78f..d18e3c8 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 @@ -35,6 +35,7 @@ # 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> namespace mln { @@ -96,21 +97,24 @@ namespace mln { trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); - mln_precondition(exact(inout_).is_valid()); - mln_precondition(exact(aux_).is_valid()); - mln_precondition(exact(inout_).domain() == exact(aux_).domain()); I& inout = exact(inout_); const J& aux = exact(aux_); 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); mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) - inout(p) = f(aux(p + left), aux(p + right)); + inout(p) = safe_cast(f(safe_cast(aux(p + left)), + safe_cast(aux(p + right)))); else if (kn::is_1_face_horizontal(p)) - inout(p) = f(aux(p + up), aux(p + down)); + inout(p) = safe_cast(f(safe_cast(aux(p + up)), + safe_cast(aux(p + down)))); trace::exiting("mln::world::kn::fill_1_from_aux_2_faces"); } @@ -122,33 +126,34 @@ namespace mln { trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); - mln_precondition(exact(inout_).is_valid()); - mln_precondition(exact(aux_).is_valid()); - mln_precondition(exact(inout_).domain() == exact(aux_).domain()); I& inout = exact(inout_); const J& aux = exact(aux_); - A accu(exact(accu_)); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_precondition(inout.is_valid()); + mln_precondition(aux.is_valid()); + mln_precondition(inout.domain() == aux.domain()); + + 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 (aux.domain().has(p + left)) - accu.take(aux(p + left)); + accu.take(safe_cast_to<arg>(aux(p + left))); if (aux.domain().has(p + right)) - accu.take(aux(p + right)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(aux(p + right))); + inout(p) = safe_cast(accu.to_result()); } else if (kn::is_1_face_horizontal(p)) { accu.init(); if (aux.domain().has(p + up)) - accu.take(aux(p + up)); + accu.take(safe_cast_to<arg>(aux(p + up))); if (aux.domain().has(p + down)) - accu.take(aux(p + down)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(aux(p + down))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::kn::fill_1_from_aux_2_faces"); 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 097e50f..c38f69f 100644 --- a/milena/mln/world/kn/fill_2_from_1_faces.hh +++ b/milena/mln/world/kn/fill_2_from_1_faces.hh @@ -32,6 +32,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_2_face.hh> +# include <mln/world/kn/safe_cast.hh> namespace mln { @@ -83,8 +84,10 @@ namespace mln mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_2_face(p)) - inout(p) = f(inout(p + up), inout(p + left), - inout(p + right), inout(p + down)); + 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)))); trace::exiting("mln::world::kn::fill_2_from_1_faces"); } @@ -95,25 +98,25 @@ namespace mln { trace::entering("mln::world::kn::fill_2_from_1_faces"); - mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; + mln_precondition(inout.is_valid()); - A accu = A(); + 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(inout(p + up)); + accu.take(safe_cast_to<arg>(inout(p + up))); if (inout.domain().has(p + left)) - accu.take(inout(p + left)); + accu.take(safe_cast_to<arg>(inout(p + left))); if (inout.domain().has(p + right)) - accu.take(inout(p + right)); + accu.take(safe_cast_to<arg>(inout(p + right))); if (inout.domain().has(p + down)) - accu.take(inout(p + down)); - inout(p) = accu.to_result(); + accu.take(safe_cast_to<arg>(inout(p + down))); + inout(p) = safe_cast(accu.to_result()); } trace::exiting("mln::world::kn::fill_2_from_1_faces"); diff --git a/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh b/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh index 6a6e31e..5455a81 100644 --- a/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh +++ b/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh @@ -75,21 +75,20 @@ namespace mln const unsigned inner_border_thickness) { trace::entering("mln::world::kn::internal::fill_primary_2_faces_from_input"); - mlc_equal(mln_site(I), mln_site(J))::check(); - mln_precondition(exact(ima_).is_valid()); - mln_precondition(exact(ima_kn_).is_valid()); - mln_precondition(exact(ima_).domain() <= exact(ima_kn_).domain()); - I& ima_kn = exact(ima_kn_); const J& ima = exact(ima_); + mlc_equal(mln_site(I), mln_site(J))::check(); + mln_precondition(ima.is_valid()); + mln_precondition(ima_kn.is_valid()); + mln_precondition(ima.domain() <= ima_kn.domain()); + // Filling Primary 2-Faces - typedef mln_value(I) V; mln_piter(J) p(ima.domain()); for_all(p) { mln_site(I) pout = internal::immerse_point(p, n, inner_border_thickness); - ima_kn(pout) = safe_cast_to<V>(ima(p)); + ima_kn(pout) = safe_cast(ima(p)); } kn::border::adjust_duplicate_2_faces(ima_kn, 1); diff --git a/milena/mln/world/kn/safe_cast.hh b/milena/mln/world/kn/safe_cast.hh index da60265..9d5202d 100644 --- a/milena/mln/world/kn/safe_cast.hh +++ b/milena/mln/world/kn/safe_cast.hh @@ -46,12 +46,36 @@ namespace mln using namespace mln::value; - /// \brief Safe convertion function for manipulating Kn-immersed + // Forward declaration. + namespace internal { + template <typename Tsrc> struct to_be_casted_t; + } + + /*! + Use cases: + + int i; float j; + + 1. safe_cast(i, j); + 2. j = safe_cast(i); + 3. j = safe_cast_to<float>(i); + */ + + /// \brief Safe conversion function for manipulating Kn-immersed + /// images. + template <typename Tsrc, typename Tdest> + void safe_cast(const Tsrc& src, Tdest& dest); + + /// \brief Safe conversion function for manipulating Kn-immersed + /// images. + template <typename Tsrc> + internal::to_be_casted_t<Tsrc> safe_cast(const Tsrc& src); + + /// \brief Safe conversion function for manipulating Kn-immersed /// images. template <typename Tdest, typename Tsrc> Tdest safe_cast_to(const Tsrc& src); - } // end of namespace mln::world::kn } // end of namespace mln::world @@ -349,11 +373,45 @@ namespace mln namespace kn { + namespace internal + { + + template <typename Tsrc> + struct to_be_casted_t + { + to_be_casted_t(const Tsrc& src) : src(src) {} + Tsrc src; + + template <typename Tdest> + operator Tdest const() + { + Tdest dest; + safe_cast_(src, dest); + return dest; + } + }; + + } // end of namespace mln::world::kn::internal + + + template <typename Tsrc> + internal::to_be_casted_t<Tsrc> safe_cast(const Tsrc& src) + { + internal::to_be_casted_t<Tsrc> tmp(src); + return tmp; + } + + template <typename Tsrc, typename Tdest> + void safe_cast(const Tsrc& src, Tdest& dest) + { + safe_cast_(src, dest); + } + template <typename Tdest, typename Tsrc> Tdest safe_cast_to(const Tsrc& src) { Tdest dest; - safe_cast_(src, dest); + safe_cast(src, dest); return dest; } diff --git a/milena/mln/world/kn/un_immerse.hh b/milena/mln/world/kn/un_immerse.hh index ead7132..0d125e8 100644 --- a/milena/mln/world/kn/un_immerse.hh +++ b/milena/mln/world/kn/un_immerse.hh @@ -92,8 +92,8 @@ namespace mln B domain_K0_from_Kn(const Box& b_, const unsigned n) { - mln_precondition(exact(b_).is_valid()); const B& b = exact(b_); + mln_precondition(b.is_valid()); return B(un_immerse_point(b.pmin(), n), un_immerse_point(b.pmax(), n)); } @@ -109,15 +109,15 @@ namespace mln const V& new_value_type) { trace::entering("mln::world::kn::un_immerse"); - mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); (void) new_value_type; + mln_precondition(ima.is_valid()); mln_ch_value(I,V) output(internal::domain_K0_from_Kn(ima.domain(), n)); mln_piter(I) p(output.domain()); for_all(p) - output(p) = safe_cast_to<V>(ima(internal::immerse_point(p, n))); + output(p) = safe_cast(ima(internal::immerse_point(p, n))); trace::exiting("mln::world::kn::un_immerse"); return output; -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-166-gf550cfa
by git＠lrde.epita.fr 31 Oct '12

31 Oct '12

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 f550cfab304c3851c40b188029790114f74c17de (commit) from 4821f6f79b7795c3e30cf1bf20669d6160bec480 (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 ----------------------------------------------------------------- f550cfa mln/world/kn/display_enlarged.hh: Fix. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ milena/mln/world/kn/display_enlarged.hh | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-166-gf550cfa mln/world/kn/display_enlarged.hh: Fix.
by Guillaume Lazzara 31 Oct '12

31 Oct '12

--- milena/ChangeLog | 4 ++++ milena/mln/world/kn/display_enlarged.hh | 30 ++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 475fb8e..6dedd0d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-10-31 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/world/kn/display_enlarged.hh: Fix. + 2012-10-30 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/world/k1/immerse.hh: Fix call to an overload in kn diff --git a/milena/mln/world/kn/display_enlarged.hh b/milena/mln/world/kn/display_enlarged.hh index 5d1ef50..e1b122a 100644 --- a/milena/mln/world/kn/display_enlarged.hh +++ b/milena/mln/world/kn/display_enlarged.hh @@ -93,16 +93,18 @@ namespace mln mln_assertion(zoom_ % 2); const I& ima_kn = exact(ima_kn_); - int shift = zoom_ - 1; + int + shift = zoom_ + 1, + mult = shift / 2; // No zoom: return original image. if (zoom_ == 1) - return ima_kn; + return duplicate(ima_kn); - mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * shift, - ima_kn.domain().pmin().col() * shift, - ima_kn.domain().pmax().row() * shift, - ima_kn.domain().pmax().col() * shift)); + mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * mult, + ima_kn.domain().pmin().col() * mult, + ima_kn.domain().pmax().row() * mult, + ima_kn.domain().pmax().col() * mult)); const mln::def::coord min_row = geom::min_row(ima_kn), @@ -116,23 +118,23 @@ namespace mln { if (kn::is_0_face(row, col)) { - output.at_(row * shift, col * shift) = ima_kn.at_(row, col); + output.at_(row * mult, col * mult) = ima_kn.at_(row, col); } else if (kn::is_1_face_vertical(row, col)) { - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + j, col * shift) = ima_kn.at_(row, col); + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult + j, col * mult) = ima_kn.at_(row, col); } else if (kn::is_1_face_horizontal(row, col)) { - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift, col * shift + j) = ima_kn.at_(row, col); + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult, col * mult + j) = ima_kn.at_(row, col); } else if (kn::is_2_face(row, col)) { - for (mln::def::coord i = -(shift - 1); i < (shift + 3); ++i) - for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + i, col * shift + j) = ima_kn.at_(row, col); + for (mln::def::coord i = -(mult - 1); i <= (mult - 1); ++i) + for (mln::def::coord j = -(mult - 1); j <= (mult - 1); ++j) + output.at_(row * mult + i, col * mult + j) = ima_kn.at_(row, col); } } } -- 1.7.2.5

1 0

olena-2.0-28-geeecbfb fix reading and writing the same image using neighbours
by Coddy Levi 30 Oct '12

30 Oct '12

--- milena/mln/inpainting/lpde.hh | 67 +++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 26 deletions(-) diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh index 04a903a..44d036e 100644 --- a/milena/mln/inpainting/lpde.hh +++ b/milena/mln/inpainting/lpde.hh @@ -94,8 +94,9 @@ namespace mln } template <typename I, typename M> - float diffuse(I& u, - const I& f, + float diffuse(const I& u, + I& u_next, + //const I& f, const std::vector<float>& w, const M& mask) { @@ -105,7 +106,7 @@ namespace mln const unsigned derivative_kernels_size = 5; const float* derivative_kernel[derivative_kernels_size]; - + derivative_kernel[0] = make_dx_kernel(); derivative_kernel[1] = make_dy_kernel(); derivative_kernel[2] = make_dxx_kernel(); @@ -119,25 +120,26 @@ namespace mln convert::from_to(vals, full3x3); - mln_pixter(I) p(u); + mln_pixter(const I) p(u); + mln_pixter(I) p_next(u_next); //mln_pixter(const I) p_f(f); mln_pixter(const M) p_m(mask); - mln_qixter(const I, window2d) q(p, full3x3); + mln_qixter(const I, const window2d) q(p, full3x3); float sse = 0; - + unsigned car = 0; - for_all_2 (p, p_m) - { - //if (p_m.val()) + for_all_3 (p, p_next, p_m) + { + //if (p_m.val()) { - T old = p.val(); + const T old = p.val(); if (fabs(w[1]) > activation_threshold) - p.val() *= w[1]; + p_next.val() = p.val() * w[1]; // if (fabs(w[0]) > activation_threshold) - // p.val() += w[0] * p_f.val(); + // p_next.val() += w[0] * p_f.val(); T p_derivative[derivative_kernels_size]; @@ -168,25 +170,25 @@ namespace mln //||∇u||^2 if (fabs(w[2]) > activation_threshold) - p.val() += w[2] * (p_x2 + p_y2); + p_next.val() += w[2] * (p_x2 + p_y2); // laplacian if (fabs(w[3]) > activation_threshold) - p.val() += w[3] * (p_xx + p_yy); + p_next.val() += w[3] * (p_xx + p_yy); // tr(H^2(u)) if (fabs(w[4]) > activation_threshold) - p.val() += w[4] * (p_xx2 + 2 * p_xy2 + p_yy2); + p_next.val() += w[4] * (p_xx2 + 2 * p_xy2 + p_yy2); // (∇u)^T H_u (∇u) if (fabs(w[5]) > activation_threshold) - p.val() += w[5] * (components_product(p_x2, p_xx) - + 2 * components_product(components_product(p_x, p_y), p_xy) - + components_product(p_y2, p_yy)); + p_next.val() += w[5] * (components_product(p_x2, p_xx) + + 2 * components_product(components_product(p_x, p_y), p_xy) + + components_product(p_y2, p_yy)); - sse += norm::l2(old - p.val()); + sse += norm::l2(old - p_next.val()); } - } + } return sse; } @@ -195,18 +197,31 @@ namespace mln void lpde::operator()(I<T>& src, I<bool>& mask) { - extension::adjust_duplicate(src, 1); + //const I<T> f(src); + + I<T>& u_ = src; + I<T> u_next_(src); + + extension::adjust_duplicate(u_, 1); + extension::adjust_duplicate(u_next_, 1); - const I<T> f(src); + I<T>* u = &u_; + I<T>* u_next = &u_next_; - I<T>& u = src; + float sse = std::numeric_limits<float>::max() / 2.0; - float sse = std::numeric_limits<float>::max(); + float sse_old = std::numeric_limits<float>::max(); float t = 0; - while (t < this->t_f && sse > 0.01 && !std::isnan(sse)) + while (t < this->t_f && sse < sse_old && !std::isnan(sse)) { - sse = diffuse(u, f, w, mask); + sse_old = sse; + + sse = diffuse(*u, *u_next, /* f, */ w, mask); + + I<T>* swap = u; + u = u_next; + u_next = swap; std::cout << "sse = " << sse << std::endl; -- 1.7.2.5

1 0

olena-2.0-27-g925e576 More efficient lpde inpainting method implementation
by Coddy Levi 30 Oct '12

30 Oct '12

--- milena/mln/inpainting/inpaint.hh | 11 ++- milena/mln/inpainting/lpde.hh | 201 +++++++++++++++++++++++---------- milena/mln/inpainting/metric/psnr.hh | 12 ++- 3 files changed, 158 insertions(+), 66 deletions(-) diff --git a/milena/mln/inpainting/inpaint.hh b/milena/mln/inpainting/inpaint.hh index 44f20a8..86398e5 100644 --- a/milena/mln/inpainting/inpaint.hh +++ b/milena/mln/inpainting/inpaint.hh @@ -15,6 +15,8 @@ #include <mln/util/timer.hh> +#include <mln/inpainting/metric/psnr.hh> + namespace mln { namespace inpainting @@ -73,13 +75,20 @@ namespace mln I<bool> new_mask(roi); data::paste(inpaint_mask | roi, new_mask); + data::fill((new_src | pw::value(new_mask)).rw(), literal::zero); + mln::util::timer t; t.start(); inpaint_method(new_src, new_mask); t.stop(); - std::cout << "inpaint time = " << t << std::endl; + + double psnr = metric::psnr(inpaint_src | pw::value(inpaint_mask), + new_src | pw::value(new_mask)); + + std::cout << "inpaint time = " << t << "; " + << "psnr = " << psnr << std::endl; I<T> output(inpaint_src); { // paste new_src to output diff --git a/milena/mln/inpainting/lpde.hh b/milena/mln/inpainting/lpde.hh index 1f754d8..04a903a 100644 --- a/milena/mln/inpainting/lpde.hh +++ b/milena/mln/inpainting/lpde.hh @@ -1,5 +1,6 @@ #include <algorithm> #include <vector> +#include <limits> #include <mln/core/image/dmorph/image_if.hh> @@ -11,6 +12,8 @@ #include <mln/linear/gaussian.hh> #include <mln/core/alias/w_window2d_float.hh> +#include <mln/core/alias/neighb2d.hh> + #include <mln/pw/value.hh> #include <mln/value/int_u.hh> @@ -20,6 +23,17 @@ #include <mln/core/alias/vec2d.hh> +#include <mln/inpainting/derivative_kernels.hh> + +#include <mln/core/concept/accumulator.hh> + +#include <mln/trait/value_.hh> + +#include <mln/extension/adjust_duplicate.hh> + +#include <mln/norm/l2.hh> +#include <mln/value/int_u8.hh> + namespace mln { namespace inpainting @@ -49,92 +63,157 @@ namespace mln this->t_f = t_f; } - template <typename I> - void compute_diff_invariants(const I& u, - std::vector& invs, - const std::vector<float>& w) + template <typename T> + inline + T components_product(trait::value::nature::scalar, + T a, + T b) { - const float sigma = 0.8; + return a * b; + } + + template <typename T> + T components_product(trait::value::nature::vectorial, + T a, + T b) + { + T c; + // static loop unrolling ? + for (unsigned i = 0; i < mln_dim(T); ++i) + c[i] = a[i] * b[i]; + + return c; + } + + template <typename T> + inline + T components_product(T a, + T b) + { + return components_product(mln_trait_value_nature(T)(), a, b); + } + + template <typename I, typename M> + float diffuse(I& u, + const I& f, + const std::vector<float>& w, + const M& mask) + { + typedef mln_value(I) T; + + const float activation_threshold = 0.001; + + const unsigned derivative_kernels_size = 5; + const float* 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(); - 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); + static window2d full3x3; + static const bool vals[] = { 1, 1, 1, + 1, 1, 1, + 1, 1, 1 }; - { // TV regularization term div ( \nabla u / | \nabla u | ) + convert::from_to(vals, full3x3); - I u_xnx( invs[5].domain() ); - I u_yny( invs[5].domain() ); + mln_pixter(I) p(u); + //mln_pixter(const I) p_f(f); + mln_pixter(const M) p_m(mask); + mln_qixter(const I, window2d) q(p, full3x3); - { - mln_piter(I) p( invs[5].domain() ); + float sse = 0; - for_all(p) + unsigned car = 0; + for_all_2 (p, p_m) + { + //if (p_m.val()) { - 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); - } + T old = p.val(); - u_xnx(p)[i] = invs[0](p)[i] / norm; - u_yny(p)[i] = invs[1](p)[i] / norm; - } - } - } + if (fabs(w[1]) > activation_threshold) + p.val() *= w[1]; - u_xnx = linear::gaussian_1st_derivative(u_xnx, sigma, 1); - u_yny = linear::gaussian_1st_derivative(u_yny, sigma, 0); + // if (fabs(w[0]) > activation_threshold) + // p.val() += w[0] * p_f.val(); - mln_piter(I) p( invs[5].domain() ); - for_all(p) - { - invs[5](p) = u_xnx(p) + u_yny(p); - } + T p_derivative[derivative_kernels_size]; + + for (unsigned i = 0; i < derivative_kernels_size; ++i) + p_derivative[i] = literal::zero; + + unsigned k = 0; + for_all (q) + { + for (unsigned i = 0; i < derivative_kernels_size; ++i) + { + p_derivative[i] += q.val() * derivative_kernel[i][k]; + } + ++k; + } + + const T& p_x = p_derivative[0]; + const T& p_y = p_derivative[1]; + const T& p_xx = p_derivative[2]; + const T& p_yy = p_derivative[3]; + const T& p_xy = p_derivative[4]; + + const T p_x2 = components_product(p_x, p_x); + const T p_y2 = components_product(p_y, p_y); + const T p_xx2 = components_product(p_xx, p_xx); + const T p_yy2 = components_product(p_yy, p_yy); + const T p_xy2 = components_product(p_xy, p_xy); + + //||∇u||^2 + if (fabs(w[2]) > activation_threshold) + p.val() += w[2] * (p_x2 + p_y2); + + // laplacian + if (fabs(w[3]) > activation_threshold) + p.val() += w[3] * (p_xx + p_yy); + + // tr(H^2(u)) + if (fabs(w[4]) > activation_threshold) + p.val() += w[4] * (p_xx2 + 2 * p_xy2 + p_yy2); + + // (∇u)^T H_u (∇u) + if (fabs(w[5]) > activation_threshold) + p.val() += w[5] * (components_product(p_x2, p_xx) + + 2 * components_product(components_product(p_x, p_y), p_xy) + + components_product(p_y2, p_yy)); + + sse += norm::l2(old - p.val()); + } } + + return sse; } template <template <typename> class I, typename T> void lpde::operator()(I<T>& src, I<bool>& mask) { + extension::adjust_duplicate(src, 1); - data::fill((src | pw::value(mask)).rw(), literal::zero); + const I<T> f(src); - std::vector<I<T> > invs(w.size(), src.domain()); + I<T>& u = src; - I<T>& u_t = src; + float sse = std::numeric_limits<float>::max(); - float r = this->dt / (this->dx * this->dx); - - for (float t = 0; t < this->t_f; t += dt) + float t = 0; + while (t < this->t_f && sse > 0.01 && !std::isnan(sse)) { - compute_diff_invariants(u_t, invs, this->w); + sse = diffuse(u, f, w, mask); - mln_piter(I<T>) p(u_t.domain()); + std::cout << "sse = " << sse << std::endl; - 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; - } - } + t += this->dt; } + + std::cout << "Number of iterations: " << t << std::endl; } void lpde::set(const std::vector<float>& w) diff --git a/milena/mln/inpainting/metric/psnr.hh b/milena/mln/inpainting/metric/psnr.hh index 4998b4a..5dd8fdd 100644 --- a/milena/mln/inpainting/metric/psnr.hh +++ b/milena/mln/inpainting/metric/psnr.hh @@ -14,12 +14,12 @@ namespace mln { namespace metric { - template <typename I> + template <typename I, typename I2> double psnr(const Image& original_, - const Image& altered_) + const Image<I2>& altered_) { const I& original = exact(original_); - const I& altered = exact(altered_); + const I2& altered = exact(altered_); mln_piter(I) p( altered.domain() ); @@ -27,6 +27,8 @@ namespace mln const unsigned dim = mln_dim(mln_value(I)); + unsigned nelements = 0; + for_all(p) { const mln_sum(mln_value(I)) diff = original(p) - altered(p); @@ -36,9 +38,11 @@ namespace mln else for (unsigned i = 0; i < dim; ++i) mse += diff[i] * diff[i]; + + ++nelements; } - mse /= ( altered.ncols() * altered.nrows() * dim); + mse /= ( nelements * dim); const unsigned max = pow(2, mln_nbits(mln_value(I)) / dim) - 1; -- 1.7.2.5

1 0