- Olena-patches

olena-2.0-102-ga42ca7e Improve accu::median_interval.
by Guillaume Lazzara 05 Oct '12

05 Oct '12

* mln/accu/stat/median_interval.hh: Improve it. * tests/accu/stat/median_interval.cc: Add more tests. --- milena/ChangeLog | 8 + milena/mln/accu/stat/median_interval.hh | 162 ++++++++++++++++------- milena/tests/accu/stat/median_interval.cc | 210 +++++++++++++++++++++++++++- 3 files changed, 326 insertions(+), 54 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1173826..04fb5c5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2012-10-05 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve accu::median_interval. + + * mln/accu/stat/median_interval.hh: Improve it. + + * tests/accu/stat/median_interval.cc: Add more tests. + +2012-10-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/value/intsub.hh: Add more constructors. 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/accu/stat/median_interval.hh b/milena/mln/accu/stat/median_interval.hh index a042bfa..ff54710 100644 --- a/milena/mln/accu/stat/median_interval.hh +++ b/milena/mln/accu/stat/median_interval.hh @@ -35,7 +35,10 @@ # include <mln/value/interval.hh> # include <mln/value/intsub.hh> # include <mln/util/array.hh> - +# include <mln/value/dec.hh> +# include <mln/value/inc.hh> +# include <mln/value/prev.hh> +# include <mln/value/succ.hh> namespace mln { @@ -54,12 +57,13 @@ namespace mln // template <unsigned n> struct median_interval - : public mln::accu::internal::base< const value::intsub<n>&, median_interval<n> > + : public mln::accu::internal::base< const value::intsub<2*n>&, median_interval<n> > { typedef value::intsub<n> argument; + typedef value::intsub<1> index_t; - median_interval(const value::interval<value::intsub<n> >& inter); - median_interval(const value::intsub<n>& first, const value::intsub<n>& last); + median_interval(const value::interval<argument>& inter); + median_interval(const argument& first, const argument& last); /// Manipulators. /// \{ @@ -70,7 +74,7 @@ namespace mln /// \} /// Get the value of the accumulator. - const value::intsub<n>& to_result() const; + const value::intsub<2*n>& to_result() const; /// Check whether this accu is able to return a result. /// Always true here. @@ -83,19 +87,23 @@ namespace mln mutable unsigned sum_minus_, sum_plus_; - mutable bool valid_; + mutable bool result_ready; + + /// the median value + mutable value::intsub<2*n> t_; - /// the median index - mutable unsigned i_; - /// the median argument - mutable value::intsub<n> t_; + /// The median index. + mutable index_t n_; - value::interval<value::intsub<n> > inter_; + value::interval<argument > inter_; // Auxiliary methods void go_minus_() const; void go_plus_() const; void update_() const; + + index_t find_n1_() const; + }; } // end of mln::accu::stat @@ -107,14 +115,14 @@ namespace mln { template <unsigned n> - median_interval<n>::median_interval(const value::interval<value::intsub<n> >& inter) + median_interval<n>::median_interval(const value::interval<argument >& inter) : inter_(inter) { init(); } template <unsigned n> - median_interval<n>::median_interval(const value::intsub<n>& first, const value::intsub<n>& last) + median_interval<n>::median_interval(const argument& first, const argument& last) : inter_(first, last) { init(); @@ -132,13 +140,13 @@ namespace mln ++h_[index]; ++sum_; - if (index < i_) + if (index < n_) ++sum_minus_; - else if (index > i_) + else if (index > n_) ++sum_plus_; - if (valid_) - valid_ = false; + if (result_ready) + result_ready = false; } template <unsigned n> @@ -146,22 +154,23 @@ namespace mln void median_interval<n>::take(const median_interval<n>& other) { + mln_precondition(inter_ == other.inter_); + for (unsigned i = 0; i < h_.size(); ++i) h_[i] += other.h_[i]; // sum_minus_ - for (unsigned i = 0; i < i_; ++i) + for (unsigned i = 0; i < n_; ++i) sum_minus_ += other.h_[i]; // sum_plus_ - for (unsigned i = i_ + 1; i < h_.nelements(); ++i) + for (unsigned i = n_ + 1; i < h_.nelements(); ++i) sum_plus_ += other.h_[i]; - if (valid_) - valid_ = false; + if (result_ready) + result_ready = false; } - template <unsigned n> void median_interval<n>::untake(const argument& t) @@ -175,13 +184,13 @@ namespace mln --h_[index]; --sum_; - if (index < i_) + if (index < n_) --sum_minus_; - else if (index > i_) + else if (index > n_) --sum_plus_; - if (valid_) - valid_ = false; + if (result_ready) + result_ready = false; } template <unsigned n> @@ -191,15 +200,19 @@ namespace mln h_.resize(inter_.nvalues(), 0); sum_minus_ = 0; sum_plus_ = 0; - i_ = inter_.nvalues() / 2; - t_ = inter_.ith_element(i_); + sum_ = 0; + n_ = int(inter_.nvalues() / 2); + t_ = inter_.ith_element(n_); + result_ready = true; } template <unsigned n> - const value::intsub<n>& + const value::intsub<2*n>& median_interval<n>::to_result() const { - if (! valid_) + mln_precondition(is_valid()); + + if (! result_ready) update_(); return t_; } @@ -208,7 +221,7 @@ namespace mln bool median_interval<n>::is_valid() const { - return true; + return sum_ > 1; } template <unsigned n> @@ -216,9 +229,9 @@ namespace mln void median_interval<n>::update_() const { - valid_ = true; + result_ready = true; - if (sum_ == 0) + if (sum_ < 1) return; if (2 * sum_minus_ > sum_) @@ -227,7 +240,7 @@ namespace mln if (2 * sum_plus_ > sum_) go_plus_(); else - if (h_[i_] == 0) + if (h_[n_] == 0) { // go to the heaviest side if (sum_plus_ > sum_minus_) @@ -237,23 +250,44 @@ namespace mln } } - template <unsigned n> void median_interval<n>::go_minus_() const { do { - sum_plus_ += h_[i_]; + sum_plus_ += h_[n_]; do - --i_; - while (h_[i_] == 0); - sum_minus_ -= h_[i_]; + dec(n_); + while (h_[n_] == 0); + sum_minus_ -= h_[n_]; } while (2 * sum_minus_ > sum_); - t_ = inter_.ith_element(i_); - } + // The number of values is odd, the current index corresponds + // to the exact median. + // OR + // We need to take the mean of the (n/2)-th and (n/2+1)-th value, so + // if this is the same value, we just return it. + if (sum_ % 2 || (sum_minus_ + h_[n_] > sum_ / 2)) + { + t_ = inter_.ith_element(n_); + return; + } + + // The number of values is even, we need to effectively take + // the mean of the (n/2)-th and (n/2+1)-th values which are + // different. + index_t n1 = find_n1_(); + if (n1 == h_.nelements()) + n1 = n_; + + value::intsub<2> index = mean(n_, n1); + + t_ = inter_.ith_element(index) + + (index.is_integer() ? literal::zero + : value::iota<value::intsub<2*n> >::value()); + } template <unsigned n> void @@ -261,17 +295,53 @@ namespace mln { do { - sum_minus_ += h_[i_]; + sum_minus_ += h_[n_]; do - ++i_; - while (h_[i_] == 0); - sum_plus_ -= h_[i_]; + inc(n_); + while (h_[n_] == 0); + sum_plus_ -= h_[n_]; } while (2 * sum_plus_ > sum_); - t_ = inter_.ith_element(i_); + + + // The number of values is odd, the current index corresponds + // to the exact median. + // OR + // We need to take the mean of the (n/2)-th and (n/2+1)-th value, so + // if this is the same value, we just return it. + if (sum_ % 2 || (sum_minus_ + h_[n_] > sum_ / 2)) + { + t_ = inter_.ith_element(n_); + return; + } + + // The number of values is even, we need to effectively take + // the mean of the (n/2)-th and (n/2+1)-th values which are + // different. + index_t n1 = find_n1_(); + if (n1 == -1) + n1 = n_; + + value::intsub<2> index = mean(n_, n1); + + t_ = inter_.ith_element(index) + + (index.is_integer() ? literal::zero + : value::iota<value::intsub<2*n> >::value()); } template <unsigned n> + typename median_interval<n>::index_t + median_interval<n>::find_n1_() const + { + index_t id = value::succ(n_); + while (id < h_.nelements() && h_[id] == 0) + inc(id); + + return id; + } + + + template <unsigned n> std::ostream& operator<<(std::ostream& ostr, const median_interval<n>& m) { return ostr << m.to_result(); diff --git a/milena/tests/accu/stat/median_interval.cc b/milena/tests/accu/stat/median_interval.cc index a0c05a9..6a5fd95 100644 --- a/milena/tests/accu/stat/median_interval.cc +++ b/milena/tests/accu/stat/median_interval.cc @@ -30,21 +30,215 @@ int main() { using namespace mln; + // Empty { - accu::stat::median_interval<2> med(2, 5); + // FIXME: How should it behave ? + accu::stat::median_interval<1> med(1, 4); + mln_assertion(!med.is_valid()); + } + + // Single value + { + // FIXME: How should it behave ? + accu::stat::median_interval<1> med(1, 4); + med.take(1); + mln_assertion(!med.is_valid()); + } + + // Same value several times (odd count) + { + accu::stat::median_interval<1> med(1, 4); + med.take(1); + med.take(1); + med.take(1); + mln_assertion(med.to_result() == 1); + } + + // Same value several times (even count) + { + accu::stat::median_interval<1> med(1, 4); + med.take(1); + med.take(1); + med.take(1); + med.take(1); + mln_assertion(med.to_result() == 1); + } + + // Same value several times + one different higher value. + { + accu::stat::median_interval<1> med(0, 4); + med.take(0); + med.take(1); + med.take(1); + med.take(2); + mln_assertion(med.to_result() == 1); + } + + // Various values + { + accu::stat::median_interval<1> med(0, 4); + med.take(0); + med.take(1); + med.take(1); + med.take(3); + med.take(3); + med.take(4); + mln_assertion(med.to_result() == 2); + } + + + // Various values + { + accu::stat::median_interval<1> med(0, 4); + med.take(0); + med.take(1); + med.take(1); med.take(2); med.take(2); - med.take(2.5); - med.take(2.5); - med.take(4.5); - med.take(4.5); + med.take(3); + med.take(3); + med.take(4); + mln_assertion(med.to_result() == 2); + } + + // Same value several times + one different higher value. + { + accu::stat::median_interval<1> med(1, 4); + med.take(1); + med.take(1); + med.take(1); + med.take(2); + mln_assertion(med.to_result() == 1); + } + + // Same value several times + one different lower value. + { + accu::stat::median_interval<1> med(1, 4); + med.take(1); + med.take(2); + med.take(2); + med.take(2); + mln_assertion(med.to_result() == 2); + } + + // Same value several times + one different higher value with + // subdivided interval. + { + accu::stat::median_interval<2> med(1, 4); + med.take(1); + med.take(1); + med.take(1); + med.take(2); + mln_assertion(med.to_result() == 1); + } + + // Same value several times + one different lower value with + // subdivided interval. + { + accu::stat::median_interval<2> med(1, 4); + med.take(1); + med.take(2); + med.take(2); + med.take(2); + mln_assertion(med.to_result() == 2); + } + + // Odd number of values + { + accu::stat::median_interval<1> med(1, 8); + med.take(1); + med.take(5); + med.take(2); + med.take(8); + med.take(7); + mln_assertion(med.to_result() == 5); + } + + // Even number of values + { + accu::stat::median_interval<1> med(1, 8); + med.take(1); + med.take(6); + med.take(2); + med.take(8); + med.take(7); + med.take(2); + mln_assertion(med.to_result() == 4); + } + + // Based on a subdivided interval + { + accu::stat::median_interval<2> med(3.5, 6.5); + med.take(4.5); + med.take(6); med.take(4.5); + med.take(6); + + mln_assertion(med.to_result() == 5.25); + } + + // Using 0 as value. + { + accu::stat::median_interval<2> med(0, 4); + + med.take(0); + med.take(1); + med.take(2); + med.take(3); + med.take(4); + + mln_assertion(med.to_result() == 2); + } + + // Using 0 as value. + { + accu::stat::median_interval<2> med(0, 5); + + med.take(0); + med.take(1); + med.take(2); + med.take(3); + med.take(4); med.take(5); - med.take(5); - med.take(5); - mln_assertion(med.to_result() == 4.5); + mln_assertion(med.to_result() == 2.5); + } + + // Integer Interval with negative values. + { + accu::stat::median_interval<1> med(-2, 3); + + med.take(-1); + med.take(-2); + med.take(2); + med.take(3); + + mln_assertion(med.to_result() == 0.5); + } + + // Subdivided Interval with negative values. + { + accu::stat::median_interval<2> med(-2, 3); + + med.take(-1); + med.take(-2); + med.take(2); + med.take(3); + + mln_assertion(med.to_result() == 0.5); } + + // Subdivided Interval with negative values. + { + accu::stat::median_interval<1> med(-2, 3); + + med.take(-1); + med.take(-2); + med.take(2); + med.take(3); + mln_assertion(med.to_result() == 0.5); + } + } -- 1.7.2.5

1 0

olena-2.0-42-gbe35e39 mln/value/intsub.hh: Add more constructors.
by Guillaume Lazzara 05 Oct '12

05 Oct '12

--- milena/ChangeLog | 4 ++++ milena/mln/value/intsub.hh | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 529f1b6..9289d5b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-10-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/intsub.hh: Add more constructors. + 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/value/concept/interval.hh: New. Add value::Interval concept. diff --git a/milena/mln/value/intsub.hh b/milena/mln/value/intsub.hh index 897215c..65bef77 100644 --- a/milena/mln/value/intsub.hh +++ b/milena/mln/value/intsub.hh @@ -115,12 +115,17 @@ namespace mln public: intsub(); intsub(const intsub<n>& rhs); + template <unsigned m> + intsub(const intsub<m>& rhs); /// Construct an intsub with value : \p int_part + 1 / \p denominator. intsub(int int_part, unsigned denominator); + intsub(const literal::zero_t&); intsub(int i); intsub(float i); intsub(double i); + template <unsigned m> + intsub<n>& operator=(const intsub<m>& rhs); intsub<n>& operator=(const intsub<n>& rhs); intsub<n>& operator=(int i); intsub<n>& operator=(float i); @@ -246,7 +251,7 @@ namespace mln mult_is_integer(float f, int v) { float a = f * v; - float b = float(unsigned(a)); + float b = float(int(a)); const float epsilon = 0.00001f; if (a > b) @@ -270,6 +275,21 @@ namespace mln } template <unsigned n> + template <unsigned m> + intsub<n>::intsub(const intsub<m>& rhs) + { + mln_precondition(m < n); + this->v_ = rhs.to_enc() * (n / m); + } + + + template <unsigned n> + intsub<n>::intsub(const literal::zero_t&) + { + this->v_ = 0; + } + + template <unsigned n> intsub<n>::intsub(int i) { this->v_ = n * i; @@ -307,6 +327,16 @@ namespace mln } template <unsigned n> + template <unsigned m> + intsub<n>& + intsub<n>::operator=(const intsub<m>& rhs) + { + mln_precondition(m < n); + this->v_ = rhs.to_enc() * (n / m); + return *this; + } + + template <unsigned n> intsub<n>& intsub<n>::operator=(int i) { -- 1.7.2.5

1 0

olena-2.0-101-g3d34eb0 mln/value/intsub.hh: Add more constructors.
by Guillaume Lazzara 05 Oct '12

05 Oct '12

--- milena/ChangeLog | 4 ++++ milena/mln/value/intsub.hh | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6a14cc2..1173826 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-10-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/intsub.hh: Add more constructors. + 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/value/concept/interval.hh: New. Add value::Interval concept. diff --git a/milena/mln/value/intsub.hh b/milena/mln/value/intsub.hh index 897215c..65bef77 100644 --- a/milena/mln/value/intsub.hh +++ b/milena/mln/value/intsub.hh @@ -115,12 +115,17 @@ namespace mln public: intsub(); intsub(const intsub<n>& rhs); + template <unsigned m> + intsub(const intsub<m>& rhs); /// Construct an intsub with value : \p int_part + 1 / \p denominator. intsub(int int_part, unsigned denominator); + intsub(const literal::zero_t&); intsub(int i); intsub(float i); intsub(double i); + template <unsigned m> + intsub<n>& operator=(const intsub<m>& rhs); intsub<n>& operator=(const intsub<n>& rhs); intsub<n>& operator=(int i); intsub<n>& operator=(float i); @@ -246,7 +251,7 @@ namespace mln mult_is_integer(float f, int v) { float a = f * v; - float b = float(unsigned(a)); + float b = float(int(a)); const float epsilon = 0.00001f; if (a > b) @@ -270,6 +275,21 @@ namespace mln } template <unsigned n> + template <unsigned m> + intsub<n>::intsub(const intsub<m>& rhs) + { + mln_precondition(m < n); + this->v_ = rhs.to_enc() * (n / m); + } + + + template <unsigned n> + intsub<n>::intsub(const literal::zero_t&) + { + this->v_ = 0; + } + + template <unsigned n> intsub<n>::intsub(int i) { this->v_ = n * i; @@ -307,6 +327,16 @@ namespace mln } template <unsigned n> + template <unsigned m> + intsub<n>& + intsub<n>::operator=(const intsub<m>& rhs) + { + mln_precondition(m < n); + this->v_ = rhs.to_enc() * (n / m); + return *this; + } + + template <unsigned n> intsub<n>& intsub<n>::operator=(int i) { -- 1.7.2.5

1 0

branch exp/achard created: olena-2.0-33-g3b2ec6a
by git＠lrde.epita.fr 05 Oct '12

05 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/achard has been created at 3b2ec6a6422c7e5d12f1773c5227d2d148c80b76 (commit) - Log ----------------------------------------------------------------- 3b2ec6a Add test for Achard corner detection. 6f331a1 Add Achard corner detection. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-33-g3b2ec6a Add test for Achard corner detection.
by Jonathan Fabrizio 05 Oct '12

05 Oct '12

* tests/detection/corner/Makefile.am (check_PROGRAMS): Add achard. (achard_SOURCES): add achard. (MOSTLYCLEANFILES): add achard-result * tests/detection/corner/achard.cc: New. --- milena/ChangeLog | 9 +++++++++ milena/tests/detection/corner/Makefile.am | 7 +++++-- .../detection/corner/{moravec.cc => achard.cc} | 13 ++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) copy milena/tests/detection/corner/{moravec.cc => achard.cc} (88%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 22afbd2..3944be1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-05 Jonathan Fabrizio <jonathan(a)lrde.epita.fr> + Add test for Achard corner detection. + + * tests/detection/corner/Makefile.am (check_PROGRAMS): Add achard. + (achard_SOURCES): add achard. + (MOSTLYCLEANFILES): add achard-result + * tests/detection/corner/achard.cc: New. + +2012-10-05 Jonathan Fabrizio <jonathan(a)lrde.epita.fr> + Add Achard corner detection. * mln/detection/corner/achard.hh: New. diff --git a/milena/tests/detection/corner/Makefile.am b/milena/tests/detection/corner/Makefile.am index eb70108..3e4561e 100644 --- a/milena/tests/detection/corner/Makefile.am +++ b/milena/tests/detection/corner/Makefile.am @@ -18,13 +18,16 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ moravec \ -harris +harris \ +achard moravec_SOURCES = moravec.cc harris_SOURCES = harris.cc +achard_SOURCES = achard.cc TESTS = $(check_PROGRAMS) MOSTLYCLEANFILES = \ moravec-result.ppm \ -harris-result.ppm +harris-result.ppm \ +achard-result.ppm diff --git a/milena/tests/detection/corner/moravec.cc b/milena/tests/detection/corner/achard.cc similarity index 88% copy from milena/tests/detection/corner/moravec.cc copy to milena/tests/detection/corner/achard.cc index 850d2a0..5c2af68 100644 --- a/milena/tests/detection/corner/moravec.cc +++ b/milena/tests/detection/corner/achard.cc @@ -23,7 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/detection/corner/moravec.hh> +#include <mln/detection/corner/achard.hh> #include <mln/value/rgb8.hh> #include <mln/value/int_u8.hh> #include <mln/io/essential.hh> @@ -44,12 +44,15 @@ int main() p_array<point2d> corners; io::pgm::load(input, MLN_TESTS_IMG_DIR "/test_corner_detection.pgm"); - corners = mln::detection::corner::moravec(input); + corners = mln::detection::corner::achard(input); output = mln::data::convert(value::rgb8(), input); - mln_assertion(corners.nsites() == 1); - mln_assertion(corners[0] == point2d(39,64)); data::fill( (output | corners).rw(), literal::red); - io::ppm::save(output, "moravec-result.ppm"); + io::ppm::save(output, "achard-result.ppm"); + + { + mln_assertion(corners.nsites() == 1); + mln_assertion(corners[0] == point2d(40,65)); + } } -- 1.7.2.5

1 0

olena-2.0-32-g6f331a1 Add Achard corner detection.
by Jonathan Fabrizio 05 Oct '12

05 Oct '12

* mln/detection/corner/achard.hh: New. * mln/detection/corner/achard_criterion.hh: New. --- milena/ChangeLog | 7 ++ .../mln/detection/corner/{harris.hh => achard.hh} | 76 +++++--------------- .../{harris_criterion.hh => achard_criterion.hh} | 72 ++++++++++--------- 3 files changed, 63 insertions(+), 92 deletions(-) copy milena/mln/detection/corner/{harris.hh => achard.hh} (58%) copy milena/mln/detection/corner/{harris_criterion.hh => achard_criterion.hh} (58%) diff --git a/milena/ChangeLog b/milena/ChangeLog index b88c960..22afbd2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2012-10-05 Jonathan Fabrizio <jonathan(a)lrde.epita.fr> + + Add Achard corner detection. + + * mln/detection/corner/achard.hh: New. + * mln/detection/corner/achard_criterion.hh: New. + 2012-10-04 Jonathan Fabrizio <jonathan(a)lrde.epita.fr> Add test for Harris corner detection. diff --git a/milena/mln/detection/corner/harris.hh b/milena/mln/detection/corner/achard.hh similarity index 58% copy from milena/mln/detection/corner/harris.hh copy to milena/mln/detection/corner/achard.hh index 0acce69..1197ae0 100644 --- a/milena/mln/detection/corner/harris.hh +++ b/milena/mln/detection/corner/achard.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DETECTION_CORNER_HARRIS_HH -# define MLN_DETECTION_CORNER_HARRIS_HH +#ifndef MLN_DETECTION_CORNER_ACHARD_HH +# define MLN_DETECTION_CORNER_ACHARD_HH #include <mln/core/site_set/p_array.hh> //#include <mln/win/rectangle2d.hh> @@ -36,11 +36,11 @@ #include <mln/core/alias/w_window2d_int.hh> //#include <mln/core/alias/window2d.hh> -#include <mln/detection/corner/harris_criterion.hh> +#include <mln/detection/corner/achard_criterion.hh> /// \file /// -/// \brief Implementation of Harris corner detection. +/// \brief Implementation of Achard corner detection. namespace mln @@ -50,47 +50,16 @@ namespace mln namespace corner { /** - Computes Harris corner detection on \p in_image + Computes Achard corner detection on \p in_image \param image_in_ The input image - \param k the k parameter in Harris algorithm - \param sigma the standard deviation of the gaussian used in - Harris algorithm \return The list of points detected as corner \author J. Fabrizio */ template<typename I> p_array<mln_site(I)> - harris(const Image& in_image_, float k, float sigma); - - /** - Computes Harris corner detection on \p in_image with the - standard deviation of the guassian sets to 0.34 - - \param image_in_ The input image - \param k the k parameter in Harris algorithm - \return The list of points detected as corner - - \author J. Fabrizio - */ - template<typename I> - p_array<mln_site(I)> - harris(const Image& in_image_, float k); - - /** - Computes Harris corner detection on \p in_image with the k - parameter sets to 0.04 and the standard deviation of the - guassian sets to 0.34. - - \param image_in_ The input image - \return The list of points detected as corner - - \author J. Fabrizio - */ - template<typename I> - p_array<mln_site(I)> - harris(const Image& in_image_); + achard(const Image& in_image_); # ifndef MLN_INCLUDE_ONLY @@ -101,16 +70,16 @@ namespace mln /** \iternal Computes local max to find corner in an image - \param image_in_ The result of harris_criterion + \param image_in_ The result of achard_criterion \return The list of local min \author J. Fabrizio */ template<typename I> p_array<mln_site(I)> - harris_local_max(const Image& in_image_) + achard_local_max(const Image& in_image_) { - trace::exiting("detection::corner::harris_local_max"); + trace::exiting("detection::corner::achard_local_max"); const I& in_image = exact(in_image_); p_array<mln_site(I)> result; mln_piter(I) p(in_image.domain()); @@ -129,7 +98,7 @@ namespace mln result.append(p); } } - trace::exiting("detection::corner::harris_local_max"); + trace::exiting("detection::corner::achard_local_max"); return result; } @@ -137,24 +106,13 @@ namespace mln template<typename I> p_array<mln_site(I)> - harris(const Image& in_image_, float k, float sigma) { - trace::entering("detection::corner::harris"); + achard(const Image& in_image_) { + trace::entering("detection::corner::achard"); mln_ch_convolve(I, w_window2d_int) criterion_image; - criterion_image = harris_criterion(in_image_, k, sigma); - trace::exiting("detection::corner::harris"); - return internal::harris_local_max(criterion_image); - } - - template<typename I> - p_array<mln_site(I)> - harris(const Image& in_image_, float k) { - return harris(in_image_, k, 0.34); - } - - template<typename I> - p_array<mln_site(I)> - harris(const Image& in_image_) { - return harris(in_image_, 0.04, 0.34); + criterion_image = achard_criterion(in_image_); + p_array<mln_site(I)> result = internal::achard_local_max(criterion_image); + trace::exiting("detection::corner::achard"); + return result; } @@ -167,4 +125,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DETECTION_CORNER_HARRIS_HH +#endif // ! MLN_DETECTION_CORNER_ACHARD_HH diff --git a/milena/mln/detection/corner/harris_criterion.hh b/milena/mln/detection/corner/achard_criterion.hh similarity index 58% copy from milena/mln/detection/corner/harris_criterion.hh copy to milena/mln/detection/corner/achard_criterion.hh index 0b125c6..b7274a2 100644 --- a/milena/mln/detection/corner/harris_criterion.hh +++ b/milena/mln/detection/corner/achard_criterion.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_DETECTION_CORNER_HARRIS_CRITERION_HH -# define MLN_DETECTION_CORNER_HARRIS_CRITERION_HH +#ifndef MLN_DETECTION_CORNER_ACHARD_CRITERION_HH +# define MLN_DETECTION_CORNER_ACHARD_CRITERION_HH //#include <mln/io/essential.hh> @@ -35,7 +35,7 @@ /// \file /// -/// \brief Implementation of Harris corner detection. +/// \brief Implementation of Achard, Bigorgne and Devars corner detection. namespace mln @@ -45,39 +45,28 @@ namespace mln namespace corner { /** - Computes Harris corner detection criterion on \p in_image. + Computes Achard, Bigorgne and Devars corner detection criterion on \p in_image. \param image_in_ The input image. - \param k The k parameter in harris algorithm (use 0.04 if you - do not know what to do). - \param sigma The standard deviation of the gaussian used harris algorithm. - \return Harris criterion computed for evey pixel. + \return Achard criterion computed for evey pixel. \author J. Fabrizio */ template<typename I> mln_ch_convolve(I, w_window2d_int) - harris_criterion(const Image& in_image_, float k, float sigma); + achard_criterion(const Image& in_image_); # ifndef MLN_INCLUDE_ONLY - template<typename I> mln_ch_convolve(I, w_window2d_int) - harris_criterion(const Image& in_image_, float k, float sigma) + achard_criterion(const Image& in_image_) { - trace::entering("detection::corner::haris_criterion"); + trace::entering("detection::corner::achard_criterion"); const I& in_image = exact(in_image_); - p_array<mln_site(I)> result; typedef mln_ch_convolve(I, w_window2d_int) O; - O dx_image; - O dy_image; - O dxx_image; - O dxy_image; - O dyy_image; - O harris_criterion(in_image.domain()); typedef dpoint2d D; w_window2d_int dx_grad; @@ -89,27 +78,44 @@ namespace mln .insert(-1, D(-1, 0)) .insert(+1, D(+1, 0)); - dx_image=linear::convolve(in_image, dx_grad); - dy_image=linear::convolve(in_image, dy_grad); + O dx_image=linear::convolve(in_image, dx_grad); + O dy_image=linear::convolve(in_image, dy_grad); + + w_window2d_int mask_M; + mask_M + .insert(+1, D( 0, -1)) + .insert(+1, D( 0, +1)) + .insert(+1, D(+1, -1)) + .insert(+1, D(+1, +1)) + .insert(+1, D(-1, -1)) + .insert(+1, D(-1, +1)) + .insert(+1, D(-1, 0)) + .insert(+1, D(+1, 0)); + + O dxxj_image=linear::convolve(dx_image*dx_image, mask_M); + O dyyj_image=linear::convolve(dy_image*dy_image, mask_M); + O dxyj_image=linear::convolve(dx_image*dy_image, mask_M); - dxx_image=linear::gaussian(dx_image*dx_image, sigma); - dxy_image=linear::gaussian(dx_image*dy_image, sigma); - dyy_image=linear::gaussian(dy_image*dy_image, sigma); + O achard_criterion(in_image.domain()); typedef mln_value(O) V; mln_piter(I) p(in_image.domain()); for_all(p) { - V a = dxx_image(p); - V b = dyy_image(p); - V c = dxy_image(p); - harris_criterion(p)=(a*b-c*c)-k*(a+b)*(a+b); + V ix = dx_image(p); + V iy = dy_image(p); + V ixxj = dxxj_image(p); + V iyyj = dyyj_image(p); + V ixyj = dxyj_image(p); + V grad_magnitude = ix*ix+iy*iy; + achard_criterion(p)=ix*ix*iyyj+iy*iy*ixxj-2*ix*iy*ixyj; + if (grad_magnitude>1) achard_criterion(p)/=grad_magnitude; } - // I output = data::stretch(mln_value(I)(), harris_criterion); - // io::pgm::save(output, "harris-criterion-result.pgm"); + // I output = data::stretch(mln_value(I)(), achard_criterion); + // io::pgm::save(output, "achard-criterion-result.pgm"); - trace::exiting("detection::corner::harris_criterion"); - return harris_criterion; + trace::exiting("detection::corner::achard_criterion"); + return achard_criterion; } # endif // ! MLN_INCLUDE_ONLY @@ -120,4 +126,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_DETECTION_CORNER_HARRIS_CRITERION_HH +#endif // ! MLN_DETECTION_CORNER_ACHARD_CRITERION_HH -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-41-g1cde745
by git＠lrde.epita.fr 04 Oct '12

04 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 1cde74522f42b4cfdd260df9e3d2f46c50510eb1 (commit) via bbd4359f6eda38f4c6f04a0c69203ad4d5120d9b (commit) via b52230fdd12773c58aceb1e8a9d3d28c584f5a50 (commit) from 378bb80be1f173841b2358c47b15be1ce87add88 (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 ----------------------------------------------------------------- 1cde745 mln/value/concept/interval.hh: New. Add value::Interval concept. bbd4359 Add an accumulator median based on intervals. b52230f Rename interval::nelements() to interval::nvalues(). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++ .../accu/stat/{median_h.hh => median_interval.hh} | 263 +++++++++----------- .../value/concept/{vectorial.hh => interval.hh} | 17 +- milena/mln/value/interval.hh | 14 +- milena/tests/accu/stat/Makefile.am | 6 +- .../stat/median_interval.cc} | 25 ++- milena/tests/value/interval.cc | 4 +- 7 files changed, 181 insertions(+), 168 deletions(-) copy milena/mln/accu/stat/{median_h.hh => median_interval.hh} (50%) copy milena/mln/value/concept/{vectorial.hh => interval.hh} (79%) copy milena/tests/{world/k1/is_primary_face.cc => accu/stat/median_interval.cc} (78%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-41-g1cde745 mln/value/concept/interval.hh: New. Add value::Interval concept.
by Guillaume Lazzara 04 Oct '12

04 Oct '12

--- milena/ChangeLog | 4 ++++ .../value/concept/{vectorial.hh => interval.hh} | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) copy milena/mln/value/concept/{vectorial.hh => interval.hh} (79%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 18fa3cb..529f1b6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/value/concept/interval.hh: New. Add value::Interval concept. + +2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an accumulator median based on intervals. * mln/accu/stat/median_interval.hh, diff --git a/milena/mln/value/concept/vectorial.hh b/milena/mln/value/concept/interval.hh similarity index 79% copy from milena/mln/value/concept/vectorial.hh copy to milena/mln/value/concept/interval.hh index b70d41f..57b1916 100644 --- a/milena/mln/value/concept/vectorial.hh +++ b/milena/mln/value/concept/interval.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,12 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_CONCEPT_VECTORIAL_HH -# define MLN_VALUE_CONCEPT_VECTORIAL_HH +#ifndef MLN_VALUE_CONCEPT_INTERVAL_HH +# define MLN_VALUE_CONCEPT_INTERVAL_HH /*! \file * - * \brief Define a generic class for vectorial values. + * \brief Define a generic class for interval of values. */ # include <mln/core/concept/value.hh> @@ -38,7 +38,7 @@ namespace mln { // Fwd decl. - namespace value { template <typename E> struct Vectorial; } + namespace value { template <typename E> struct Interval; } namespace trait @@ -54,14 +54,15 @@ namespace mln // Category flag type. template <> - struct Vectorial<void> + struct Interval<void> { typedef Value<void> super; }; template <typename E> - struct Vectorial : public Value<E> + struct Interval : public Value<E> { + typedef Interval<void> category; }; } // end of namespace mln::value @@ -69,4 +70,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_VALUE_CONCEPT_VECTORIAL_HH +#endif // ! MLN_VALUE_CONCEPT_INTERVAL_HH -- 1.7.2.5

1 0

olena-2.0-100-gcc965b2 mln/value/concept/interval.hh: New. Add value::Interval concept.
by Guillaume Lazzara 04 Oct '12

04 Oct '12

--- milena/ChangeLog | 4 ++++ .../value/concept/{vectorial.hh => interval.hh} | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) copy milena/mln/value/concept/{vectorial.hh => interval.hh} (79%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 596063a..6a14cc2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/value/concept/interval.hh: New. Add value::Interval concept. + +2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an accumulator median based on intervals. * mln/accu/stat/median_interval.hh, diff --git a/milena/mln/value/concept/vectorial.hh b/milena/mln/value/concept/interval.hh similarity index 79% copy from milena/mln/value/concept/vectorial.hh copy to milena/mln/value/concept/interval.hh index b70d41f..57b1916 100644 --- a/milena/mln/value/concept/vectorial.hh +++ b/milena/mln/value/concept/interval.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,12 +23,12 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_CONCEPT_VECTORIAL_HH -# define MLN_VALUE_CONCEPT_VECTORIAL_HH +#ifndef MLN_VALUE_CONCEPT_INTERVAL_HH +# define MLN_VALUE_CONCEPT_INTERVAL_HH /*! \file * - * \brief Define a generic class for vectorial values. + * \brief Define a generic class for interval of values. */ # include <mln/core/concept/value.hh> @@ -38,7 +38,7 @@ namespace mln { // Fwd decl. - namespace value { template <typename E> struct Vectorial; } + namespace value { template <typename E> struct Interval; } namespace trait @@ -54,14 +54,15 @@ namespace mln // Category flag type. template <> - struct Vectorial<void> + struct Interval<void> { typedef Value<void> super; }; template <typename E> - struct Vectorial : public Value<E> + struct Interval : public Value<E> { + typedef Interval<void> category; }; } // end of namespace mln::value @@ -69,4 +70,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_VALUE_CONCEPT_VECTORIAL_HH +#endif // ! MLN_VALUE_CONCEPT_INTERVAL_HH -- 1.7.2.5

1 0

olena-2.0-40-gbbd4359 Add an accumulator median based on intervals.
by Guillaume Lazzara 04 Oct '12

04 Oct '12

* mln/accu/stat/median_interval.hh, * tests/accu/stat/median_interval.cc: New. * tests/accu/stat/Makefile.am: New target. --- milena/ChangeLog | 9 + .../accu/stat/{median_h.hh => median_interval.hh} | 263 +++++++++----------- milena/tests/accu/stat/Makefile.am | 6 +- .../stat/median_interval.cc} | 25 ++- 4 files changed, 151 insertions(+), 152 deletions(-) copy milena/mln/accu/stat/{median_h.hh => median_interval.hh} (50%) copy milena/tests/{world/k1/is_primary_face.cc => accu/stat/median_interval.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4216a2c..18fa3cb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Add an accumulator median based on intervals. + + * mln/accu/stat/median_interval.hh, + * tests/accu/stat/median_interval.cc: New. + + * tests/accu/stat/Makefile.am: New target. + +2012-10-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename interval::nelements() to interval::nvalues(). * mln/value/interval.hh, diff --git a/milena/mln/accu/stat/median_h.hh b/milena/mln/accu/stat/median_interval.hh similarity index 50% copy from milena/mln/accu/stat/median_h.hh copy to milena/mln/accu/stat/median_interval.hh index b38955d..a042bfa 100644 --- a/milena/mln/accu/stat/median_h.hh +++ b/milena/mln/accu/stat/median_interval.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,16 +23,18 @@ // 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_H_HH -# define MLN_ACCU_STAT_MEDIAN_H_HH +#ifndef MLN_ACCU_STAT_MEDIAN_ALT_HH +# define MLN_ACCU_STAT_MEDIAN_INTERVAL_HH /// \file /// -/// Define a generic median accumulator class. +/// Define a median accumulator class accepting values restricted to a +/// specific interval of values. # include <mln/accu/internal/base.hh> -# include <mln/accu/histo.hh> -# include <mln/value/set.hh> +# include <mln/value/interval.hh> +# include <mln/value/intsub.hh> +# include <mln/util/array.hh> namespace mln @@ -45,61 +46,31 @@ namespace mln namespace stat { - // Forward declaration. - template <typename V> - struct median_h; - } // end of namespace mln::accu::stat - - namespace meta - { - - namespace stat - { - - /// Meta accumulator for median_h. - struct median_h : public Meta_Accumulator< median_h > - { - template <typename V> - struct with - { - typedef accu::stat::median_h<V> ret; - }; - }; - - } // end of namespace mln::accu::meta::stat - - } // end of namespace mln::accu::meta - - namespace stat - { - - /// \brief Generic median function based on histogram over a value - /// set with type \c V. + /// \brief Generic median_interval function based on histogram over a + /// value set with type \c S. /// /// \ingroup modaccuvalues - template <typename V> - struct median_h : public mln::accu::internal::base< const V&, median_h<V> > + // + template <unsigned n> + struct median_interval + : public mln::accu::internal::base< const value::intsub<n>&, median_interval<n> > { - typedef V argument; + typedef value::intsub<n> argument; - median_h(); - median_h& operator=(const median_h& rhs); + median_interval(const value::interval<value::intsub<n> >& inter); + median_interval(const value::intsub<n>& first, const value::intsub<n>& last); /// Manipulators. /// \{ - void init(); void take(const argument& t); - void take(const median_h<V>& other); + void take(const median_interval& other); void untake(const argument& t); + void init(); /// \} - unsigned card() const { return h_.sum(); } - /// Get the value of the accumulator. - const argument& to_result() const; - - const accu::histo<V>& histo() const; + const value::intsub<n>& to_result() const; /// Check whether this accu is able to return a result. /// Always true here. @@ -107,114 +78,153 @@ namespace mln protected: - mutable accu::histo<V> h_; - const value::set<V>& s_; // derived from h_ + mutable util::array<unsigned> h_; + unsigned sum_; mutable unsigned sum_minus_, sum_plus_; mutable bool valid_; - mutable unsigned i_; // the median_h index - mutable argument t_; // the median_h value + + /// the median index + mutable unsigned i_; + /// the median argument + mutable value::intsub<n> t_; + + value::interval<value::intsub<n> > inter_; // Auxiliary methods - void update_() const; void go_minus_() const; void go_plus_() const; + void update_() const; }; + } // end of mln::accu::stat + + # ifndef MLN_INCLUDE_ONLY - template <typename V> - inline - median_h<V>::median_h() - : h_(), - s_(h_.vset()) + namespace stat + { + + template <unsigned n> + median_interval<n>::median_interval(const value::interval<value::intsub<n> >& inter) + : inter_(inter) { init(); } - template <typename V> - inline - median_h<V>& - median_h<V>::operator=(const median_h<V>& rhs) + template <unsigned n> + median_interval<n>::median_interval(const value::intsub<n>& first, const value::intsub<n>& last) + : inter_(first, last) { - h_ = rhs.h_; - sum_minus_ = rhs.sum_minus_; - sum_plus_ = rhs.sum_plus_; - valid_ = rhs.valid_; - i_ = rhs.i_; - t_ = rhs.t_; - - return *this; + init(); } - template <typename V> - inline + template <unsigned n> void - median_h<V>::take(const argument& t) + median_interval<n>::take(const argument& t) { - h_.take(t); + mln_precondition(inter_.has(t)); + + unsigned index = inter_.index_of(t); - if (t < t_) + // update h_ + ++h_[index]; + ++sum_; + + if (index < i_) ++sum_minus_; - else if (t > t_) + else if (index > i_) ++sum_plus_; if (valid_) valid_ = false; } - template <typename V> + template <unsigned n> inline void - median_h<V>::take(const median_h<V>& other) + median_interval<n>::take(const median_interval<n>& other) { - // h_ - h_.take(other.h_); + for (unsigned i = 0; i < h_.size(); ++i) + h_[i] += other.h_[i]; // sum_minus_ for (unsigned i = 0; i < i_; ++i) sum_minus_ += other.h_[i]; // sum_plus_ - for (unsigned i = i_ + 1; i < h_.nvalues(); ++i) + for (unsigned i = i_ + 1; i < h_.nelements(); ++i) sum_plus_ += other.h_[i]; if (valid_) valid_ = false; } - template <typename V> - inline + + template <unsigned n> void - median_h<V>::untake(const argument& t) + median_interval<n>::untake(const argument& t) { - mln_precondition(h_(t) != 0); - h_.untake(t); + mln_precondition(inter_.has(t)); + mln_precondition(h_[inter_.index_of(t)] != 0); + + unsigned index = inter_.index_of(t); + + // update h_ + --h_[index]; + --sum_; - if (t < t_) + if (index < i_) --sum_minus_; - else if (t > t_) + else if (index > i_) --sum_plus_; if (valid_) valid_ = false; } - template <typename V> + template <unsigned n> + void + median_interval<n>::init() + { + h_.resize(inter_.nvalues(), 0); + sum_minus_ = 0; + sum_plus_ = 0; + i_ = inter_.nvalues() / 2; + t_ = inter_.ith_element(i_); + } + + template <unsigned n> + const value::intsub<n>& + median_interval<n>::to_result() const + { + if (! valid_) + update_(); + return t_; + } + + template <unsigned n> + bool + median_interval<n>::is_valid() const + { + return true; + } + + template <unsigned n> inline void - median_h<V>::update_() const + median_interval<n>::update_() const { valid_ = true; - if (h_.sum() == 0) + if (sum_ == 0) return; - if (2 * sum_minus_ > h_.sum()) + if (2 * sum_minus_ > sum_) go_minus_(); else - if (2 * sum_plus_ > h_.sum()) + if (2 * sum_plus_ > sum_) go_plus_(); else if (h_[i_] == 0) @@ -227,10 +237,10 @@ namespace mln } } - template <typename V> - inline + + template <unsigned n> void - median_h<V>::go_minus_() const + median_interval<n>::go_minus_() const { do { @@ -240,14 +250,14 @@ namespace mln while (h_[i_] == 0); sum_minus_ -= h_[i_]; } - while (2 * sum_minus_ > h_.sum()); - t_ = s_[i_]; + while (2 * sum_minus_ > sum_); + t_ = inter_.ith_element(i_); } - template <typename V> - inline + + template <unsigned n> void - median_h<V>::go_plus_() const + median_interval<n>::go_plus_() const { do { @@ -257,56 +267,23 @@ namespace mln while (h_[i_] == 0); sum_plus_ -= h_[i_]; } - while (2 * sum_plus_ > h_.sum()); - t_ = s_[i_]; + while (2 * sum_plus_ > sum_); + t_ = inter_.ith_element(i_); } - template <typename V> - inline - void - median_h<V>::init() + template <unsigned n> + std::ostream& operator<<(std::ostream& ostr, const median_interval<n>& m) { - h_.init(); - sum_minus_ = 0; - sum_plus_ = 0; - i_ = (s_.index_of(mln_max(argument)) - - s_.index_of(mln_min(argument))) / 2; - t_ = s_[i_]; - valid_ = true; + return ostr << m.to_result(); } - template <typename V> - inline - const typename median_h<V>::argument& - median_h<V>::to_result() const - { - if (! valid_) - update_(); - return t_; - } - - template <typename V> - inline - const accu::histo<V>& - median_h<V>::histo() const - { - return h_; - } - - template <typename V> - inline - bool - median_h<V>::is_valid() const - { - return true; - } + } // end of namespace mln::accu::stat # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::accu::stat - } // end of namespace mln::accu } // end of namespace mln -#endif // ! MLN_ACCU_STAT_MEDIAN_H_HH + +#endif // ! MLN_ACCU_STAT_MEDIAN_INTERVAL_HH diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index 47197c0..77bcf65 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2012 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -26,6 +26,7 @@ check_PROGRAMS = \ max \ max_h \ median_h \ + median_interval \ mean \ rank @@ -33,6 +34,7 @@ deviation_SOURCES = deviation.cc var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc +median_interval_SOURCES = median_interval.cc min_SOURCES = min.cc min_h_SOURCES = min_h.cc max_SOURCES = max.cc diff --git a/milena/tests/world/k1/is_primary_face.cc b/milena/tests/accu/stat/median_interval.cc similarity index 78% copy from milena/tests/world/k1/is_primary_face.cc copy to milena/tests/accu/stat/median_interval.cc index 32eb871..a0c05a9 100644 --- a/milena/tests/world/k1/is_primary_face.cc +++ b/milena/tests/accu/stat/median_interval.cc @@ -23,17 +23,28 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +#include <mln/accu/stat/median_interval.hh> -#include <mln/core/alias/point2d.hh> -#include <mln/world/k1/is_primary_face.hh> int main() { using namespace mln; - mln_assertion(!world::k1::is_primary_face(point2d(-1, -1))); - mln_assertion(!world::k1::is_primary_face(point2d(-1, 0))); - mln_assertion(!world::k1::is_primary_face(point2d(0, -1))); - mln_assertion(world::k1::is_primary_face(point2d(0, 0))); + { + accu::stat::median_interval<2> med(2, 5); + + med.take(2); + med.take(2); + med.take(2.5); + med.take(2.5); + med.take(4.5); + med.take(4.5); + med.take(4.5); + med.take(4.5); + med.take(5); + med.take(5); + med.take(5); + + mln_assertion(med.to_result() == 4.5); + } } -- 1.7.2.5

1 0