- Olena-patches

695: Add oln::morpher::stack_rw.
by Thierry GERAUD 06 Nov '06

06 Nov '06

2006-11-06 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> Add morpher::stack_rw. * olena/tests/morphers/stack_rw_morpher.cc: New. * olena/tests/morphers/Makefile.am: Update. * olena/oln/morpher/stack_rw.hh: New. * olena/oln/Makefile.am: Update. * olena/oln/debug/print.hh (print): Store loop 2D bounds. * olena/oln/core/abstract/functions.hh (fun_rw): New. * olena/oln/morpher/two_way.hh (ima_): Change type to pointer. (two_way): New ctor for class value::two_way. (read_, write_): New methods. (operator, value): Call read_. (operator=): Call write_. * olena/oln/morpher/stack.hh (N): New. * olena/oln/value/two_way.hh (two_way): New ctor decl. (ima_): Change type to pointer. (read_, write_): New method decls. Index: olena/tests/morphers/Makefile.am =================================================================== --- olena/tests/morphers/Makefile.am (revision 694) +++ olena/tests/morphers/Makefile.am (working copy) @@ -24,6 +24,7 @@ count_rw_morpher \ slice_morpher \ stack_morpher \ + stack_rw_morpher \ two_way_morpher \ value_cast \ with_lut \ @@ -36,6 +37,7 @@ count_rw_morpher_SOURCES = count_rw_morpher.cc slice_morpher_SOURCES = slice_morpher.cc stack_morpher_SOURCES = stack_morpher.cc +stack_rw_morpher_SOURCES = stack_rw_morpher.cc two_way_morpher_SOURCES = two_way_morpher.cc value_cast_SOURCES = value_cast.cc with_lut_SOURCES = with_lut.cc Index: olena/tests/morphers/stack_rw_morpher.cc =================================================================== --- olena/tests/morphers/stack_rw_morpher.cc (revision 0) +++ olena/tests/morphers/stack_rw_morpher.cc (revision 0) @@ -0,0 +1,59 @@ +// Copyright (C) 2006 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// Test the "read-write stack morpher". + +#include <cassert> + +#include <oln/core/traits.hh> +#include <oln/basics2d.hh> +#include <oln/morpher/stack_rw.hh> +#include <oln/debug/print.hh> + + + +int main() +{ + using namespace oln; + using xtd::vec; + using xtd::mk_vec; + + typedef image2d<int> I; + typedef vec<2,int> vec_t; + + I ima_0(3, 3); + I ima_1(3, 3); + point2d p(0,0); + + morpher::stack_rw<2,I> ima_v = stack_rw(ima_0, ima_1); + + ima_v(p) = mk_vec(5, 1); + debug::print(ima_v); + + std::cout << ima_v(p) << std::endl; + std::cout << ima_0(p) << ' ' << ima_1(p) << std::endl; +} Index: olena/oln/debug/print.hh =================================================================== --- olena/oln/debug/print.hh (revision 694) +++ olena/oln/debug/print.hh (working copy) @@ -86,9 +86,15 @@ void print(const abstract::classical_2d_image& input, std::ostream& ostr) { - for (int row = min_row(input); row <= max_row(input); ++row) + const oln_coord(I) + min_row = oln::min_row(input), + max_row = oln::max_row(input); + for (oln_coord(I) row = min_row; row <= max_row; ++row) { - for (int col = min_col(input); col <= max_col(input); ++col) + const oln_coord(I) + min_col = oln::min_col(input), + max_col = oln::max_col(input); + for (oln_coord(I) col = min_col; col <= max_col; ++col) { point2d p(row, col); if (input.has(p)) Index: olena/oln/core/abstract/functions.hh =================================================================== --- olena/oln/core/abstract/functions.hh (revision 694) +++ olena/oln/core/abstract/functions.hh (working copy) @@ -39,9 +39,8 @@ // Fwd decl. - namespace morpher { - template <typename I, typename F> class two_way; - } + namespace morpher { template <typename I, typename F> class two_way; } + namespace value { template <typename I, typename F> class two_way; } namespace abstract @@ -76,14 +75,33 @@ public oln::type { public: + template <typename I> oln::morpher::two_way<I, E> operator()(oln::abstract::mutable_image& input) const; + protected: fun_v2w2v(); }; + // FIXME: Value1 -> Value2 *and* Value2 -> Value1. + + template <typename E> + struct fun_rw : public virtual stc::any__simple<E>, + public oln::type + { + public: + + template <typename I> + oln::morpher::two_way<I, E> + operator()(oln::abstract::mutable_image& input) const; + + protected: + fun_rw(); + }; + + // Point -> Point. template <typename E> @@ -113,6 +131,11 @@ } template <typename E> + fun_rw<E>::fun_rw() + { + } + + template <typename E> fun_p2p<E>::fun_p2p() { } Index: olena/oln/Makefile.am =================================================================== --- olena/oln/Makefile.am (revision 694) +++ olena/oln/Makefile.am (working copy) @@ -190,6 +190,7 @@ morpher/tags.hh \ morpher/slice.hh \ morpher/stack.hh \ + morpher/stack_rw.hh \ morpher/thru_fun.hh \ morpher/thru_mfun.hh \ morpher/two_way.hh \ Index: olena/oln/morpher/two_way.hh =================================================================== --- olena/oln/morpher/two_way.hh (revision 694) +++ olena/oln/morpher/two_way.hh (working copy) @@ -170,18 +170,28 @@ two_way<I,F>::two_way(I& ima, F fun, const oln_psite(I)& p) - : ima_(ima), + : ima_(&ima), fun_(fun), p_(p) { } + // Ctor. + template <typename I, typename F> + two_way<I,F>::two_way(I& ima, + const oln_psite(I)& p) + : ima_(&ima), + fun_(), + p_(p) + { + } + // Read. template <typename I, typename F> template <typename V> two_way<I,F>::operator V() const { - return fun_.direct(ima_(p_)); + return read_(fun_); } // Explicit read. @@ -189,7 +199,7 @@ typename F::result_type two_way<I,F>::value() const { - return fun_.direct(ima_(p_)); + return read_(fun_); } // Write. @@ -199,10 +209,47 @@ two_way<I,F>& two_way<I,F>::operator=(const V& value) { - ima_(p_) = fun_.reverse(value); + write_(fun_, value); return *this; } + // fun_v2w2v + + template <typename I, typename F> + template <typename E, typename V> + void + two_way<I,F>::write_(const oln::abstract::fun_v2w2v<E>& f, const V& value) + { + (*ima_)(p_) = f.exact().reverse(value); + } + + template <typename I, typename F> + template <typename E> + typename E::result_type + two_way<I,F>::read_(const oln::abstract::fun_v2w2v<E>& f) const + { + return f.exact().direct((*ima_)(p_)); + } + + // fun_rw + + template <typename I, typename F> + template <typename E, typename V> + void + two_way<I,F>::write_(const oln::abstract::fun_rw<E>& f, const V& value) + { + f.exact().write(*ima_, p_, value); + } + + template <typename I, typename F> + template <typename E> + typename E::result_type + two_way<I,F>::read_(const oln::abstract::fun_rw<E>& f) const + { + return f.exact().read(*ima_, p_); + } + + // Op <<. template <typename I, typename F> std::ostream& operator<<(std::ostream& ostr, Index: olena/oln/morpher/stack.hh =================================================================== --- olena/oln/morpher/stack.hh (revision 694) +++ olena/oln/morpher/stack.hh (working copy) @@ -82,6 +82,8 @@ public: + enum { N = n }; // FIXME: Hum... + stack(const xtd::vec<n, I>& images); xtd::vec<n, oln_value(I)> impl_op_read(const psite_t& p) const; Index: olena/oln/morpher/stack_rw.hh =================================================================== --- olena/oln/morpher/stack_rw.hh (revision 0) +++ olena/oln/morpher/stack_rw.hh (revision 0) @@ -0,0 +1,248 @@ +// Copyright (C) 2006 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_MORPHER_STACK_RW_HH +# define OLN_MORPHER_STACK_RW_HH + +# include <xtd/vec.hh> +# include <oln/value/two_way.hh> +# include <oln/morpher/two_way.hh> +# include <oln/morpher/internal/image_value_morpher.hh> + + + +namespace oln +{ + + namespace morpher + { + // Forward declaration. + template <unsigned n, typename I> struct stack_rw; + + } // end of namespace oln::morpher + + + template <unsigned n, typename T> + struct rwvec : public oln::abstract::fun_rw< rwvec<n,T> > + { + typedef xtd::vec<n,T> result_type; + + template <typename I> + xtd::vec<n,T> read(const I& input, const oln_point(I)& p) const + { + return input(p); + } + + template <typename I> + void write(I& input, const oln_point(I)& p, const xtd::vec<n,T>& v) const + { + for (unsigned i = 0; i < I::N; ++i) + input.image(i)(p) = v[i]; + } + }; + + + /// Super type. + template <unsigned n, typename I> + struct set_super_type< morpher::stack_rw<n, I> > + { + typedef morpher::stack_rw<n, I> self_t; + typedef morpher::internal::image_value_morpher<I, self_t> ret; + }; + + template <unsigned n, typename I> + struct vtypes< morpher::stack_rw<n, I> > + { + typedef morpher::stack_rw<n, I> self_t; + typedef rwvec<n, oln_value(I)> fun_t; + public: + typedef mlc::true_ is_computed_type; + typedef xtd::vec<n, oln_value(I)> value_type; + }; + + template <unsigned n, typename I> + struct single_vtype< morpher::stack_rw<n, I>, typedef_::lvalue_type > + { + typedef morpher::stack_rw<n, I> self_t; + typedef rwvec<n, oln_value(I)> fun_t; + typedef value::two_way<self_t, fun_t> ret; + }; + + template <unsigned n, typename I> + struct single_vtype< morpher::stack_rw<n, I>, typedef_::rvalue_type > + { + typedef xtd::vec<n, oln_value(I)> ret; + }; + + + + namespace morpher + { + + /// "Stack of images" morpher with "read-write" capabilities. + + template <unsigned n, typename I> + class stack_rw : public internal::image_value_morpher< I, stack_rw<n, I> > + { + private: + + typedef stack_rw<n, I> self_t; + typedef internal::image_value_morpher<I, self_t> super_t; + + typedef oln_psite(self_t) psite_t; + typedef oln_rvalue(self_t) rvalue_t; + typedef oln_lvalue(self_t) lvalue_t; + + public: + + enum { N = n }; // FIXME: Hum... + + stack_rw(const xtd::vec<n, I>& images); + + xtd::vec<n, oln_value(I)> impl_op_read(const psite_t& p) const; + lvalue_t impl_op_readwrite(const psite_t& p); + + const I& image(unsigned i) const; + I& image(unsigned i); + + protected: + xtd::vec<n, I> images_; + }; + + +# ifndef OLN_INCLUDE_ONLY + + template <unsigned n, typename I> + stack_rw<n, I>::stack_rw(const xtd::vec<n, I>& images) : + super_t(images[0]), + images_(images) + { + } + + template <unsigned n, typename I> + xtd::vec<n, oln_value(I)> + stack_rw<n, I>::impl_op_read(const typename stack_rw<n, I>::psite_t& p) const + { + xtd::vec<n, oln_value(I)> tmp; + for (unsigned i = 0; i < n; ++i) + tmp[i] = images_[i](p); + return tmp; + } + + template <unsigned n, typename I> + typename stack_rw<n, I>::lvalue_t + stack_rw<n, I>::impl_op_readwrite(const typename stack_rw<n, I>::psite_t& p) + { + lvalue_t tmp(*this, p); + return tmp; + } + + template <unsigned n, typename I> + const I& + stack_rw<n, I>::image(unsigned i) const + { + precondition(i < n); + return images_[i]; + } + + template <unsigned n, typename I> + I& + stack_rw<n, I>::image(unsigned i) + { + precondition(i < n); + return images_[i]; + } + +# endif + + } // end of namespace oln::morpher + + + template <typename I> + morpher::stack_rw<2, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1); + + template <typename I> + morpher::stack_rw<3, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1, + abstract::mutable_image& image_2); + + template <typename I> + morpher::stack_rw<4, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1, + abstract::mutable_image& image_2, + abstract::mutable_image& image_3); + + +# ifndef OLN_INCLUDE_ONLY + + + template <typename I> + morpher::stack_rw<2, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1) + { + morpher::stack_rw<2, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact())); + return tmp; + } + + template <typename I> + morpher::stack_rw<3, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1, + abstract::mutable_image& image_2) + { + morpher::stack_rw<3, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact(), + image_2.exact())); + return tmp; + } + + template <typename I> + morpher::stack_rw<4, I> + stack_rw(abstract::mutable_image& image_0, + abstract::mutable_image& image_1, + abstract::mutable_image& image_2, + abstract::mutable_image& image_3) + { + morpher::stack_rw<4, I> tmp(xtd::mk_vec(image_0.exact(), + image_1.exact(), + image_2.exact(), + image_3.exact())); + return tmp; + } + +# endif + +} // end of namespace oln + + +#endif // ! OLN_MORPHER_STACK_RW_HH Index: olena/oln/value/two_way.hh =================================================================== --- olena/oln/value/two_way.hh (revision 694) +++ olena/oln/value/two_way.hh (working copy) @@ -50,6 +50,10 @@ two_way(I& ima, F fun, const oln_psite(I)& p); + + // Ctor. + two_way(I& ima, + const oln_psite(I)& p); // Read. template <typename V> @@ -63,9 +67,32 @@ two_way<I,F>& operator=(const V& value); protected: - I ima_; + + I* ima_; F fun_; const oln_psite(I)& p_; + + private: + + // oln::abstract::fun_v2w2v + // Two-way function defined by "direct : v -> w" and "reverse : w -> v". + + template <typename E, typename V> + void write_(const oln::abstract::fun_v2w2v<E>& f, const V& value); + + template <typename E> + typename E::result_type + read_(const oln::abstract::fun_v2w2v<E>& f) const; + + // oln::abstract::fun_rw<E> + // Two-way function defined by "read(ima, p)" and "write(ima, p, v)" + + template <typename E, typename V> + void write_(const oln::abstract::fun_rw<E>& f, const V& value); + + template <typename E> + typename E::result_type + read_(const oln::abstract::fun_rw<E>& f) const; };

1 0

Re: [Olena-patches] 694: Add spaces in macros to please icpc.
by michael＠cadilhac.name 04 Nov '06

04 Nov '06

Roland Levillain <roland(a)lrde.epita.fr> writes: > /* Icpc chokes when expanding this macro when T is a template type: > T is substituted with no additional surrounding space, generating > a token `>>'. > > G++ has no such problem, but I haven't checked which is the right > behavior, required by the ISO standard. > > Note that this will no longer be a problem with C++ 0x, since > expressions like `Foo<Foo<int>>' will be valid. */ Dans le code de CPP on trouve la fonction suivante : /* Returns nonzero if a space should be inserted to avoid an accidental token paste for output. For simplicity, it is conservative, and occasionally advises a space where one is not needed, e.g. "." and ".2". */ int cpp_avoid_paste (cpp_reader *pfile, const cpp_token *token1, const cpp_token *token2) -- Utilisée dans l'outputing ici. avoid_paste est de gestion interne. /* Subtle logic to output a space if and only if necessary. */ if (avoid_paste) { if (print.source == NULL) print.source = token; if (print.source->flags & PREV_WHITE || (print.prev && cpp_avoid_paste (pfile, print.prev, token)) || (print.prev == NULL && token->type == CPP_HASH)) putc (' ', print.outf); } else if (token->flags & PREV_WHITE) putc (' ', print.outf); Il n'y a pas de commentaire sur le standard dans le code. Je n'ai d'ailleurs rien trouvé dans les standards. Il y en a un pour CPP ? -- /!\ My mail address changed, please update your files accordingly. | In a World without Walls and Fences, Michaël `Micha' Cadilhac | | who needs Windows and Gates? cadilh_m - Epita 2007 - CSI | | -- Dino Esposito JID: micha(a)amessage.be | `-- - - - - --'

1 0

Re: [Olena-patches] 694: Add spaces in macros to please icpc.
by Tsuna 04 Nov '06

04 Nov '06

On 2006-11-04, Roland Levillain <roland(a)lrde.epita.fr> wrote: > > % cat icpc-macro-issue.cc > template <typename T> > struct Foo > { > }; > > /* Icpc chokes when expanding this macro when T is a template type: > T is substituted with no additional surrounding space, generating > a token `>>'. > > G++ has no such problem, but I haven't checked which is the right > behavior, required by the ISO standard. > > Note that this will no longer be a problem with C++ 0x, since > expressions like `Foo<Foo<int>>' will be valid. */ > #define foo(T) Foo<T> > > int > main () > { > foo(Foo<int>) f; > } > % icpc -gcc-name=gcc-4.0 -o icpc-macro-issue icpc-macro-issue.cc > icpc-macro-issue.cc(20): error: space required between adjacent ">" delimiters of nested template argument lists (">>" is the right shift operator) > foo(Foo<int>) f; > ^ > > compilation aborted for icpc-macro-issue.cc (code 2) > % g++ -o icpc-macro-issue icpc-macro-issue.cc > % > > Ah bah oui, j'avais pas pense a ça mais le problème est évident. -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU for everyone drops to zero" -- Jack.

1 0

694: Add spaces in macros to please icpc.
by Roland Levillain 03 Nov '06

03 Nov '06

https://svn.lrde.epita.fr/svn/oln/trunk/metalic Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add spaces in macros to please icpc. * mlc/is_a.hh, mlc/case.hh: Add spaces in macros to please icpc. 0 files changed Index: mlc/is_a.hh Index: mlc/case.hh

1 1

693: Clean up virtual types declarations.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Clean up virtual types declarations. * oln/core/typedefs.hh (size_type): Remove virtual type declaration. Clean up. typedefs.hh | 58 ---------------------------------------------------------- 1 file changed, 58 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 692) +++ oln/core/typedefs.hh (working copy) @@ -84,14 +84,6 @@ | Iterators. | `------------*/ -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(iter_type); -// mlc_decl_typedef(fwd_iter_type); -// mlc_decl_typedef(bkd_iter_type); -// -------------------------------------------------------------------- - mlc_decl_typedef(piter_type); mlc_decl_typedef(fwd_piter_type); mlc_decl_typedef(bkd_piter_type); @@ -123,22 +115,11 @@ | category::image. | `------------------*/ -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(data_type); -// -------------------------------------------------------------------- mlc_decl_typedef(is_computed_type); mlc_decl_typedef(value_type); mlc_decl_typedef(rvalue_type); mlc_decl_typedef(lvalue_type); -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(value_storage_type); -// mlc_decl_typedef(storage_type); -// -------------------------------------------------------------------- mlc_decl_typedef(psite_type); mlc_decl_typedef(point_type); mlc_decl_typedef(dpoint_type); @@ -146,37 +127,11 @@ mlc_decl_typedef(neighborhood_type); mlc_decl_typedef(subset_type); -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(image_type); -// -------------------------------------------------------------------- - mlc_decl_typedef(delegated_type); - mlc_decl_typedef(size_type); // FIXME: To be removed. mlc_decl_typedef(topo_type); mlc_decl_typedef(bbox_type); mlc_decl_typedef(is_value_wise_mutable_type); -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(window_type); -// -------------------------------------------------------------------- - - - // ------------------------------ // - // Extension in image_operators. // - // ------------------------------ // - -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(output_type); -// mlc_decl_typedef(input_type); -// mlc_decl_typedef(input1_type); -// mlc_decl_typedef(input2_type); -// -------------------------------------------------------------------- /*-----------------. @@ -204,19 +159,6 @@ mlc_decl_typedef(lut_iter_type); - /*------------------------------------. - | category::fun1 and category::fun2. | - `------------------------------------*/ - -// -------------------------------------------------------------------- -// FIXME: To be enabled later. -// -------------------------------------------------------------------- -// mlc_decl_typedef(res_type); -// mlc_decl_typedef(arg_type); -// mlc_decl_typedef(left_type); -// mlc_decl_typedef(right_type); -// -------------------------------------------------------------------- - } // end of namespace oln

1 0

692: Rename the ``accessibility'' hierarchy as ``point_wise_accessibility''.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Rename the ``accessibility'' hierarchy as ``point_wise_accessibility''. * oln/core/abstract/image/accessibility/hierarchy.hh: Rename as... * oln/core/abstract/image/point_wise_accessibility/hierarchy.hh: ...this. Adjust header guards. (oln::abstract::image_being_random_accessible): Rename as... (oln::abstract::image_being_point_wise_random_accessible): ...this. Adjust. (oln::case_<image_hierarchy_wrt_accessibility, E, 1>): Rename as... (oln::case_<image_hierarchy_wrt_point_wise_accessibility, E, 1>): ...this. Adjust. * oln/core/abstract/image/hierarchies.hh, * oln/core/abstract/image/all.hh, * oln/core/abstract/image/hybrid/classical.hh: Adjust. * oln/core/automatic/image/image_being_random_accessible.hh: Adjust. Rename as... * oln/core/automatic/image/image_being_point_wise_random_accessible.hh: ...this. Adjust header guards. * oln/Makefile.am (nobase_oln_HEADERS): Remove core/abstract/image/accessibility/hierarchy.hh and core/automatic/image/image_being_random_accessible.hh. Add core/abstract/image/point_wise_accessibility/hierarchy.hh and core/automatic/image/image_being_point_wise_random_accessible.hh. Remove duplicate core/automatic/image/image_having_neighborhood.hh Makefile.am | 9 +- core/abstract/image/all.hh | 4 - core/abstract/image/hierarchies.hh | 2 core/abstract/image/hybrid/classical.hh | 10 +- core/abstract/image/point_wise_accessibility/hierarchy.hh | 40 +++++----- core/automatic/image/image_being_point_wise_random_accessible.hh | 16 ++-- 6 files changed, 40 insertions(+), 41 deletions(-) Index: oln/core/automatic/image/image_being_point_wise_random_accessible.hh --- oln/core/automatic/image/image_being_point_wise_random_accessible.hh (revision 690) +++ oln/core/automatic/image/image_being_point_wise_random_accessible.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH -# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_POINT_WISE_RANDOM_ACCESSIBLE_HH +# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_POINT_WISE_RANDOM_ACCESSIBLE_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -38,7 +38,7 @@ // Forward declaration. namespace abstract { - template <typename E> class image_being_random_accessible; + template <typename E> class image_being_point_wise_random_accessible; } // end of namespace oln::abstract @@ -47,10 +47,10 @@ { /// Default implementation corresponding to the interface - /// oln::abstract::image_being_random_accessible. + /// oln::abstract::image_being_point_wise_random_accessible. template <typename E, typename M> - class set_impl<abstract::image_being_random_accessible, M, E> : + class set_impl<abstract::image_being_point_wise_random_accessible, M, E> : public virtual stc::any__simple<E> { private: @@ -69,14 +69,14 @@ template <typename E, typename M> bool - set_impl<abstract::image_being_random_accessible, M, E>::impl_has(const typename set_impl<abstract::image_being_random_accessible, M, E>::point_t& p) const + set_impl<abstract::image_being_point_wise_random_accessible, M, E>::impl_has(const typename set_impl<abstract::image_being_point_wise_random_accessible, M, E>::point_t& p) const { return this->exact().topo().has(p); } template <typename E, typename M> bool - set_impl<abstract::image_being_random_accessible, M, E>::impl_has_large(const typename set_impl<abstract::image_being_random_accessible, M, E>::point_t& p) const + set_impl<abstract::image_being_point_wise_random_accessible, M, E>::impl_has_large(const typename set_impl<abstract::image_being_point_wise_random_accessible, M, E>::point_t& p) const { return this->exact().has(p); } @@ -87,4 +87,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_RANDOM_ACCESSIBLE_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE_BEING_POINT_WISE_RANDOM_ACCESSIBLE_HH Index: oln/core/abstract/image/hybrid/classical.hh --- oln/core/abstract/image/hybrid/classical.hh (revision 691) +++ oln/core/abstract/image/hybrid/classical.hh (working copy) @@ -35,7 +35,7 @@ # include <oln/core/abstract/image/dimension/2d.hh> # include <oln/core/abstract/image/dimension/3d.hh> # include <oln/core/abstract/image/bbox/hierarchy.hh> -# include <oln/core/abstract/image/accessibility/hierarchy.hh> +# include <oln/core/abstract/image/point_wise_accessibility/hierarchy.hh> /* Image dimension hierarchy (summary). @@ -63,10 +63,10 @@ | `---------------------' | | | | | | | | | | - ,-------------------------------------------------------------. - | if (deduce_type_of(I, topo, is_random_accessible) == true) | + ,------------------------------------------------------------------------. + | if (deduce_type_of(I, topo, is_point_wise_random_accessible) == true) | | and (deduce_type_of(I, topo, bbox) != not_found) | - `-------------------------------------------------------------' + `------------------------------------------------------------------------' | | | | o o o o @@ -99,7 +99,7 @@ template <typename E> struct classical_image : public virtual abstract::image_having_bbox<E>, - public virtual abstract::image_being_random_accessible<E> + public virtual abstract::image_being_point_wise_random_accessible<E> { protected: classical_image(); Index: oln/core/abstract/image/hierarchies.hh --- oln/core/abstract/image/hierarchies.hh (revision 691) +++ oln/core/abstract/image/hierarchies.hh (working copy) @@ -38,7 +38,7 @@ typedef hierarchy<abstract::image, 2> image_hierarchy_wrt_type; typedef hierarchy<abstract::image, 3> image_hierarchy_wrt_neighborhood; typedef hierarchy<abstract::image, 4> image_hierarchy_wrt_bbox; - typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_accessibility; + typedef hierarchy<abstract::image, 5> image_hierarchy_wrt_point_wise_accessibility; typedef hierarchy<abstract::image, 6> image_hierarchy_wrt_mutability; typedef hierarchy<abstract::image, 7> image_hierarchy_wrt_computability; typedef hierarchy<abstract::image, 8> image_hierarchy_wrt_value_wise_accessibility; Index: oln/core/abstract/image/all.hh --- oln/core/abstract/image/all.hh (revision 691) +++ oln/core/abstract/image/all.hh (working copy) @@ -40,8 +40,8 @@ # include <oln/core/abstract/image/neighborhood/hierarchy.hh> // Hierarchy 4: image w.r.t. bounding box. # include <oln/core/abstract/image/bbox/hierarchy.hh> -// Hierarchy 5: image w.r.t. point accessibility. -# include <oln/core/abstract/image/accessibility/hierarchy.hh> +// Hierarchy 5: image w.r.t. point point-wise accessibility. +# include <oln/core/abstract/image/point_wise_accessibility/hierarchy.hh> // Hierarchy 6: image w.r.t. data mutability. # include <oln/core/abstract/image/mutability/hierarchy.hh> // Hierarchy 7: image w.r.t. computability. Index: oln/core/abstract/image/point_wise_accessibility/hierarchy.hh --- oln/core/abstract/image/point_wise_accessibility/hierarchy.hh (revision 691) +++ oln/core/abstract/image/point_wise_accessibility/hierarchy.hh (working copy) @@ -25,29 +25,29 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH -# define OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH +#ifndef OLN_CORE_ABSTRACT_IMAGE_POINT_WISE_ACCESSIBILITY_HIERARCHY_HH +# define OLN_CORE_ABSTRACT_IMAGE_POINT_WISE_ACCESSIBILITY_HIERARCHY_HH # include <oln/core/abstract/image.hh> # include <oln/core/abstract/image/hierarchies.hh> -# include <oln/core/automatic/image/image_being_random_accessible.hh> +# include <oln/core/automatic/image/image_being_point_wise_random_accessible.hh> namespace oln { - /*-------------------------. - | Dimension abstractions. | - `-------------------------*/ + /*----------------------------------------. + | Point-wise accessibility abstractions. | + `----------------------------------------*/ namespace abstract { - /// Image having a accessibility. + /// Image having a point-wise random accessibility. template <typename E> - struct image_being_random_accessible : + struct image_being_point_wise_random_accessible : public virtual image<E>, - public automatic::get_impl< image_being_random_accessible, E > + public automatic::get_impl< image_being_point_wise_random_accessible, E > { typedef oln_type_of(E, point) point_t; @@ -62,7 +62,7 @@ protected: /// Constructor (protected, empty). - image_being_random_accessible(); + image_being_point_wise_random_accessible(); }; @@ -70,19 +70,19 @@ # ifndef OLN_INCLUDE_ONLY template <typename E> - bool image_being_random_accessible<E>::has(const typename image_being_random_accessible<E>::point_t& p) const + bool image_being_point_wise_random_accessible<E>::has(const typename image_being_point_wise_random_accessible<E>::point_t& p) const { return this->exact().impl_has(p); } template <typename E> - bool image_being_random_accessible<E>::has_large(const typename image_being_random_accessible<E>::point_t& p) const + bool image_being_point_wise_random_accessible<E>::has_large(const typename image_being_point_wise_random_accessible<E>::point_t& p) const { return this->exact().impl_has_large(p); } template <typename E> - image_being_random_accessible<E>::image_being_random_accessible() + image_being_point_wise_random_accessible<E>::image_being_point_wise_random_accessible() { } @@ -91,19 +91,19 @@ } // end of namespace oln::abstract - /*-------------------. - | Dimension switch. | - `-------------------*/ + /*----------------------------------. + | Point-wise accessibility switch. | + `----------------------------------*/ - /// With accessibility. + /// With point-wise accessibility. template <typename E> - struct case_< image_hierarchy_wrt_accessibility, E, 1 > : + struct case_< image_hierarchy_wrt_point_wise_accessibility, E, 1 > : where_< mlc::eq_< oln_deduce_type_of(E, topo, is_random_accessible), mlc::true_ > > { - typedef abstract::image_being_random_accessible<E> ret; + typedef abstract::image_being_point_wise_random_accessible<E> ret; }; } // end of namespace oln -#endif // ! OLN_CORE_ABSTRACT_IMAGE_ACCESSIBILITY_HIERARCHY_HH +#endif // ! OLN_CORE_ABSTRACT_IMAGE_POINT_WISE_ACCESSIBILITY_HIERARCHY_HH Index: oln/Makefile.am --- oln/Makefile.am (revision 691) +++ oln/Makefile.am (working copy) @@ -33,8 +33,6 @@ core/3d/topo3d.hh \ core/3d/window3d.hh \ \ - core/abstract/image/accessibility/hierarchy.hh \ - \ core/abstract/image/bbox/hierarchy.hh \ \ core/abstract/image/computability/hierarchy.hh \ @@ -50,6 +48,8 @@ \ core/abstract/image/neighborhood/hierarchy.hh \ \ + core/abstract/image/point_wise_accessibility/hierarchy.hh \ + \ core/abstract/image/type/binary.hh \ core/abstract/image/type/color.hh \ core/abstract/image/type/data.hh \ @@ -105,10 +105,9 @@ core/automatic/image/mutable_image1d.hh \ core/automatic/image/mutable_image2d.hh \ core/automatic/image/mutable_image3d.hh \ - core/automatic/image/image_being_random_accessible.hh \ - core/automatic/image/image_having_neighborhood.hh \ - core/automatic/image/image_having_neighborhood.hh \ + core/automatic/image/image_being_point_wise_random_accessible.hh \ core/automatic/image/image_being_value_wise_random_accessible.hh \ + core/automatic/image/image_having_neighborhood.hh \ \ core/automatic/topology/topology_being_random_accessible.hh \ core/automatic/topology/topology_having_bbox.hh \

1 0

691: Fix the mutability of value-wise random accessible images.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the mutability of value-wise random accessible images. * oln/core/typedefs.hh (is_value_wise_mutable_type): New virtual type declaration. * oln/core/abstract/image/value_wise_accessibility/hierarchy.hh (struct case_<image_hierarchy_wrt_value_wise_accessibility, E, 2>): Re-enable. Swap with... (struct case_<image_hierarchy_wrt_value_wise_accessibility, E, 1>): ...this case. * oln/morpher/with_lut.hh (vtypes< morpher::with_lut<Image, Lut> >::is_value_wise_mutable_type): New virtual type. Set to mlc::true_. core/abstract/image/value_wise_accessibility/hierarchy.hh | 27 +++++++------- core/typedefs.hh | 2 + morpher/with_lut.hh | 10 ++++- 3 files changed, 24 insertions(+), 15 deletions(-) Index: oln/core/typedefs.hh --- oln/core/typedefs.hh (revision 690) +++ oln/core/typedefs.hh (working copy) @@ -156,6 +156,8 @@ mlc_decl_typedef(size_type); // FIXME: To be removed. mlc_decl_typedef(topo_type); mlc_decl_typedef(bbox_type); + + mlc_decl_typedef(is_value_wise_mutable_type); // -------------------------------------------------------------------- // FIXME: To be enabled later. // -------------------------------------------------------------------- Index: oln/core/abstract/image/value_wise_accessibility/hierarchy.hh --- oln/core/abstract/image/value_wise_accessibility/hierarchy.hh (revision 690) +++ oln/core/abstract/image/value_wise_accessibility/hierarchy.hh (working copy) @@ -122,31 +122,32 @@ } // end of namespace oln::abstract - /*-------------------. - | Dimension switch. | - `-------------------*/ + /*----------------------------------. + | Value-wise accessibility switch. | + `----------------------------------*/ /* FIXME: Handle mutability. This is not easy, as, for instance an image with LUT has no lvalue type, but can be perfectly const or mutable. How can we deal with this? By adding a specific vtype? */ - /// With value-wise random accessibility ( + /// With mutable value-wise random accessibility. template <typename E> struct case_< image_hierarchy_wrt_value_wise_accessibility, E, 1 > : - where_< mlc_is_ok(oln_type_of(E, fwd_viter)) > + where_< mlc_and( mlc_is_ok(oln_type_of(E, fwd_viter)), + mlc_eq( oln_type_of(E, is_value_wise_mutable), + mlc::true_) ) > { typedef abstract::mutable_image_being_value_wise_random_accessible<E> ret; }; -// /// With accessibility. -// template <typename E> -// struct case_< image_hierarchy_wrt_value_wise_accessibility, E, 2 > : -// where_< mlc_and( mlc_is_ok(oln_type_of(E, fwd_viter)), -// mlc_is_ok(oln_type_of(E, lvalue)) ) > -// { -// typedef abstract::mutable_image_being_value_wise_random_accessible<E> ret; -// }; + /// With (constant) value-wise random accessibility. + template <typename E> + struct case_< image_hierarchy_wrt_value_wise_accessibility, E, 2 > : + where_< mlc_is_ok(oln_type_of(E, fwd_viter)) > + { + typedef abstract::image_being_value_wise_random_accessible<E> ret; + }; } // end of namespace oln Index: oln/morpher/with_lut.hh --- oln/morpher/with_lut.hh (revision 690) +++ oln/morpher/with_lut.hh (working copy) @@ -67,8 +67,14 @@ typedef Lut lut_type; // rvalue_type: see below. - // lvalue_type: undefined (see - // oln/morpher/internal/image_value_morpher.hh). + /* lvalue_type: undefined + (see oln/morpher/internal/image_value_morpher.hh). */ + + /* Mutability. + As the virtual type `lvalue' is undefined in with_lut<>, it is + not point-wise mutable. However, it is value-wise mutable, + i.e., the values of the look-up table can be modified. */ + typedef mlc::true_ is_value_wise_mutable_type; // fwd_viter_type: see below. // mutable_fwd_viter_type: see below.

1 0

690: Fix CXXFLAGS usage.
by Roland Levillain 31 Oct '06

31 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix CXXFLAGS usage. * configure.ac: Erase CXXFLAGS if the user doesn't set it. configure.ac | 6 ++++++ extended/ChangeLog | 4 ++++ extended/tests/Makefile.am | 7 +++---- metalic/ChangeLog | 4 ++++ metalic/tests/Makefile.am | 7 +++---- olena/ChangeLog | 7 +++++++ olena/tests/algorithms/Makefile.am | 8 ++++---- olena/tests/core/Makefile.am | 8 ++++---- olena/tests/io/Makefile.am | 8 ++++---- olena/tests/morphers/Makefile.am | 8 ++++---- olena/tests/value/Makefile.am | 8 ++++---- static/ChangeLog | 5 +++++ static/stc/scoop.hh | 3 ++- static/tests/Makefile.am | 7 +++---- 14 files changed, 57 insertions(+), 33 deletions(-) Index: extended/tests/Makefile.am --- extended/tests/Makefile.am (revision 689) +++ extended/tests/Makefile.am (working copy) @@ -6,11 +6,10 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) check_PROGRAMS = \ Index: extended/ChangeLog --- extended/ChangeLog (revision 689) +++ extended/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-10-31 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am: Alter AM_CXXFLAGS instead of CXXFLAGS. + 2006-10-27 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. Index: configure.ac --- configure.ac (revision 689) +++ configure.ac (working copy) @@ -23,6 +23,12 @@ ## C++ compiler set up. ## ## --------------------- ## +# If the user doesn't provide any CXXFLAGS, prevent Autoconf from +# settings its own default ones (e.g., `-g -O2' for g++). +if test ! ${CXXFLAGS+set}; then + CXXFLAGS="" +fi + # Look for a C++ compiler. AC_LANG([C++]) AC_PROG_CXX Index: static/tests/Makefile.am --- static/tests/Makefile.am (revision 689) +++ static/tests/Makefile.am (working copy) @@ -6,11 +6,10 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) check_PROGRAMS = \ Index: static/ChangeLog --- static/ChangeLog (revision 689) +++ static/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-10-31 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am: Alter AM_CXXFLAGS instead of CXXFLAGS. + * stc/scoop.hh: Fix comment. + 2006-10-09 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr> * stc/scoop.hh (stc_virtual_typedef): Remove this macro which Index: static/stc/scoop.hh --- static/stc/scoop.hh (revision 689) +++ static/stc/scoop.hh (working copy) @@ -63,7 +63,7 @@ namespace stc { - /// Error messages raised by static assertions. + /// Error messages raised by static assertions/abortions. namespace ERROR { @@ -203,6 +203,7 @@ \ /** Accessor helper: specializations for the case of two super */ \ /** classes or more. */ \ + /* FIXME: Currently works only for 2 and 3 super types. */ \ template <typename super1, typename super2, typename super3> \ struct get_super_types_helper< mlc::valist_ <super1, super2, super3> > \ { \ Index: metalic/tests/Makefile.am --- metalic/tests/Makefile.am (revision 689) +++ metalic/tests/Makefile.am (working copy) @@ -6,11 +6,10 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) check_PROGRAMS = \ Index: metalic/ChangeLog --- metalic/ChangeLog (revision 689) +++ metalic/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2006-10-31 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/Makefile.am: Alter AM_CXXFLAGS instead of CXXFLAGS. + 2006-10-27 Roland Levillain <roland(a)lrde.epita.fr> Fix the distribution. Index: olena/tests/morphers/Makefile.am --- olena/tests/morphers/Makefile.am (revision 689) +++ olena/tests/morphers/Makefile.am (working copy) @@ -12,11 +12,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + check_PROGRAMS = \ identity_morpher \ Index: olena/tests/io/Makefile.am --- olena/tests/io/Makefile.am (revision 689) +++ olena/tests/io/Makefile.am (working copy) @@ -12,11 +12,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + check_PROGRAMS = \ io_pnm Index: olena/tests/core/Makefile.am --- olena/tests/core/Makefile.am (revision 689) +++ olena/tests/core/Makefile.am (working copy) @@ -12,11 +12,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + check_PROGRAMS = \ dpoint2d \ Index: olena/tests/algorithms/Makefile.am --- olena/tests/algorithms/Makefile.am (revision 689) +++ olena/tests/algorithms/Makefile.am (working copy) @@ -16,11 +16,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + check_PROGRAMS = \ fill Index: olena/tests/value/Makefile.am --- olena/tests/value/Makefile.am (revision 689) +++ olena/tests/value/Makefile.am (working copy) @@ -12,11 +12,11 @@ # # AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) # -# when oln.m4 is available in the distribution. -# Meanwhile, alter CXXFLAGS to turn off any optimization (Automake will -# warn against this, but that's OK). +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ -CXXFLAGS += $(TESTS_CXXFLAGS) +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + check_PROGRAMS = \ accessor \ Index: olena/ChangeLog --- olena/ChangeLog (revision 689) +++ olena/ChangeLog (working copy) @@ -1,3 +1,10 @@ +2006-10-31 Roland Levillain <roland(a)lrde.epita.fr> + + * tests/algorithms/Makefile.am, tests/core/Makefile.am, + * tests/io/Makefile.am, tests/morphers/Makefile.am, + * tests/value/Makefile.am, tests/value/Makefile.am: + Alter AM_CXXFLAGS instead of CXXFLAGS. + 2006-10-27 Roland Levillain <roland(a)lrde.epita.fr> Various fixes.

1 0

689: Update TODO.
by Roland Levillain 27 Oct '06

27 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * TODO: Update. TODO | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) Index: TODO --- TODO (revision 688) +++ TODO (working copy) @@ -1,6 +1,68 @@ See also the TODO in oln-proto-1.0 and oln-proto-stl-style. +* Clean up + +** Separate interface from implementation +Move the contents of each block surrounded by OLN_INCLUDE_ONLY into a +.hxx file. Don't forget to keep the #ifndef/#endif directives, and to +comment the closing #endif. Hence, this: + + // ------------------------------------------------------------ + // foo.hh + #ifndef FOO_HH + # define FOO_HH + + // (Interface.) + + # ifndef OLN_INCLUDE_ONLY + + // (Implementation.) + + # endif + + #endif // ! FOO_HH + // ------------------------------------------------------------ + +should be turned into these: + + // ------------------------------------------------------------ + // foo.hh + #ifndef FOO_HH + # define FOO_HH + + // (Interface.) + + # ifndef OLN_INCLUDE_ONLY + # include <foo.hxx> + # endif + + #endif // ! FOO_HH + // ------------------------------------------------------------ + + // ------------------------------------------------------------ + // foo.hxx + #ifndef FOO_HXX + # define FOO_HXX + + // (Implementation.) + + #endif // ! FOO_HXX + // ------------------------------------------------------------ + + +(BTW, I (Roland) think that OLN_INTERFACE_ONLY would be more +appropriate than OLN_INCLUDE_ONLY.) + + +** Update the address of the FSF in Copyright notices (write a script) + +** Check dates for every copyright header +Use the repository of Olena 0.10 (and previous) and Olena proto-1.0 to +find when files have been created and modified. This task could be a +part of the code review process. + + * Release process This is to be done later, before the release of the whole project or of one or some of its components.

1 0

688: Various fixes.
by Roland Levillain 27 Oct '06

27 Oct '06

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Various fixes. * oln/core/automatic/image/mutable_image1d.hh: Fix header guards, (were the same as oln/core/automatic/image/image1d.hh's). (oln::abstract::mutable_image1d): Forward-declare it. s/abstract::image1d/abstract::mutable_image1d/g. * oln/core/abstract/image/dimension/1d.hh (mutable_image1d) * oln/core/abstract/image/dimension/2d.hh (mutable_image2d) * oln/core/abstract/image/dimension/3d.hh (mutable_image3d): Fix the lookup of impl_at(). * oln/core/type_fun/slice.hh: Remove unnecessary headers. * oln/core/abstract/array.hh, oln/core/abstract/functions.hh, * oln/core/internal/point_nd.hh, oln/morpher/thru_mfun.hh: Add missing headers. * oln/morpher/thru_fun.hh (xtd/mexpr.hh): Include it. (struct case_<tag::fun_operator_1, mlc::pair_<Fun, A>, 1>): Turn into... (struct case_<tag::fun_operator_1, mlc::pair_<Fun, A>, 2>): ...this. * oln/value/proxy.hh: Fix header guards. (oln/core/typedefs.hh): Include it. * oln/Makefile.am (nobase_oln_HEADERS): Add core/abstract/image/computability/hierarchy.hh, core/abstract/image/value_wise_accessibility/hierarchy.hh, core/automatic/image/image_being_value_wise_random_accessible.hh, core/gen/topo_add_isubset.hh, core/gen/fwd_viter_lut.hh, core/internal/fwd_viter_lut.hh and value/two_way.hh. oln/Makefile.am | 14 +++++++++++++- oln/core/abstract/array.hh | 1 + oln/core/abstract/functions.hh | 1 + oln/core/abstract/image/dimension/1d.hh | 5 +++++ oln/core/abstract/image/dimension/2d.hh | 5 +++++ oln/core/abstract/image/dimension/3d.hh | 5 +++++ oln/core/automatic/image/mutable_image1d.hh | 12 ++++++------ oln/core/gen/topo_lbbox.hh | 3 --- oln/core/internal/point_nd.hh | 4 ++++ oln/core/type_fun/slice.hh | 5 ----- oln/morpher/thru_fun.hh | 7 ++++--- oln/morpher/thru_mfun.hh | 1 + oln/value/proxy.hh | 7 ++++--- tests/value/accessor.cc | 4 ++-- 14 files changed, 51 insertions(+), 23 deletions(-) Index: tests/value/accessor.cc --- tests/value/accessor.cc (revision 687) +++ tests/value/accessor.cc (working copy) @@ -28,7 +28,7 @@ /// Test oln::value::a_*. #include <iostream> -#include <oln/color/rgb.hh> +#include <oln/value/color/rgb.hh> #include <oln/basics2d.hh> #include <oln/value/accessor.hh> @@ -39,7 +39,7 @@ { using namespace oln; - typedef color::rgb_<int> rgb_t; + typedef value::color::rgb_<int> rgb_t; rgb_t c; image2d<rgb_t> ima(3,3); Index: oln/core/automatic/image/mutable_image1d.hh --- oln/core/automatic/image/mutable_image1d.hh (revision 687) +++ oln/core/automatic/image/mutable_image1d.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH -# define OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH +#ifndef OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE1D_HH +# define OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE1D_HH # include <oln/core/automatic/impl.hh> # include <oln/morpher/tags.hh> @@ -38,7 +38,7 @@ // Forward declaration. namespace abstract { - template <typename E> class image1d; + template <typename E> class mutable_image1d; } // end of namespace oln::abstract @@ -50,7 +50,7 @@ /// Default implementation corresponding to the interface /// oln::abstract::image1d. template <typename E, typename tag> - class set_impl<abstract::image1d, tag, E> : + class set_impl<abstract::mutable_image1d, tag, E> : public virtual stc::any__simple<E> { public: @@ -66,7 +66,7 @@ template <typename E, typename tag> oln_lvalue(E) - set_impl<abstract::image1d, tag, E> + set_impl<abstract::mutable_image1d, tag, E> ::impl_at(const oln_coord(E)& index) { point1d tmp(index); @@ -79,4 +79,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_AUTOMATIC_IMAGE_IMAGE1D_HH +#endif // ! OLN_CORE_AUTOMATIC_IMAGE_MUTABLE_IMAGE1D_HH Index: oln/core/type_fun/slice.hh --- oln/core/type_fun/slice.hh (revision 687) +++ oln/core/type_fun/slice.hh (working copy) @@ -30,13 +30,8 @@ # include <mlc/flags.hh> -# include <oln/core/1d/point1d.hh> # include <oln/core/1d/topo1d.hh> - -# include <oln/core/2d/point2d.hh> # include <oln/core/2d/topo2d.hh> - -# include <oln/core/3d/point3d.hh> # include <oln/core/3d/topo3d.hh> Index: oln/core/abstract/image/dimension/1d.hh --- oln/core/abstract/image/dimension/1d.hh (revision 687) +++ oln/core/abstract/image/dimension/1d.hh (working copy) @@ -65,8 +65,13 @@ public automatic::get_impl<mutable_image1d, E> { public: + // Resolve an ambiguity w.r.t. impl_at(). + // FIXME: Too hacky! + using automatic::set_impl<abstract::image1d, oln_type_of(E, morpher), E>::impl_at; + using automatic::set_impl<abstract::mutable_image1d, oln_type_of(E, morpher), E>::impl_at; using image1d<E>::at; + oln_lvalue(E) at(const oln_coord(E)& index); protected: Index: oln/core/abstract/image/dimension/2d.hh --- oln/core/abstract/image/dimension/2d.hh (revision 687) +++ oln/core/abstract/image/dimension/2d.hh (working copy) @@ -65,8 +65,13 @@ public automatic::get_impl<mutable_image2d, E> { public: + // Resolve an ambiguity w.r.t. impl_at(). + // FIXME: Too hacky! + using automatic::set_impl<abstract::image2d, oln_type_of(E, morpher), E>::impl_at; + using automatic::set_impl<abstract::mutable_image2d, oln_type_of(E, morpher), E>::impl_at; using image2d<E>::at; + oln_lvalue(E) at(const oln_coord(E)& row, const oln_coord(E)& col); protected: Index: oln/core/abstract/image/dimension/3d.hh --- oln/core/abstract/image/dimension/3d.hh (revision 687) +++ oln/core/abstract/image/dimension/3d.hh (working copy) @@ -70,8 +70,13 @@ public automatic::get_impl<mutable_image3d, E> { public: + // Resolve an ambiguity w.r.t. impl_at(). + // FIXME: Too hacky! + using automatic::set_impl<abstract::image3d, oln_type_of(E, morpher), E>::impl_at; + using automatic::set_impl<abstract::mutable_image3d, oln_type_of(E, morpher), E>::impl_at; using image3d<E>::at; + oln_lvalue(E) at(const oln_coord(E)& slice, const oln_coord(E)& row, const oln_coord(E)& col); Index: oln/core/abstract/functions.hh --- oln/core/abstract/functions.hh (revision 687) +++ oln/core/abstract/functions.hh (working copy) @@ -31,6 +31,7 @@ # include <stc/any.hh> # include <oln/core/type.hh> # include <oln/core/abstract/image.hh> +# include <oln/core/abstract/image/mutability/hierarchy.hh> namespace oln Index: oln/core/abstract/array.hh --- oln/core/abstract/array.hh (revision 687) +++ oln/core/abstract/array.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_ABSTRACT_ARRAY_HH # define OLN_CORE_ABSTRACT_ARRAY_HH +# include <oln/core/type.hh> # include <oln/debug/track.hh> Index: oln/core/gen/topo_lbbox.hh --- oln/core/gen/topo_lbbox.hh (revision 687) +++ oln/core/gen/topo_lbbox.hh (working copy) @@ -31,12 +31,9 @@ # include <oln/core/gen/bbox.hh> # include <oln/core/topology_entry.hh> - - namespace oln { - // Forward declarations. template <typename point> class topo_lbbox_; Index: oln/core/internal/point_nd.hh --- oln/core/internal/point_nd.hh (revision 687) +++ oln/core/internal/point_nd.hh (working copy) @@ -31,7 +31,11 @@ # include <xtd/vec.hh> # include <xtd/optraits.hh> +// FIXME: There should be a header grouping the files required to make +// the extensible traits mechanism work. # include <oln/core/traits_id.hh> +# include <oln/value/proxy.hh> +# include <oln/core/traits.hh> # include <oln/core/abstract/point.hh> # include <oln/core/internal/dpoint_nd.hh> Index: oln/Makefile.am --- oln/Makefile.am (revision 687) +++ oln/Makefile.am (working copy) @@ -37,6 +37,8 @@ \ core/abstract/image/bbox/hierarchy.hh \ \ + core/abstract/image/computability/hierarchy.hh \ + \ core/abstract/image/dimension/1d.hh \ core/abstract/image/dimension/2d.hh \ core/abstract/image/dimension/3d.hh \ @@ -56,6 +58,8 @@ core/abstract/image/type/integre.hh \ core/abstract/image/type/label.hh \ \ + core/abstract/image/value_wise_accessibility/hierarchy.hh \ + \ core/abstract/image/all.hh \ core/abstract/image/hierarchies.hh \ \ @@ -104,12 +108,15 @@ core/automatic/image/image_being_random_accessible.hh \ core/automatic/image/image_having_neighborhood.hh \ core/automatic/image/image_having_neighborhood.hh \ - core/automatic/impl.hh \ + core/automatic/image/image_being_value_wise_random_accessible.hh \ + \ core/automatic/topology/topology_being_random_accessible.hh \ core/automatic/topology/topology_having_bbox.hh \ core/automatic/topology/topology_having_neighborhood.hh \ core/automatic/topology/topology_having_subset.hh \ \ + core/automatic/impl.hh \ + \ core/gen/bbox.hh \ core/gen/bbox_bkd_piter.hh \ core/gen/bbox_fwd_piter.hh \ @@ -120,11 +127,13 @@ core/gen/fwd_niter_neighb.hh \ core/gen/fwd_piter_bbox.hh \ core/gen/fwd_qiter_win.hh \ + core/gen/fwd_viter_lut.hh \ core/gen/piter_isubset.hh \ core/gen/grid.hh \ core/gen/mapimage.hh \ core/gen/neighb.hh \ core/gen/pw_value.hh \ + core/gen/topo_add_isubset.hh \ core/gen/topo_add_nbh.hh \ core/gen/topo_bbox.hh \ core/gen/topo_lbbox.hh \ @@ -141,6 +150,7 @@ core/internal/bbox_bkd_piter.hh \ core/internal/bbox_fwd_piter.hh \ core/internal/dpoint_nd.hh \ + core/internal/fwd_viter_lut.hh \ core/internal/point_nd.hh \ core/internal/topology_morpher.hh \ core/internal/tracked_ptr.hh \ @@ -191,11 +201,13 @@ \ value/accessor.hh \ value/all.hh \ + value/bin.hh \ value/default.hh \ value/greylevel.hh \ value/proxy.hh \ value/rw_counter.hh \ value/tags.hh \ + value/two_way.hh \ \ basics1d.hh \ basics2d.hh \ Index: oln/morpher/thru_mfun.hh --- oln/morpher/thru_mfun.hh (revision 687) +++ oln/morpher/thru_mfun.hh (working copy) @@ -30,6 +30,7 @@ # include <xtd/res.hh> # include <xtd/abstract/open_nary_fun.hh> +# include <xtd/abstract/mutable_fun.hh> # include <xtd/mexpr.hh> # include <oln/morpher/internal/image_value_morpher.hh> Index: oln/morpher/thru_fun.hh --- oln/morpher/thru_fun.hh (revision 687) +++ oln/morpher/thru_fun.hh (working copy) @@ -28,12 +28,13 @@ #ifndef OLN_MORPHER_THRU_FUN # define OLN_MORPHER_THRU_FUN -# include <xtd/abstract/open_nary_fun.hh> # include <xtd/res.hh> +// For xtd::case_<xtd::tag::fun_operator_1, mlc::pair_<F, Expr>, 1> +# include <xtd/mexpr.hh> +# include <xtd/abstract/open_nary_fun.hh> # include <oln/morpher/internal/image_value_morpher.hh> - namespace oln { @@ -135,7 +136,7 @@ // where A is an oln::abstract::image template <typename Fun, typename A> - struct case_ < tag::fun_operator_1, mlc::pair_<Fun, A>, 1 > + struct case_ < tag::fun_operator_1, mlc::pair_<Fun, A>, 2 > : where_< mlc_is_a(A, oln::abstract::image) > { typedef stc_to_exact(A) I; Index: oln/value/proxy.hh --- oln/value/proxy.hh (revision 687) +++ oln/value/proxy.hh (working copy) @@ -25,10 +25,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_VALUE_PROXY_HH -# define OLN_CORE_VALUE_PROXY_HH +#ifndef OLN_VALUE_PROXY_HH +# define OLN_VALUE_PROXY_HH # include <xtd/optraits.hh> +# include <oln/core/typedefs.hh> # include <oln/core/type.hh> # include <oln/core/traits_id.hh> @@ -469,4 +470,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_VALUE_PROXY_HH +#endif // ! OLN_VALUE_PROXY_HH

1 0