- Olena-patches

Re: [Olena-patches] [Olena] #56: Review the trunk/milena/mln/estim directory.
by Olena 12 Sep '08

12 Sep '08

#56: Review the trunk/milena/mln/estim directory. ----------------------+----------------------------------------------------- Reporter: theo | Owner: theo Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/56#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #71: Review the trunk/milena/mln/fun directory
by Olena 12 Sep '08

12 Sep '08

#71: Review the trunk/milena/mln/fun directory -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: defect | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: -----------------------+---------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/71#comment:1> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #39: Review the trunk/milena/mln/debug directory.
by Olena 12 Sep '08

12 Sep '08

#39: Review the trunk/milena/mln/debug directory. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/39#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #64: Review the trunk/milena/mln/canvas directory.
by Olena 12 Sep '08

12 Sep '08

#64: Review the trunk/milena/mln/canvas directory. ----------------------+----------------------------------------------------- Reporter: nivault | Owner: Olena Team Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: ----------------------+----------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/64#comment:3> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

Re: [Olena-patches] [Olena] #38: Review the trunk/milena/mln/accu directory.
by Olena 12 Sep '08

12 Sep '08

#38: Review the trunk/milena/mln/accu directory. ------------------------+--------------------------------------------------- Reporter: garrigues | Owner: garrigues Type: task | Status: closed Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: wontfix | Keywords: ------------------------+--------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => wontfix Comment: Closing, as the merging from source:trunk/cleanup-2008/ into source:trunk/ will require a new reviewing effort. -- Ticket URL: <https://trac.lrde.org/olena/ticket/38#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

cleanup-2008 r2228: Add at() and remove operator[] from image1d
by Guillaume Lazzara 12 Sep '08

12 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Add at() and remove operator[] from image1d. * milena/mln/core/image/image1d.hh: add at() and remove operator[]. --- image1d.hh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) Index: branches/cleanup-2008/milena/mln/core/image/image1d.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/image1d.hh (revision 2227) +++ branches/cleanup-2008/milena/mln/core/image/image1d.hh (revision 2228) @@ -175,11 +175,15 @@ /// Read-write access to the image value located at point \p p. T& operator()(const point1d& p); - /// Read-only access to the image value located at offset \p o. - const T& operator[](unsigned i) const; - /// Read-write access to the image value located at offset \p o. - T& operator[](unsigned i); + // Specific methods: + // ----------------- + + /// Read-only access to the image value located at (\p index). + const T& at(int index) const; + + /// Read-write access to the image value located at (\p index). + T& at(int index); /// Fast Image method @@ -419,21 +423,22 @@ template <typename T> inline const T& - image1d<T>::operator[](unsigned o) const + image1d<T>::at(int index) const { - mln_precondition(o < nelements()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point1d(index))); + return this->data_->array_[index]; } template <typename T> inline T& - image1d<T>::operator[](unsigned o) + image1d<T>::at(int index) { - mln_precondition(o < nelements()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point1d(index))); + return this->data_->array_[index]; } + template <typename T> inline const T&

1 0

Re: [Olena-patches] [Olena] #133: Use consistent naming convention (w.r.t. underscores, abbreviations, etc.)
by Olena 12 Sep '08

12 Sep '08

#133: Use consistent naming convention (w.r.t. underscores, abbreviations, etc.) -----------------------+---------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Resolution: | Keywords: name coding style -----------------------+---------------------------------------------------- Old description: > We should write down __rules__ about names. For the moment, > wiki:Olena/Release1.0beta#NamingconventionsforOlena1.0 seems to be a good > place to write them. We might want to push them into the (developer) > documentation later. > > This ticket is a (relatively) unordered list of spotted issues. Decide, > reorder and fix. Don't close this ticket too soon, and use it a as memo. > > = Types (underscores, names) = > > We adopted many silent conventions while developing the project, and > inconsistencies arose. Here is a (non comprehensive) list of things to > fix: > * In source:trunk/mln/core/ `mln::window` vs `mln::neighb_` (full name > vs short name + no trailing underscore vs trailing underscore) > * Likewise, we have `mln::window` (without « `_` ») but `mln::point_`, > etc. > * In source:/trunk/milena/mln/accu/median.hh the class does not have any > trailing underscore, whereas other accumulators from > source:/trunk/milena/mln/accu/ have one. > * graph- and complex-related domain-iterators have trailing underscores, > whereas their vicinity counterparts does not. > > = Traits macros = > > * Should we use `mln_sum(V)` or `mln_trait_value_sum(V)` in the library > code? I (Roland) think so. > > = Neighborhoods = > > * The terms/prefixes `nbh`, `neighb` and `neighborhood` are used > inconsistently throughout the project. Here are the files that should be > checked (and possibly renamed), as of revision r1859: > * source:trunk/milena/mln/core/clock_neighb.hh > * source:trunk/milena/mln/core/clock_neighb2d.hh > * source:trunk/milena/mln/core/concept/doc/neighborhood.hh > * source:trunk/milena/mln/core/concept/neighborhood.hh > * source:trunk/milena/mln/core/graph_elt_neighborhood.hh > * source:trunk/milena/mln/core/graph_neighborhood_piter.hh > * source:trunk/milena/mln/core/line_graph_elt_neighborhood.hh > * source:trunk/milena/mln/core/line_graph_neighborhood_piter.hh > * source:trunk/milena/mln/core/neighb.hh > * source:trunk/milena/mln/core/neighb1d.hh > * source:trunk/milena/mln/core/neighb2d.hh > * source:trunk/milena/mln/core/neighb3d.hh > * source:trunk/milena/mln/metal/has_neighborhood.hh > * source:trunk/milena/mln/neighb/ > * source:trunk/milena/mln/trait/neighborhood.hh New description: We should write down __rules__ about names. For the moment, wiki:Olena/Release1.0#NamingconventionsforOlena1.0 seems to be a good place to write them. We might want to push them into the (developer) documentation later. This ticket is a (relatively) unordered list of spotted issues. Decide, reorder and fix. Don't close this ticket too soon, and use it a as memo. = Types (underscores, names) = We adopted many silent conventions while developing the project, and inconsistencies arose. Here is a (non comprehensive) list of things to fix: * In source:trunk/mln/core/ `mln::window` vs `mln::neighb_` (full name vs short name + no trailing underscore vs trailing underscore) * Likewise, we have `mln::window` (without « `_` ») but `mln::point_`, etc. * In source:/trunk/milena/mln/accu/median.hh the class does not have any trailing underscore, whereas other accumulators from source:/trunk/milena/mln/accu/ have one. * graph- and complex-related domain-iterators have trailing underscores, whereas their vicinity counterparts does not. = Traits macros = * Should we use `mln_sum(V)` or `mln_trait_value_sum(V)` in the library code? I (Roland) think so. = Neighborhoods = * The terms/prefixes `nbh`, `neighb` and `neighborhood` are used inconsistently throughout the project. Here are the files that should be checked (and possibly renamed), as of revision r1859: * source:trunk/milena/mln/core/clock_neighb.hh * source:trunk/milena/mln/core/clock_neighb2d.hh * source:trunk/milena/mln/core/concept/doc/neighborhood.hh * source:trunk/milena/mln/core/concept/neighborhood.hh * source:trunk/milena/mln/core/graph_elt_neighborhood.hh * source:trunk/milena/mln/core/graph_neighborhood_piter.hh * source:trunk/milena/mln/core/line_graph_elt_neighborhood.hh * source:trunk/milena/mln/core/line_graph_neighborhood_piter.hh * source:trunk/milena/mln/core/neighb.hh * source:trunk/milena/mln/core/neighb1d.hh * source:trunk/milena/mln/core/neighb2d.hh * source:trunk/milena/mln/core/neighb3d.hh * source:trunk/milena/mln/metal/has_neighborhood.hh * source:trunk/milena/mln/neighb/ * source:trunk/milena/mln/trait/neighborhood.hh Comment (by levill_r): s|Olena/Release1.0beta|Olena/Release1.0|. -- Ticket URL: <https://trac.lrde.org/olena/ticket/133#comment:2> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

cleanup-2008 2227: Adapt the accumulators histo, min_h, max_h to histo/data.
by Nicolas Ballas 12 Sep '08

12 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Adapt the accumulators histo, min_h, max_h to histo/data. * tests/accu/max_h.cc, * tests/accu/min_h.cc: Update. * mln/histo/data.hh: Add a new method nvalues. * mln/core/routine/ops.hh: delete trailing whitespace. * mln/accu/nil.hh, * mln/accu/min.hh, * mln/accu/count_adjacent_vertices.hh, * mln/accu/max.hh, * mln/accu/count.hh, * mln/accu/tuple.hh, * mln/accu/bbox.hh, * mln/accu/pair.hh, * mln/accu/median.hh, * mln/accu/median_alt.hh, * mln/accu/p.hh, * mln/accu/rank_high_quant.hh, * mln/accu/sum.hh, * mln/accu/v.hh, * mln/accu/rank_bool.hh, * mln/accu/volume.hh, * mln/accu/height.hh, * mln/accu/mean.hh, * mln/accu/internal/base.hh: Rename base_ to base. * mln/accu/max_h.hh, * mln/accu/min_h.hh, * mln/accu/histo.hh: Adapt to histo/data. * mln/value/int_u.hh: Update. mln/accu/bbox.hh | 2 mln/accu/count.hh | 2 mln/accu/count_adjacent_vertices.hh | 2 mln/accu/height.hh | 2 mln/accu/histo.hh | 117 ++++++++++++++++-------------------- mln/accu/internal/base.hh | 8 +- mln/accu/max.hh | 2 mln/accu/max_h.hh | 78 ++++++++++-------------- mln/accu/mean.hh | 2 mln/accu/median.hh | 2 mln/accu/median_alt.hh | 2 mln/accu/min.hh | 2 mln/accu/min_h.hh | 79 ++++++++++-------------- mln/accu/nil.hh | 2 mln/accu/p.hh | 2 mln/accu/pair.hh | 2 mln/accu/rank_bool.hh | 2 mln/accu/rank_high_quant.hh | 2 mln/accu/sum.hh | 2 mln/accu/tuple.hh | 2 mln/accu/v.hh | 2 mln/accu/volume.hh | 2 mln/core/routine/ops.hh | 4 - mln/histo/data.hh | 19 +++++ mln/value/int_u.hh | 4 - tests/accu/max_h.cc | 2 tests/accu/min_h.cc | 4 - 27 files changed, 170 insertions(+), 181 deletions(-) Index: tests/accu/max_h.cc --- tests/accu/max_h.cc (revision 2226) +++ tests/accu/max_h.cc (working copy) @@ -39,7 +39,7 @@ using namespace mln; using namespace mln::value; - accu::max_h< set<int_u8> > a; + accu::max_h<int_u8> a; a.take(1); a.take(1); Index: tests/accu/min_h.cc --- tests/accu/min_h.cc (revision 2226) +++ tests/accu/min_h.cc (working copy) @@ -34,12 +34,14 @@ #include <mln/accu/min_h.hh> + + int main() { using namespace mln; using namespace mln::value; - accu::min_h< set<int_u8> > a; + accu::min_h<int_u8> a; a.take(42); a.take(42); Index: mln/histo/data.hh --- mln/histo/data.hh (revision 2226) +++ mln/histo/data.hh (working copy) @@ -63,6 +63,9 @@ const std::vector<std::size_t>& vect() const; const mln::value::set<T>& vset() const; std::size_t operator[](unsigned i) const; + std::size_t& operator[](unsigned i); + + std::size_t nvalues() const; protected: @@ -130,6 +133,15 @@ template <typename T> inline + std::size_t& + data<T>::operator[](unsigned i) + { + mln_precondition(i < s_.nvalues()); + return h_[i]; + } + + template <typename T> + inline const std::vector<std::size_t>& data<T>::vect() const { @@ -138,6 +150,13 @@ template <typename T> inline + std::size_t data<T>::nvalues() const + { + return h_.size(); + } + + template <typename T> + inline std::ostream& operator<<(std::ostream& ostr, const data<T>& h) { mln_viter(mln::value::set<T>) v(h.vset()); Index: mln/core/routine/ops.hh --- mln/core/routine/ops.hh (revision 2226) +++ mln/core/routine/ops.hh (working copy) @@ -80,11 +80,9 @@ * \todo Complete those definitions (...) + Overload for const (?) */ +# include <mln/trait/op/all.hh> # include <mln/core/concept/object.hh> # include <mln/metal/converts_to.hh> -# include <mln/trait/op/all.hh> - - namespace mln { Index: mln/accu/nil.hh --- mln/accu/nil.hh (revision 2226) +++ mln/accu/nil.hh (working copy) @@ -51,7 +51,7 @@ * \brief Define an accumulator that does nothing. */ template <typename T> - struct nil_ : public mln::accu::internal::base_< util::ignore , nil_<T> > + struct nil_ : public mln::accu::internal::base< util::ignore , nil_<T> > { typedef util::eat argument; typedef util::ignore result; Index: mln/accu/min.hh --- mln/accu/min.hh (revision 2226) +++ mln/accu/min.hh (working copy) @@ -51,7 +51,7 @@ * The parameter \c T is the type of values. */ template <typename T> - struct min_ : public mln::accu::internal::base_< T, min_<T> > + struct min_ : public mln::accu::internal::base< T, min_<T> > { typedef T argument; typedef T result; Index: mln/accu/count_adjacent_vertices.hh --- mln/accu/count_adjacent_vertices.hh (revision 2226) +++ mln/accu/count_adjacent_vertices.hh (working copy) @@ -54,7 +54,7 @@ /// mln::opening_area_on_vertices. template <typename P, typename V> struct count_adjacent_vertices_ - : public mln::accu::internal::base_< std::size_t, + : public mln::accu::internal::base< std::size_t, count_adjacent_vertices_<P, V> > { typedef mln::util::pix< mln::line_graph_image<P, V> > argument; Index: mln/accu/max.hh --- mln/accu/max.hh (revision 2226) +++ mln/accu/max.hh (working copy) @@ -51,7 +51,7 @@ * The parameter \c T is the type of values. */ template <typename T> - struct max_ : public mln::accu::internal::base_< T , max_<T> > + struct max_ : public mln::accu::internal::base< T , max_<T> > { typedef T argument; typedef T result; Index: mln/accu/histo.hh --- mln/accu/histo.hh (revision 2226) +++ mln/accu/histo.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -41,7 +41,7 @@ # include <mln/core/concept/value_set.hh> # include <mln/accu/internal/base.hh> # include <mln/value/set.hh> - +# include <mln/histo/data.hh> namespace mln { @@ -51,19 +51,20 @@ /*! - * \brief Generic histogram class over a value set with type \c S. + * \brief Generic histogram class over a value set with type \c V. */ - template <typename S> - struct histo : public mln::accu::internal::base_< const std::vector<std::size_t>& , histo<S> > + template <typename V> + struct histo : + public mln::accu::internal::base<const std::vector<std::size_t>& , + histo<V> > { - histo(const Value_Set<S>& s); histo(); - typedef mln_value(S) argument; + typedef V argument; typedef const std::vector<std::size_t>& result; void take(const argument& t); - void take(const histo<S>& other); + void take(const histo<V>& other); void untake(const argument& t); void init(); @@ -75,142 +76,130 @@ const std::vector<std::size_t>& vect() const; const std::vector<std::size_t>& to_result() const; - const S& vset() const; + const value::set<V>& vset() const; protected: - const S& s_; - std::vector<std::size_t> h_; + mln::histo::data<V> h_; std::size_t sum_; }; - template <typename S> - std::ostream& operator<<(std::ostream& ostr, const histo<S>& h); + template <typename V> + std::ostream& operator<<(std::ostream& ostr, const histo<V>& h); # ifndef MLN_INCLUDE_ONLY - template <typename S> - inline - histo<S>::histo(const Value_Set<S>& s) - : s_(exact(s)), - h_(s_.nvalues(), 0), - sum_(0) - { - } - - template <typename S> + template <typename V> inline - histo<S>::histo() - : s_(S::the()), - h_(s_.nvalues(), 0), + histo<V>::histo() + : h_(), sum_(0) { } - template <typename S> + template <typename V> inline void - histo<S>::take(const argument& t) + histo<V>::take(const argument& t) { - ++h_[s_.index_of(t)]; + ++h_[h_.vset().index_of(t)]; ++sum_; } - template <typename S> + template <typename V> inline void - histo<S>::take(const histo<S>& other) + histo<V>::take(const histo<V>& other) { - for (unsigned i = 0; i < h_.size(); ++i) + for (unsigned i = 0; i < h_.nvalues(); ++i) h_[i] += other.h_[i]; sum_ += other.sum_; } - template <typename S> + template <typename V> inline void - histo<S>::untake(const argument& t) + histo<V>::untake(const argument& t) { - mln_precondition(h_[s_.index_of(t)] > 0); + mln_precondition(h_[h_.vset().index_of(t)] > 0); mln_precondition(sum_ > 0); - --h_[s_.index_of(t)]; + --h_[h_.vset().index_of(t)]; --sum_; } - template <typename S> + template <typename V> inline void - histo<S>::init() + histo<V>::init() { - std::fill(h_.begin(), h_.end(), 0); - sum_ = 0; + h_.clear(); } - template <typename S> + template <typename V> inline std::size_t - histo<S>::operator()(const argument& t) const + histo<V>::operator()(const argument& t) const { - return h_[s_.index_of(t)]; + return h_[h_.vset().index_of(t)]; } - template <typename S> + template <typename V> inline std::size_t - histo<S>::operator[](unsigned i) const + histo<V>::operator[](unsigned i) const { - mln_precondition(i < s_.nvalues()); + mln_precondition(i < h_.vset().nvalues()); return h_[i]; } - template <typename S> + template <typename V> inline unsigned - histo<S>::nvalues() const + histo<V>::nvalues() const { - return s_.nvalues(); + return h_.vset().nvalues(); } - template <typename S> + template <typename V> inline std::size_t - histo<S>::sum() const + histo<V>::sum() const { return sum_; } - template <typename S> + template <typename V> inline const std::vector<std::size_t>& - histo<S>::vect() const + histo<V>::vect() const { - return h_; + return h_.vect(); } - template <typename S> + template <typename V> inline const std::vector<std::size_t>& - histo<S>::to_result() const + histo<V>::to_result() const { - return h_; + return this->vect(); } - template <typename S> + template <typename V> inline - const S& - histo<S>::vset() const + const value::set<V>& + histo<V>::vset() const { - return s_; + return h_.vset(); } - template <typename S> + template <typename V> inline - std::ostream& operator<<(std::ostream& ostr, const histo<S>& h) + std::ostream& operator<<(std::ostream& ostr, const histo<V>& h) { - mln_viter(S) v(h.vset()); + mln_viter(V) v(h.vset()); for_all(v) if (h(v) != 0) ostr << v << ':' << h(v) << ' '; Index: mln/accu/count.hh --- mln/accu/count.hh (revision 2226) +++ mln/accu/count.hh (working copy) @@ -43,7 +43,7 @@ /// \brief Generic counter accumulator class. /// The parameter \a T is the type to be count. template <typename T> - struct count_ : public mln::accu::internal::base_< std::size_t , count_<T> > + struct count_ : public mln::accu::internal::base< std::size_t , count_<T> > { typedef T argument; Index: mln/accu/tuple.hh --- mln/accu/tuple.hh (revision 2226) +++ mln/accu/tuple.hh (working copy) @@ -72,7 +72,7 @@ */ template <typename A, unsigned n, BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(10, typename T, boost::tuples::null_type)> struct tuple_ - : public mln::accu::internal::base_< boost::tuple< BOOST_PP_REPEAT(10, RESULT_ACCU, Le Ricard ya que ca de vrai !) > , tuple_<A, n, BOOST_PP_ENUM_PARAMS(10, T)> > + : public mln::accu::internal::base< boost::tuple< BOOST_PP_REPEAT(10, RESULT_ACCU, Le Ricard ya que ca de vrai !) > , tuple_<A, n, BOOST_PP_ENUM_PARAMS(10, T)> > { typedef A argument; Index: mln/accu/bbox.hh --- mln/accu/bbox.hh (revision 2226) +++ mln/accu/bbox.hh (working copy) @@ -49,7 +49,7 @@ * The parameter \c P is the type of points. */ template <typename P> - struct bbox : public mln::accu::internal::base_< const box& , bbox > + struct bbox : public mln::accu::internal::base< const box& , bbox > { typedef P argument; typedef const box& result; Index: mln/accu/min_h.hh --- mln/accu/min_h.hh (revision 2226) +++ mln/accu/min_h.hh (working copy) @@ -35,6 +35,7 @@ # include <mln/accu/internal/base.hh> # include <mln/accu/histo.hh> +# include <mln/value/set.hh> namespace mln @@ -45,33 +46,32 @@ /*! \brief Generic min function based on histogram over a value - * set with type \c S. + * set with type \c V. */ - template <typename S> - struct min_h : public mln::accu::internal::base_< mln_value(S) , min_h<S> > + template <typename V> + struct min_h : public mln::accu::internal::base< V , min_h<V> > { - typedef mln_value(S) argument; + typedef V argument; typedef argument result; - min_h(const Value_Set<S>& s); min_h(); void init(); void take(const argument& t); void take_as_init(const argument& t); - void take(const min_h<S>& other); + void take(const min_h<V>& other); void untake(const argument& t); unsigned card() const { return h_.sum(); } result to_result() const; - const accu::histo<S>& histo() const; + const accu::histo<V>& histo() const; protected: - mutable accu::histo<S> h_; - const S& s_; // derived from h_ + mutable accu::histo<V> h_; + const value::set<V>& s_; // derived from h_ mutable std::size_t sum_; mutable bool valid_; @@ -87,28 +87,19 @@ # ifndef MLN_INCLUDE_ONLY - template <typename S> + template <typename V> inline - min_h<S>::min_h(const Value_Set<S>& s) - : h_(s), - s_(h_.vset()) - { - init(); - } - - template <typename S> - inline - min_h<S>::min_h() + min_h<V>::min_h() : h_(), s_(h_.vset()) { init(); } - template <typename S> + template <typename V> inline void - min_h<S>::take(const argument& t) + min_h<V>::take(const argument& t) { h_.take(t); if (h_.sum() == 1) @@ -123,10 +114,10 @@ } } - template <typename S> + template <typename V> inline void - min_h<S>::take(const min_h<S>& other) + min_h<V>::take(const min_h<V>& other) { // h_ h_.take(other.h_); @@ -136,10 +127,10 @@ // FIXME: Optimize. } - template <typename S> + template <typename V> inline void - min_h<S>::untake(const argument& t) + min_h<V>::untake(const argument& t) { mln_precondition(h_(t) != 0); h_.untake(t); @@ -159,10 +150,10 @@ valid_ = false; } - template <typename S> + template <typename V> inline void - min_h<S>::update_() const + min_h<V>::update_() const { if (sum_ != 0) go_minus_(); @@ -172,10 +163,10 @@ valid_ = true; } - template <typename S> + template <typename V> inline void - min_h<S>::go_minus_() const + min_h<V>::go_minus_() const { do { @@ -187,10 +178,10 @@ t_ = s_[i_]; } - template <typename S> + template <typename V> inline void - min_h<S>::go_plus_() const + min_h<V>::go_plus_() const { do ++i_; @@ -198,10 +189,10 @@ t_ = s_[i_]; } - template <typename S> + template <typename V> inline void - min_h<S>::init() + min_h<V>::init() { h_.init(); sum_ = 0; @@ -210,10 +201,10 @@ valid_ = true; } - template <typename S> + template <typename V> inline void - min_h<S>::take_as_init(const argument& t) + min_h<V>::take_as_init(const argument& t) { h_.take(t); sum_ = 0; @@ -222,27 +213,27 @@ valid_ = true; } - template <typename S> + template <typename V> inline - typename min_h<S>::argument - min_h<S>::to_result() const + typename min_h<V>::argument + min_h<V>::to_result() const { if (! valid_) update_(); return t_; } - template <typename S> + template <typename V> inline - const accu::histo<S>& - min_h<S>::histo() const + const accu::histo<V>& + min_h<V>::histo() const { return h_; } - template <typename S> + template <typename V> inline - std::ostream& operator<<(std::ostream& ostr, const min_h<S>& m) + std::ostream& operator<<(std::ostream& ostr, const min_h<V>& m) { return ostr << m.to_result(); } Index: mln/accu/pair.hh --- mln/accu/pair.hh (revision 2226) +++ mln/accu/pair.hh (working copy) @@ -56,7 +56,7 @@ * \todo Check that, when T is not provided, A1 and A2 have the same value. */ template <typename A1, typename A2, typename T = mln_argument(A1)> - struct pair_ : public mln::accu::internal::base_< std::pair< mlc_unqualif(mln_result(A1)) , mlc_unqualif(mln_result(A2)) > , pair_<A1,A2,T> > + struct pair_ : public mln::accu::internal::base< std::pair< mlc_unqualif(mln_result(A1)) , mlc_unqualif(mln_result(A2)) > , pair_<A1,A2,T> > { typedef T argument; Index: mln/accu/max_h.hh --- mln/accu/max_h.hh (revision 2226) +++ mln/accu/max_h.hh (working copy) @@ -45,33 +45,32 @@ /*! \brief Generic max function based on histogram over a value set with - * type \c S. + * type \c V. */ - template <typename S> - struct max_h : public mln::accu::internal::base_< mln_value(S) , max_h<S> > + template <typename V> + struct max_h : public mln::accu::internal::base< V, max_h<V> > { - typedef mln_value(S) argument; + typedef V argument; typedef argument result; - max_h(const Value_Set<S>& s); max_h(); void init(); void take(const argument& t); void take_as_init(const argument& t); - void take(const max_h<S>& other); + void take(const max_h<V>& other); void untake(const argument& t); unsigned card() const { return h_.sum(); } argument to_result() const; - const accu::histo<S>& histo() const; + const accu::histo<V>& histo() const; protected: - mutable accu::histo<S> h_; - const S& s_; // derived from h_ + mutable accu::histo<V> h_; + const value::set<V>& s_; // derived from h_ mutable std::size_t sum_; mutable bool valid_; @@ -87,28 +86,19 @@ # ifndef MLN_INCLUDE_ONLY - template <typename S> + template <typename V> inline - max_h<S>::max_h(const Value_Set<S>& s) - : h_(s), - s_(h_.vset()) - { - init(); - } - - template <typename S> - inline - max_h<S>::max_h() + max_h<V>::max_h() : h_(), s_(h_.vset()) { init(); } - template <typename S> + template <typename V> inline void - max_h<S>::take(const argument& t) + max_h<V>::take(const argument& t) { h_.take(t); if (h_.sum() == 1) @@ -123,10 +113,10 @@ } } - template <typename S> + template <typename V> inline void - max_h<S>::take(const max_h<S>& other) + max_h<V>::take(const max_h<V>& other) { // h_ h_.take(other.h_); @@ -136,10 +126,10 @@ // FIXME: Optimize. } - template <typename S> + template <typename V> inline void - max_h<S>::untake(const argument& t) + max_h<V>::untake(const argument& t) { mln_precondition(h_(t) != 0); h_.untake(t); @@ -159,10 +149,10 @@ valid_ = false; } - template <typename S> + template <typename V> inline void - max_h<S>::update_() const + max_h<V>::update_() const { if (sum_ != 0) go_plus_(); @@ -172,10 +162,10 @@ valid_ = true; } - template <typename S> + template <typename V> inline void - max_h<S>::go_minus_() const + max_h<V>::go_minus_() const { do --i_; @@ -183,10 +173,10 @@ t_ = s_[i_]; } - template <typename S> + template <typename V> inline void - max_h<S>::go_plus_() const + max_h<V>::go_plus_() const { do { @@ -197,10 +187,10 @@ t_ = s_[i_]; } - template <typename S> + template <typename V> inline void - max_h<S>::init() + max_h<V>::init() { h_.init(); sum_ = 0; @@ -209,10 +199,10 @@ valid_ = true; } - template <typename S> + template <typename V> inline void - max_h<S>::take_as_init(const argument& t) + max_h<V>::take_as_init(const argument& t) { h_.take(t); sum_ = 0; @@ -221,27 +211,27 @@ valid_ = true; } - template <typename S> + template <typename V> inline - typename max_h<S>::argument - max_h<S>::to_result() const + typename max_h<V>::argument + max_h<V>::to_result() const { if (! valid_) update_(); return t_; } - template <typename S> + template <typename V> inline - const accu::histo<S>& - max_h<S>::histo() const + const accu::histo<V>& + max_h<V>::histo() const { return h_; } - template <typename S> + template <typename V> inline - std::ostream& operator<<(std::ostream& ostr, const max_h<S>& m) + std::ostream& operator<<(std::ostream& ostr, const max_h<V>& m) { return ostr << m.to_result(); } Index: mln/accu/median.hh --- mln/accu/median.hh (revision 2226) +++ mln/accu/median.hh (working copy) @@ -48,7 +48,7 @@ * set with type \c S. */ template <typename S> - struct median : public mln::accu::internal::base_< mln_value(S), median<S> > + struct median : public mln::accu::internal::base< mln_value(S), median<S> > { // FIXME: Should median be named 'median_' like other accumulators ? typedef mln_value(S) argument; typedef argument result; Index: mln/accu/median_alt.hh --- mln/accu/median_alt.hh (revision 2226) +++ mln/accu/median_alt.hh (working copy) @@ -48,7 +48,7 @@ * value set with type \c S. */ template <typename S> - struct median_alt : public mln::accu::internal::base_< mln_value(S), median_alt<S> > + struct median_alt : public mln::accu::internal::base< mln_value(S), median_alt<S> > { typedef mln_value(S) argument; Index: mln/accu/p.hh --- mln/accu/p.hh (revision 2226) +++ mln/accu/p.hh (working copy) @@ -52,7 +52,7 @@ * The parameter \c V is the type of values. */ template <typename A> - struct p_ : public mln::accu::internal::base_< mln_result(A) , p_<A> > + struct p_ : public mln::accu::internal::base< mln_result(A) , p_<A> > { typedef mln_argument(A) argument; typedef mln_result(A) result; Index: mln/accu/rank_high_quant.hh --- mln/accu/rank_high_quant.hh (revision 2226) +++ mln/accu/rank_high_quant.hh (working copy) @@ -52,7 +52,7 @@ * The parameter \c T is the type of values. */ template <typename T> - struct rank_ : public mln::accu::internal::base_< T, rank_<T> > + struct rank_ : public mln::accu::internal::base< T, rank_<T> > { typedef T argument; typedef T result; Index: mln/accu/sum.hh --- mln/accu/sum.hh (revision 2226) +++ mln/accu/sum.hh (working copy) @@ -57,7 +57,7 @@ * \c S is the summation type (property) of \c T. */ template <typename T, typename S = mln_sum(T)> - struct sum_ : public mln::accu::internal::base_< S, sum_<T,S> > + struct sum_ : public mln::accu::internal::base< S, sum_<T,S> > { typedef T argument; typedef S result; Index: mln/accu/v.hh --- mln/accu/v.hh (revision 2226) +++ mln/accu/v.hh (working copy) @@ -50,7 +50,7 @@ * \brief Generic val of accumulators. */ template <typename A> - struct val_ : public mln::accu::internal::base_< mln_result(A) , val_<A> > + struct val_ : public mln::accu::internal::base< mln_result(A) , val_<A> > { typedef mln_argument(A) argument; typedef mln_result(A) result; Index: mln/accu/rank_bool.hh --- mln/accu/rank_bool.hh (revision 2226) +++ mln/accu/rank_bool.hh (working copy) @@ -53,7 +53,7 @@ * */ template <> - struct rank_<bool> : public mln::accu::internal::base_< bool, rank_<bool> > + struct rank_<bool> : public mln::accu::internal::base< bool, rank_<bool> > { typedef bool argument; typedef bool result; Index: mln/accu/volume.hh --- mln/accu/volume.hh (revision 2226) +++ mln/accu/volume.hh (working copy) @@ -58,7 +58,7 @@ /// of pixels is built. template <typename I> struct volume_ - : public mln::accu::internal::base_< std::size_t , volume_ > + : public mln::accu::internal::base< std::size_t , volume_ > { /// \brief The accumulated data type. /// Index: mln/accu/height.hh --- mln/accu/height.hh (revision 2226) +++ mln/accu/height.hh (working copy) @@ -59,7 +59,7 @@ /// of pixels is built. template <typename I> struct height_ - : public mln::accu::internal::base_< std::size_t , height_ > + : public mln::accu::internal::base< std::size_t , height_ > { /// \brief The accumulated data type. /// Index: mln/accu/internal/base.hh --- mln/accu/internal/base.hh (revision 2226) +++ mln/accu/internal/base.hh (working copy) @@ -50,7 +50,7 @@ * Base class for implementation of accumulator classes. */ template <typename R, typename E> - class base_ : public Accumulator<E>, + class base : public Accumulator<E>, public mln::internal::proxy_impl< R, E > { public: @@ -62,7 +62,7 @@ typedef R result; protected: - base_(); + base(); }; @@ -70,14 +70,14 @@ template <typename R, typename E> inline - base_<R,E>::base_() + base<R,E>::base() { } template <typename R, typename E> inline R - base_<R,E>::subj_() + base<R,E>::subj_() { return exact(this)->to_result(); } Index: mln/accu/mean.hh --- mln/accu/mean.hh (revision 2226) +++ mln/accu/mean.hh (working copy) @@ -58,7 +58,7 @@ template <typename T, typename S = mln_sum(T), typename M = S> - struct mean_ : public mln::accu::internal::base_< M , mean_<T,S,M> > + struct mean_ : public mln::accu::internal::base< M , mean_<T,S,M> > { typedef T argument; typedef M result; Index: mln/value/int_u.hh --- mln/value/int_u.hh (revision 2226) +++ mln/value/int_u.hh (working copy) @@ -33,6 +33,8 @@ * \brief Define a generic class for unsigned integers. */ +# include <mln/trait/all.hh> // FIXME! + # include <mln/value/ops.hh> # include <mln/metal/math/pow.hh> @@ -40,8 +42,6 @@ # include <mln/value/internal/encoding.hh> # include <mln/value/concept/integer.hh> # include <mln/trait/value_.hh> -# include <mln/trait/all.hh> // FIXME! -# include <mln/trait/value_.hh> # include <mln/debug/format.hh>

1 0

cleanup-2008 r2226: Propagate few renamings
by Guillaume Lazzara 12 Sep '08

12 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-12 Guillaume Lazzara <z(a)lrde.epita.fr> Propagate few renamings. * milena/mln/canvas/browsing/snake_fwd.hh, * milena/mln/debug/println.spe.hh: Use def::coord instead of int. * milena/mln/convert/to_image.hh: Rename mln_point to mln_site. * milena/mln/geom/shift.hh: Use convert::to instead of convert::to_dpoint(). * milena/mln/level/median.hh: Update the use of io property. * milena/mln/pw/image.hh: Fix typo. * milena/mln/win/line.hh: remove useless '_' in type name. --- canvas/browsing/snake_fwd.hh | 4 ++-- convert/to_image.hh | 2 +- debug/println.spe.hh | 6 +++--- geom/shift.hh | 3 ++- level/median.hh | 2 +- pw/image.hh | 2 +- win/line.hh | 6 +++--- 7 files changed, 13 insertions(+), 12 deletions(-) Index: branches/cleanup-2008/milena/mln/debug/println.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/debug/println.spe.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/debug/println.spe.hh (revision 2226) @@ -158,9 +158,9 @@ println(const box3d& b, const I& input) { point3d p; - int& sli = p.sli(); - int& row = p.row(); - int& col = p.col(); + def::coord& sli = p.sli(); + def::coord& row = p.row(); + def::coord& col = p.col(); const int max_row = b.max_row(), max_sli = b.max_sli(), Index: branches/cleanup-2008/milena/mln/level/median.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/median.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/level/median.hh (revision 2226) @@ -303,7 +303,7 @@ { trace::entering("level::median_dir"); - mlc_is(mln_trait_image_io(O), trait::image::io::write)::check(); + mlc_is(mln_trait_image_value_io(O), trait::image::value_io::read_write)::check(); mlc_is(mln_trait_image_support(I), trait::image::support::aligned)::check(); mlc_converts_to(mln_value(I), mln_value(O))::check(); Index: branches/cleanup-2008/milena/mln/convert/to_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/convert/to_image.hh (revision 2226) @@ -64,7 +64,7 @@ template <typename T> struct helper_dim_ { - typedef mln_point(T) P; + typedef mln_site(T) P; enum { value = P::dim }; }; Index: branches/cleanup-2008/milena/mln/pw/image.hh =================================================================== --- branches/cleanup-2008/milena/mln/pw/image.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/pw/image.hh (revision 2226) @@ -142,7 +142,7 @@ /// Give the definition domain. const S& domain() const; - /// Returns the function which compute a site value. + /// Return the function which computes a site value. F function() const; /// Read-only access of pixel value at point site \p p. Index: branches/cleanup-2008/milena/mln/geom/shift.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/shift.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/geom/shift.hh (revision 2226) @@ -34,6 +34,7 @@ */ # include <mln/core/window.hh> +# include <mln/convert/to.hh> @@ -60,7 +61,7 @@ window<mln_dpoint(W)> tmp; mln_qiter(W) q(win, P::origin); for_all(q) - tmp.insert(convert::to_dpoint(q) + dp); + tmp.insert(convert::to(q) + dp); return tmp; } Index: branches/cleanup-2008/milena/mln/win/line.hh =================================================================== --- branches/cleanup-2008/milena/mln/win/line.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/win/line.hh (revision 2226) @@ -58,16 +58,16 @@ */ template <typename M, unsigned i, typename C> struct line : public Window< line<M,i,C> >, - public internal::dpoints_base_<dpoint_<M, C>, point_<M, C> > + public internal::dpoints_base_<dpoint<M, C>, point<M, C> > { /// Point associated type. - typedef point_<M, int> point; + typedef point<M, int> point; /// Psite associated type. typedef point psite; /// Dpoint associated type. - typedef dpoint_<M, int> dpoint; + typedef dpoint<M, int> dpoint; /// Site_Iterator type to browse a line forward typedef dpoints_fwd_piter<dpoint> fwd_qiter; Index: branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh =================================================================== --- branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh (revision 2225) +++ branches/cleanup-2008/milena/mln/canvas/browsing/snake_fwd.hh (revision 2226) @@ -110,8 +110,8 @@ // p f.p = f.input.bbox().pmin(); - int& row = f.p.row(); - int& col = f.p.col(); + def::coord& row = f.p.row(); + def::coord& col = f.p.col(); // initialization trace::entering("canvas::browsing::snake_fwd::init");

1 0

cleanup-2008 2225: Propagate a few renamings to some test code.
by Thierry Geraud 12 Sep '08

12 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Propagate a few renamings to some test code. * tests/core/site_set/p_queue_fast.cc, * tests/core/site_set/p_priority_queue_fast.cc, * tests/core/site_set/p_queue.cc, * tests/core/site_set/p_priority_queue.cc, * tests/core/site_set/p_runs.cc, * tests/core/site_set/p_image2d.cc, * tests/core/site_set/pset_array.cc, * tests/core/site_set/pset_if.cc, * tests/core/site_set/p_priority_queue_fast_with_array.cc, * tests/core/site_set/p_set.cc, * tests/core/other/neighb.cc, * tests/core/other/pixter2d.cc, * tests/core/other/pixter3d.cc, * tests/core/image/complex_image.cc, * tests/core/image/image3d.cc, * tests/core/image/image_if.cc, * tests/draw/line.cc, * tests/level/median_fast.cc, * tests/border/mirror_full.cc, * tests/border/duplicate_full.cc, * tests/border/fill_full.cc, * tests/border/mirror.cc, * tests/border/duplicate.cc, * tests/border/fill.cc, * tests/convert/to_p_set.cc, * tests/convert/to_p_array.cc, * tests/util/lemmings.cc, * tests/labeling/level.cc (npoints): Update to... (nsites): ...this. (image::operator[]): Update to... (image::element): ...this. (mln_point): Update to... (mln_site): ...this. border/duplicate.cc | 52 +++++----- border/duplicate_full.cc | 6 - border/fill.cc | 4 border/fill_full.cc | 24 ++-- border/mirror.cc | 108 +++++++++++----------- border/mirror_full.cc | 6 - convert/to_p_array.cc | 4 convert/to_p_set.cc | 4 core/image/complex_image.cc | 2 core/image/image3d.cc | 6 - core/image/image_if.cc | 2 core/other/neighb.cc | 2 core/other/pixter2d.cc | 4 core/other/pixter3d.cc | 4 core/site_set/p_image2d.cc | 6 - core/site_set/p_priority_queue.cc | 12 +- core/site_set/p_priority_queue_fast.cc | 12 +- core/site_set/p_priority_queue_fast_with_array.cc | 18 +-- core/site_set/p_queue.cc | 8 - core/site_set/p_queue_fast.cc | 8 - core/site_set/p_runs.cc | 6 - core/site_set/p_set.cc | 6 - core/site_set/pset_array.cc | 4 core/site_set/pset_if.cc | 4 draw/line.cc | 2 labeling/level.cc | 2 level/median_fast.cc | 2 util/lemmings.cc | 20 ++-- 28 files changed, 169 insertions(+), 169 deletions(-) Index: tests/core/site_set/p_queue_fast.cc --- tests/core/site_set/p_queue_fast.cc (revision 2224) +++ tests/core/site_set/p_queue_fast.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -44,14 +44,14 @@ .push(make::point2d(6, 9)) .push(make::point2d(5, 1)) .push(make::point2d(4, 2)); - mln_assertion(q.npoints() == 3); + mln_assertion(q.nsites() == 3); std::cout << q.bbox() << std::endl; std::cout << q << std::endl; q.pop(); - mln_assertion(q.npoints() == 2); + mln_assertion(q.nsites() == 2); point2d p = q.front(); - mln_assertion(q.npoints() == 2); + mln_assertion(q.nsites() == 2); mln_assertion(p == make::point2d(5, 1)); } Index: tests/core/site_set/p_priority_queue_fast.cc --- tests/core/site_set/p_priority_queue_fast.cc (revision 2224) +++ tests/core/site_set/p_priority_queue_fast.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -44,7 +44,7 @@ mln_assertion (q.is_empty ()); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); q.push_force (p3); q.push_force (p1, 3); @@ -59,7 +59,7 @@ mln_assertion (q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 3); + mln_assertion (q.nsites() == 3); mln_assertion (q.front () == p2); q.pop (); @@ -67,7 +67,7 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 2); + mln_assertion (q.nsites() == 2); mln_assertion (q.front () == p1); q.pop (); @@ -75,14 +75,14 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 1); + mln_assertion (q.nsites() == 1); mln_assertion (q.front () == p3); q.pop (); mln_assertion (!q.has (p1)); mln_assertion (!q.has (p2)); mln_assertion (!q.has (p3)); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); mln_assertion (q.is_empty ()); Index: tests/core/site_set/p_queue.cc --- tests/core/site_set/p_queue.cc (revision 2224) +++ tests/core/site_set/p_queue.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -44,14 +44,14 @@ .push(make::point2d(6, 9)) .push(make::point2d(5, 1)) .push(make::point2d(4, 2)); - mln_assertion(q.npoints() == 3); + mln_assertion(q.nsites() == 3); std::cout << q.bbox() << std::endl; std::cout << q << std::endl; q.pop(); - mln_assertion(q.npoints() == 2); + mln_assertion(q.nsites() == 2); point2d p = q.front(); - mln_assertion(q.npoints() == 2); + mln_assertion(q.nsites() == 2); mln_assertion(p == make::point2d(5, 1)); } Index: tests/core/site_set/p_priority_queue.cc --- tests/core/site_set/p_priority_queue.cc (revision 2224) +++ tests/core/site_set/p_priority_queue.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -44,7 +44,7 @@ mln_assertion (q.is_empty ()); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); q.push_force (p3); q.push_force (p1, 3); @@ -59,7 +59,7 @@ mln_assertion (q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 3); + mln_assertion (q.nsites() == 3); mln_assertion (q.front () == p2); q.pop (); @@ -67,7 +67,7 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 2); + mln_assertion (q.nsites() == 2); mln_assertion (q.front () == p1); q.pop (); @@ -75,14 +75,14 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 1); + mln_assertion (q.nsites() == 1); mln_assertion (q.front () == p3); q.pop (); mln_assertion (!q.has (p1)); mln_assertion (!q.has (p2)); mln_assertion (!q.has (p3)); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); mln_assertion (q.is_empty ()); Index: tests/core/site_set/p_runs.cc --- tests/core/site_set/p_runs.cc (revision 2224) +++ tests/core/site_set/p_runs.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -61,10 +61,10 @@ p_runs_<point2d> ps2; ps.insert(p_run<point2d>(p, 7)); - mln_assertion(ps.npoints() == 7); + mln_assertion(ps.nsites() == 7); ps.insert(p_run<point2d>(q, 5)); - mln_assertion(ps.npoints() == 12); + mln_assertion(ps.nsites() == 12); ps.insert(p_run<point2d>(r, 2)); Index: tests/core/site_set/p_image2d.cc --- tests/core/site_set/p_image2d.cc (revision 2224) +++ tests/core/site_set/p_image2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,7 +43,7 @@ .insert(make::point2d(4, 2)) .insert(make::point2d(4, 2)) .insert(make::point2d(5, 1)); - mln_assertion(ps.npoints() == 3); + mln_assertion(ps.nsites() == 3); ps.remove(make::point2d(5, 1)); ps.remove(make::point2d(5, 1)); @@ -51,7 +51,7 @@ ps.remove(make::point2d(6, 9)); ps.remove(make::point2d(4, 2)); - mln_assertion(ps.npoints() == 0); + mln_assertion(ps.nsites() == 0); mln_assertion(ps.is_empty()); std::cout << ps << std::endl; Index: tests/core/site_set/pset_array.cc --- tests/core/site_set/pset_array.cc (revision 2224) +++ tests/core/site_set/pset_array.cc (working copy) @@ -64,11 +64,11 @@ assert(array.npsets() == 0); array.insert(pruns0); assert(array.npsets() == 1); - assert(array.npoints() == 2); + assert(array.nsites() == 2); array.insert(pruns2); assert(array.npsets() == 2); - assert(array.npoints() == 7); + assert(array.nsites() == 7); array.insert(pruns1); Index: tests/core/site_set/pset_if.cc --- tests/core/site_set/pset_if.cc (revision 2224) +++ tests/core/site_set/pset_if.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,7 +43,7 @@ using namespace mln; box2d box_8x8 = make::box2d(8, 8); - mln_assertion((box_8x8 | fun::p2b::chess).npoints() == 32); + mln_assertion((box_8x8 | fun::p2b::chess).nsites() == 32); { p_set<point2d> s = convert::to_p_set(box_8x8 | fun::p2b::chess); Index: tests/core/site_set/p_priority_queue_fast_with_array.cc --- tests/core/site_set/p_priority_queue_fast_with_array.cc (revision 2224) +++ tests/core/site_set/p_priority_queue_fast_with_array.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,19 +43,19 @@ point2d p3 (4, 2); mln_assertion (q.is_empty ()); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); q.push_force (p3); mln_assertion (!q.is_empty ()); - mln_assertion (q.npoints () == 1); + mln_assertion (q.nsites() == 1); q.push_force (p1, 3); mln_assertion (!q.is_empty ()); - mln_assertion (q.npoints () == 2); + mln_assertion (q.nsites() == 2); q.push_force (p2, 5); mln_assertion (!q.is_empty ()); - mln_assertion (q.npoints () == 3); + mln_assertion (q.nsites() == 3); std::cout << q.bbox () << std::endl; std::cout << q << std::endl; @@ -66,7 +66,7 @@ mln_assertion (q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 3); + mln_assertion (q.nsites() == 3); mln_assertion (q.front () == p2); q.pop (); @@ -74,7 +74,7 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 2); + mln_assertion (q.nsites() == 2); mln_assertion (q.front () == p1); q.pop (); @@ -82,14 +82,14 @@ mln_assertion (!q.has (p2)); mln_assertion (q.has (p3)); - mln_assertion (q.npoints () == 1); + mln_assertion (q.nsites() == 1); mln_assertion (q.front () == p3); q.pop (); mln_assertion (!q.has (p1)); mln_assertion (!q.has (p2)); mln_assertion (!q.has (p3)); - mln_assertion (q.npoints () == 0); + mln_assertion (q.nsites() == 0); mln_assertion (q.is_empty ()); Index: tests/core/site_set/p_set.cc --- tests/core/site_set/p_set.cc (revision 2224) +++ tests/core/site_set/p_set.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -47,7 +47,7 @@ .insert(make::point2d(4, 2)) .insert(make::point2d(4, 2)) .insert(make::point2d(5, 1)); - mln_assertion(ps.npoints() == 3); + mln_assertion(ps.nsites() == 3); std::cout << ps.bbox() << std::endl; std::copy(ps.vect().begin(), ps.vect().end(), @@ -55,7 +55,7 @@ std::cout << std::endl; ps.remove(make::point2d(4, 2)); - mln_assertion(ps.npoints() == 2); + mln_assertion(ps.nsites() == 2); std::cout << ps.bbox() << std::endl; std::copy(ps.vect().begin(), ps.vect().end(), Index: tests/core/other/neighb.cc --- tests/core/other/neighb.cc (revision 2224) +++ tests/core/other/neighb.cc (working copy) @@ -35,7 +35,7 @@ using namespace mln; template <typename N> -void test(const Neighborhood<N>& nbh, const mln_point(N)& p_ref, +void test(const Neighborhood<N>& nbh, const mln_site(N)& p_ref, unsigned size) { mln_niter(N) n(nbh, p_ref); Index: tests/core/other/pixter2d.cc --- tests/core/other/pixter2d.cc (revision 2224) +++ tests/core/other/pixter2d.cc (working copy) @@ -63,7 +63,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } { @@ -79,7 +79,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } } } Index: tests/core/other/pixter3d.cc --- tests/core/other/pixter3d.cc (revision 2224) +++ tests/core/other/pixter3d.cc (working copy) @@ -64,7 +64,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } { @@ -80,7 +80,7 @@ p.next(); ++i; } - mln_assertion(i == b.npoints()); + mln_assertion(i == b.nsites()); } } } Index: tests/core/image/complex_image.cc --- tests/core/image/complex_image.cc (revision 2224) +++ tests/core/image/complex_image.cc (working copy) @@ -136,7 +136,7 @@ typename mln::complex_image<D, P, V>::lvalue mln::complex_image<D, P, V>::operator()(const mln::complex_psite<D, P>&) [with unsigned int D = 2u, - P = mln::point_<mln::grid::square, int>, + P = mln::point<mln::grid::square, int>, V = mln::value::int_u<8u>]: Assertion `this->data_->pc_.has(p)' failed. Index: tests/core/image/image3d.cc --- tests/core/image/image3d.cc (revision 2224) +++ tests/core/image/image3d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -45,8 +45,8 @@ image3d<int> f(nslis, nrows, ncols, border); - mln_assertion(f.npoints() == geom::nslis(f) * geom::nrows(f) * geom::ncols(f)); - mln_assertion(f.ncells() == ((nrows + 2 * border) + mln_assertion(f.nsites() == geom::nslis(f) * geom::nrows(f) * geom::ncols(f)); + mln_assertion(f.nelements() == ((nrows + 2 * border) * (ncols + 2 * border) * (nslis + 2 * border))); } Index: tests/core/image/image_if.cc --- tests/core/image/image_if.cc (revision 2224) +++ tests/core/image/image_if.cc (working copy) @@ -44,7 +44,7 @@ I ima(8, 8); // debug::println(ima | fun::p2b::chess); // FIXME: is this line corret? - ///mln_assertion((ima | fun::p2b::chess).npoints() == 32); + ///mln_assertion((ima | fun::p2b::chess).nsites() == 32); { typedef image_if<I, fun::p2b::chess_t> II; Index: tests/draw/line.cc --- tests/draw/line.cc (revision 2224) +++ tests/draw/line.cc (working copy) @@ -48,7 +48,7 @@ point2d b = make::point2d(0,0), e = make::point2d(6,9); line2d l(b, e); - mln_assertion(l.npoints() == 10); + mln_assertion(l.nsites() == 10); image2d<bool> ima(10,10); level::fill(ima, false); Index: tests/level/median_fast.cc --- tests/level/median_fast.cc (revision 2224) +++ tests/level/median_fast.cc (working copy) @@ -53,7 +53,7 @@ template <typename I, typename W> void test(I& input, const W& win) { - mln_point(I) p; + mln_site(I) p; p.row() = p.col() = 1; { Index: tests/border/mirror_full.cc --- tests/border/mirror_full.cc (revision 2224) +++ tests/border/mirror_full.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -51,7 +51,7 @@ border::mirror(ima); for (int i = 0; i < c; ++i) - mln_assertion(ima[i] == ref[i]); + mln_assertion(ima.element(i) == ref[i]); } template <typename T> @@ -65,7 +65,7 @@ border::mirror(ima); for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == ref[i]); + mln_assertion(ima.element(i) == ref[i]); } } Index: tests/border/duplicate_full.cc --- tests/border/duplicate_full.cc (revision 2224) +++ tests/border/duplicate_full.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -50,7 +50,7 @@ border::duplicate(ima); for (int i = 0; i < c; ++i) - mln_assertion(ima[i] == ref[i]); + mln_assertion(ima.element(i) == ref[i]); } template <typename T> @@ -64,7 +64,7 @@ border::duplicate(ima); for (int i = 0; i < c * r; ++i) - mln_assertion(ima[i] == ref[i]); + mln_assertion(ima.element(i) == ref[i]); } } Index: tests/border/fill_full.cc --- tests/border/fill_full.cc (revision 2224) +++ tests/border/fill_full.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -58,13 +58,13 @@ unsigned i = 0; for(i = 0; i < border; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); unsigned bo = border + row; for(; i < bo; ++i) - mln_assertion (ima[i] == v); + mln_assertion (ima.element(i) == v); bo += border; for(; i < bo; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); } template <typename T> @@ -83,18 +83,18 @@ unsigned ww = r * c; for(i = 0; i < bo; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); bo += c * row; for(; i < bo; ++i) { unsigned cur = i % c; if (cur < border || cur >= u) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); else - mln_assertion (ima[i] == v); + mln_assertion (ima.element(i) == v); } for(; i < ww; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); } template <typename T> @@ -113,18 +113,18 @@ unsigned ww = r * c; for(i = 0; i < bo; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); bo += c * row; for(; i < bo; ++i) { unsigned cur = i % c; if (cur < border || cur >= u) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); else - mln_assertion (ima[i] == v); + mln_assertion (ima.element(i) == v); } for(; i < ww; ++i) - mln_assertion (ima[i] == value); + mln_assertion (ima.element(i) == value); } Index: tests/border/mirror.cc --- tests/border/mirror.cc (revision 2224) +++ tests/border/mirror.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,17 +43,17 @@ main (void) { { - image1d<int> im(2, 3); - debug::iota(im); - border::mirror(im); - mln_assertion(im[0] == 2); - mln_assertion(im[1] == 2); - mln_assertion(im[2] == 1); - mln_assertion(im[3] == 1); - mln_assertion(im[4] == 2); - mln_assertion(im[5] == 2); - mln_assertion(im[6] == 1); - mln_assertion(im[7] == 1); + image1d<int> ima(2, 3); + debug::iota(ima); + border::mirror(ima); + mln_assertion(ima.element(0) == 2); + mln_assertion(ima.element(1) == 2); + mln_assertion(ima.element(2) == 1); + mln_assertion(ima.element(3) == 1); + mln_assertion(ima.element(4) == 2); + mln_assertion(ima.element(5) == 2); + mln_assertion(ima.element(6) == 1); + mln_assertion(ima.element(7) == 1); } @@ -62,47 +62,47 @@ debug::iota(ima); border::mirror(ima); - mln_assertion(ima[ 0] == 1); - mln_assertion(ima[ 1] == 1); - mln_assertion(ima[ 2] == 4); - mln_assertion(ima[ 3] == 5); - mln_assertion(ima[ 4] == 6); - mln_assertion(ima[ 5] == 3); - mln_assertion(ima[ 6] == 3); - mln_assertion(ima[ 7] == 1); - mln_assertion(ima[ 8] == 1); - mln_assertion(ima[ 9] == 1); - mln_assertion(ima[10] == 2); - mln_assertion(ima[11] == 3); - mln_assertion(ima[12] == 3); - mln_assertion(ima[13] == 3); - mln_assertion(ima[14] == 2); - mln_assertion(ima[15] == 1); - mln_assertion(ima[16] == 1); - mln_assertion(ima[17] == 2); - mln_assertion(ima[18] == 3); - mln_assertion(ima[19] == 3); - mln_assertion(ima[20] == 2); - mln_assertion(ima[21] == 5); - mln_assertion(ima[22] == 4); - mln_assertion(ima[23] == 4); - mln_assertion(ima[24] == 5); - mln_assertion(ima[25] == 6); - mln_assertion(ima[26] == 6); - mln_assertion(ima[27] == 5); - mln_assertion(ima[28] == 4); - mln_assertion(ima[29] == 4); - mln_assertion(ima[30] == 4); - mln_assertion(ima[31] == 5); - mln_assertion(ima[32] == 6); - mln_assertion(ima[33] == 6); - mln_assertion(ima[34] == 6); - mln_assertion(ima[35] == 4); - mln_assertion(ima[36] == 4); - mln_assertion(ima[37] == 1); - mln_assertion(ima[38] == 2); - mln_assertion(ima[39] == 3); - mln_assertion(ima[40] == 6); - mln_assertion(ima[41] == 6); + mln_assertion(ima.element( 0) == 1); + mln_assertion(ima.element( 1) == 1); + mln_assertion(ima.element( 2) == 4); + mln_assertion(ima.element( 3) == 5); + mln_assertion(ima.element( 4) == 6); + mln_assertion(ima.element( 5) == 3); + mln_assertion(ima.element( 6) == 3); + mln_assertion(ima.element( 7) == 1); + mln_assertion(ima.element( 8) == 1); + mln_assertion(ima.element( 9) == 1); + mln_assertion(ima.element(10) == 2); + mln_assertion(ima.element(11) == 3); + mln_assertion(ima.element(12) == 3); + mln_assertion(ima.element(13) == 3); + mln_assertion(ima.element(14) == 2); + mln_assertion(ima.element(15) == 1); + mln_assertion(ima.element(16) == 1); + mln_assertion(ima.element(17) == 2); + mln_assertion(ima.element(18) == 3); + mln_assertion(ima.element(19) == 3); + mln_assertion(ima.element(20) == 2); + mln_assertion(ima.element(21) == 5); + mln_assertion(ima.element(22) == 4); + mln_assertion(ima.element(23) == 4); + mln_assertion(ima.element(24) == 5); + mln_assertion(ima.element(25) == 6); + mln_assertion(ima.element(26) == 6); + mln_assertion(ima.element(27) == 5); + mln_assertion(ima.element(28) == 4); + mln_assertion(ima.element(29) == 4); + mln_assertion(ima.element(30) == 4); + mln_assertion(ima.element(31) == 5); + mln_assertion(ima.element(32) == 6); + mln_assertion(ima.element(33) == 6); + mln_assertion(ima.element(34) == 6); + mln_assertion(ima.element(35) == 4); + mln_assertion(ima.element(36) == 4); + mln_assertion(ima.element(37) == 1); + mln_assertion(ima.element(38) == 2); + mln_assertion(ima.element(39) == 3); + mln_assertion(ima.element(40) == 6); + mln_assertion(ima.element(41) == 6); } Index: tests/border/duplicate.cc --- tests/border/duplicate.cc (revision 2224) +++ tests/border/duplicate.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -45,31 +45,31 @@ debug::iota (ima); border::duplicate (ima); - mln_assertion(ima[ 0] == 1); - mln_assertion(ima[ 1] == 1); - mln_assertion(ima[ 2] == 2); - mln_assertion(ima[ 3] == 3); - mln_assertion(ima[ 4] == 3); - mln_assertion(ima[ 5] == 1); - mln_assertion(ima[ 6] == 1); - mln_assertion(ima[ 7] == 2); - mln_assertion(ima[ 8] == 3); - mln_assertion(ima[ 9] == 3); - mln_assertion(ima[10] == 4); - mln_assertion(ima[11] == 4); - mln_assertion(ima[12] == 5); - mln_assertion(ima[13] == 6); - mln_assertion(ima[14] == 6); - mln_assertion(ima[15] == 7); - mln_assertion(ima[16] == 7); - mln_assertion(ima[17] == 8); - mln_assertion(ima[18] == 9); - mln_assertion(ima[19] == 9); - mln_assertion(ima[20] == 7); - mln_assertion(ima[21] == 7); - mln_assertion(ima[22] == 8); - mln_assertion(ima[23] == 9); - mln_assertion(ima[24] == 9); + mln_assertion(ima.element( 0) == 1); + mln_assertion(ima.element( 1) == 1); + mln_assertion(ima.element( 2) == 2); + mln_assertion(ima.element( 3) == 3); + mln_assertion(ima.element( 4) == 3); + mln_assertion(ima.element( 5) == 1); + mln_assertion(ima.element( 6) == 1); + mln_assertion(ima.element( 7) == 2); + mln_assertion(ima.element( 8) == 3); + mln_assertion(ima.element( 9) == 3); + mln_assertion(ima.element(10) == 4); + mln_assertion(ima.element(11) == 4); + mln_assertion(ima.element(12) == 5); + mln_assertion(ima.element(13) == 6); + mln_assertion(ima.element(14) == 6); + mln_assertion(ima.element(15) == 7); + mln_assertion(ima.element(16) == 7); + mln_assertion(ima.element(17) == 8); + mln_assertion(ima.element(18) == 9); + mln_assertion(ima.element(19) == 9); + mln_assertion(ima.element(20) == 7); + mln_assertion(ima.element(21) == 7); + mln_assertion(ima.element(22) == 8); + mln_assertion(ima.element(23) == 9); + mln_assertion(ima.element(24) == 9); } Index: tests/border/fill.cc --- tests/border/fill.cc (revision 2224) +++ tests/border/fill.cc (working copy) @@ -48,11 +48,11 @@ border::fill (ima, 42); for(int i = 0; i < ww; ++i) if ((i / w < border) || (i / w > border + size)) - mln_assertion (ima[i] == 42u); + mln_assertion (ima.element(i) == 42u); else if ((i % w < border) && (border + size <= i % w)) - mln_assertion (ima[i] == 42u); + mln_assertion (ima.element(i) == 42u); } int Index: tests/convert/to_p_set.cc --- tests/convert/to_p_set.cc (revision 2224) +++ tests/convert/to_p_set.cc (working copy) @@ -46,8 +46,8 @@ void test(p_set<point2d> ref, p_set<point2d> cmp) { - mln_assertion(ref.npoints() == cmp.npoints()); - for (unsigned i = 0; i < ref.npoints(); ++i) + mln_assertion(ref.nsites() == cmp.nsites()); + for (unsigned i = 0; i < ref.nsites(); ++i) mln_assertion(ref[i] == cmp[i]); } Index: tests/convert/to_p_array.cc --- tests/convert/to_p_array.cc (revision 2224) +++ tests/convert/to_p_array.cc (working copy) @@ -48,7 +48,7 @@ win::segment1d win1d(5); vec1d v1(convert::to_p_array(win1d, p1)); - for (size_t i=0; i < v1.npoints(); i++) + for (size_t i=0; i < v1.nsites(); i++) std::cout << (v1[i]); std::cout << "\n"; @@ -58,7 +58,7 @@ win::rectangle2d win2d(3, 3); vec2d v2(convert::to_p_array(win2d, p2)); - for (size_t i=0; i < v2.npoints(); i++) + for (size_t i=0; i < v2.nsites(); i++) std::cout << (v2[i]); } Index: tests/util/lemmings.cc --- tests/util/lemmings.cc (revision 2224) +++ tests/util/lemmings.cc (working copy) @@ -48,11 +48,11 @@ I ima = make::image2d<int>(vals); - mln_point_(I) pt1(1, 0); - mln_point_(I) pt2(0, 2); - mln_point_(I) pt3(2, 3); - mln_point_(I) pt4(3, 1); - mln_point_(I) pt5(1, 1); + mln_site_(I) pt1(1, 0); + mln_site_(I) pt2(0, 2); + mln_site_(I) pt3(2, 3); + mln_site_(I) pt4(3, 1); + mln_site_(I) pt5(1, 1); mln_value_(I) vl1 = ima(pt1); mln_value_(I) vl2 = ima(pt2); @@ -60,11 +60,11 @@ mln_value_(I) vl4 = ima(pt4); mln_value_(I) vl5 = ima(pt5); - mln_point_(I) ptl1 = util::lemmings(ima, pt1, right, vl1); - mln_point_(I) ptl2 = util::lemmings(ima, pt2, down, vl2); - mln_point_(I) ptl3 = util::lemmings(ima, pt3, left, vl3); - mln_point_(I) ptl4 = util::lemmings(ima, pt4, up, vl4); - mln_point_(I) ptl5 = util::lemmings(ima, pt5, up, vl5); + mln_site_(I) ptl1 = util::lemmings(ima, pt1, right, vl1); + mln_site_(I) ptl2 = util::lemmings(ima, pt2, down, vl2); + mln_site_(I) ptl3 = util::lemmings(ima, pt3, left, vl3); + mln_site_(I) ptl4 = util::lemmings(ima, pt4, up, vl4); + mln_site_(I) ptl5 = util::lemmings(ima, pt5, up, vl5); mln_assertion(ptl1 == point2d(1, 2)); mln_assertion(ptl2 == point2d(2, 2)); Index: tests/labeling/level.cc --- tests/labeling/level.cc (revision 2224) +++ tests/labeling/level.cc (working copy) @@ -63,5 +63,5 @@ accu::compute<accu::count>(labels | (pw::value(labels) != pw::cst(0u))); npixels += npix; } - mln_assertion(npixels == lena.npoints()); + mln_assertion(npixels == lena.nsites()); }

1 0