2006-10-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
* xtd/math.hh (include): Move ops inclusion into...
* xtd/math/ops.hh: ... this new file.
Index: xtd/math.hh
===================================================================
--- xtd/math.hh (revision 681)
+++ xtd/math.hh (working copy)
@@ -68,9 +68,7 @@
/// \{
/// Definition of xtd operators and related functions.
-# include <xtd/math/arith.hh>
-# include <xtd/math/logic.hh>
-# include <xtd/math/cmp.hh>
+# include <xtd/math/ops.hh>
/// \}
Index: xtd/math/ops.hh
===================================================================
--- xtd/math/ops.hh (revision 0)
+++ xtd/math/ops.hh (revision 0)
@@ -0,0 +1,37 @@
+// Copyright (C) 2002, 2005, 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 XTD_MATH_OPS_HH
+# define XTD_MATH_OPS_HH
+
+
+# include <xtd/math/arith.hh>
+# include <xtd/math/logic.hh>
+# include <xtd/math/cmp.hh>
+
+
+#endif // ! XTD_MATH_OPS_HH
2006-10-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
Add two-way morpher.
* tests/morphers/two_way_morpher.cc: New.
* tests/morphers/Makefile.am: Update.
* oln/morpher/two_way.hh: New.
* oln/Makefile.am: Update.
* oln/core/abstract/image.hh (id_): Unconst.
* oln/core/abstract/functions.hh (fun_v2w2v): New.
* oln/core/traits.hh (oln_xtd_case_op_id): Fix number.
(include): Add commentary.
Index: tests/morphers/Makefile.am
===================================================================
--- tests/morphers/Makefile.am (revision 680)
+++ tests/morphers/Makefile.am (working copy)
@@ -24,6 +24,7 @@
count_rw_morpher \
slice_morpher \
stack_morpher \
+ two_way_morpher \
value_cast \
with_lut \
\
@@ -35,6 +36,7 @@
count_rw_morpher_SOURCES = count_rw_morpher.cc
slice_morpher_SOURCES = slice_morpher.cc
stack_morpher_SOURCES = stack_morpher.cc
+two_way_morpher_SOURCES = two_way_morpher.cc
value_cast_SOURCES = value_cast.cc
with_lut_SOURCES = with_lut.cc
Index: tests/morphers/two_way_morpher.cc
===================================================================
--- tests/morphers/two_way_morpher.cc (revision 0)
+++ tests/morphers/two_way_morpher.cc (revision 0)
@@ -0,0 +1,68 @@
+// 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 two-way morpher.
+
+#include <cassert>
+
+#include <oln/core/traits.hh>
+#include <oln/basics2d.hh>
+#include <oln/morpher/two_way.hh>
+
+
+struct F : public oln::abstract::fun_v2w2v< F >
+{
+ typedef int result_type;
+
+ int direct(int i) const
+ {
+ return i + 1;
+ }
+
+ int reverse(int i) const
+ {
+ return i - 1;
+ }
+};
+
+
+int main()
+{
+ F fun;
+
+ using namespace oln;
+ typedef image2d<int> I;
+ I ima(1,1);
+ point2d p(0,0);
+
+ ima(p) = 50;
+ assert(fun(ima)(p) == 51);
+
+ morpher::two_way<I,F> ima_bis(ima);
+ ima_bis(p) = 52;
+ assert(ima(p) == 51);
+}
Index: oln/core/abstract/image.hh
===================================================================
--- oln/core/abstract/image.hh (revision 680)
+++ oln/core/abstract/image.hh (working copy)
@@ -133,7 +133,7 @@
private:
- const unsigned id_;
+ unsigned id_;
};
Index: oln/core/abstract/functions.hh
===================================================================
--- oln/core/abstract/functions.hh (revision 680)
+++ oln/core/abstract/functions.hh (working copy)
@@ -30,11 +30,19 @@
# include <stc/any.hh>
# include <oln/core/type.hh>
+# include <oln/core/abstract/image.hh>
namespace oln
{
+
+ // Fwd decl.
+ namespace morpher {
+ template <typename I, typename F> class two_way;
+ }
+
+
namespace abstract
{
@@ -60,6 +68,21 @@
};
+ // Value1 -> Value2 *and* Value2 -> Value1.
+
+ template <typename E>
+ struct fun_v2w2v : public virtual stc::any__simple<E>,
+ public oln::type
+ {
+ public:
+ template <typename I>
+ oln::morpher::two_way<I, E>
+ operator()(oln::abstract::mutable_image<I>& input) const;
+ protected:
+ fun_v2w2v();
+ };
+
+
// Point -> Point.
template <typename E>
@@ -84,6 +107,11 @@
}
template <typename E>
+ fun_v2w2v<E>::fun_v2w2v()
+ {
+ }
+
+ template <typename E>
fun_p2p<E>::fun_p2p()
{
}
Index: oln/core/traits.hh
===================================================================
--- oln/core/traits.hh (revision 680)
+++ oln/core/traits.hh (working copy)
@@ -28,11 +28,12 @@
#ifndef OLN_CORE_TRAITS_HH
# define OLN_CORE_TRAITS_HH
-
# include <mlc/assert.hh>
# include <mlc/abort.hh>
-# include <xtd/optraits.hh>
-# include <xtd/math/ops.hh>
+
+# include <xtd/optraits.hh> // case #1 for C++ builtins
+# include <xtd/math/ops.hh> // case #2 for xtd::fun_expr_
+
# include <stc/exact.hh>
# include <oln/core/type.hh>
@@ -56,7 +57,7 @@
namespace xtd
{
- static const unsigned oln_xtd_case_op_id = 2;
+ static const unsigned oln_xtd_case_op_id = 3; // case #3
template <typename name,
Index: oln/Makefile.am
===================================================================
--- oln/Makefile.am (revision 680)
+++ oln/Makefile.am (working copy)
@@ -183,6 +183,7 @@
morpher/stack.hh \
morpher/thru_fun.hh \
morpher/thru_mfun.hh \
+ morpher/two_way.hh \
morpher/value_cast.hh \
morpher/with_lut.hh \
\
Index: oln/morpher/two_way.hh
===================================================================
--- oln/morpher/two_way.hh (revision 0)
+++ oln/morpher/two_way.hh (revision 0)
@@ -0,0 +1,238 @@
+// 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_TWO_WAY_HH
+# define OLN_MORPHER_TWO_WAY_HH
+
+# include <oln/value/two_way.hh>
+# include <oln/morpher/internal/image_value_morpher.hh>
+
+
+namespace oln
+{
+
+ namespace morpher
+ {
+ // Forward declaration.
+ template <typename Image, typename Fun> struct two_way;
+
+ } // end of namespace oln::morpher
+
+
+ /// Super type.
+ template <typename Image, typename Fun>
+ struct set_super_type< morpher::two_way<Image, Fun> >
+ {
+ typedef morpher::two_way<Image, Fun> self_t;
+ typedef morpher::internal::image_value_morpher<Image, self_t> ret;
+ };
+
+
+ template <typename Image, typename Fun>
+ struct vtypes< morpher::two_way<Image, Fun> >
+ {
+ typedef morpher::two_way<Image, Fun> self_t;
+ public:
+ typedef mlc::true_ is_computed_type;
+
+ typedef typename Fun::result_type value_type;
+ typedef value::two_way<Image, Fun> lvalue_type;
+ };
+
+ template <typename Image, typename Fun>
+ struct single_vtype< morpher::two_way<Image, Fun>, typedef_::rvalue_type >
+ {
+ typedef typename Fun::result_type ret;
+ };
+
+
+ namespace morpher
+ {
+
+ /// 'Image thru Function' morpher.
+ template <typename Image, typename Fun>
+ class two_way : public internal::image_value_morpher< Image,
+ morpher::two_way<Image, Fun> >
+ {
+ private:
+
+ typedef two_way<Image, Fun> self_t;
+
+ typedef internal::image_value_morpher<Image, self_t> super_t;
+ using super_t::image_;
+
+ typedef oln_rvalue(self_t) rvalue_t;
+ typedef oln_lvalue(self_t) lvalue_t;
+ typedef oln_psite(self_t) psite_t;
+
+ public:
+
+ two_way(Image& image, Fun fun);
+ two_way(Image& image);
+
+ two_way(oln::abstract::mutable_image<Image>& image,
+ const oln::abstract::fun_v2w2v<Fun>& fun);
+
+ rvalue_t impl_op_read(const psite_t& p) const;
+ lvalue_t impl_op_readwrite(const psite_t& p);
+
+ protected:
+
+ Fun fun_;
+ };
+
+
+ namespace ERROR
+ {
+
+ struct FIXME;
+
+ } // end of namespace oln::morpher::ERROR
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ // public
+
+ template <typename Image, typename Fun>
+ two_way<Image, Fun>::two_way(Image& image) :
+ super_t(image),
+ fun_()
+ {
+ }
+
+ template <typename Image, typename Fun>
+ two_way<Image, Fun>::two_way(Image& image, Fun fun) :
+ super_t(image),
+ fun_(fun)
+ {
+ }
+
+ template <typename Image, typename Fun>
+ two_way<Image, Fun>::two_way(oln::abstract::mutable_image<Image>& image,
+ const oln::abstract::fun_v2w2v<Fun>& fun) :
+ super_t(image.exact()),
+ fun_(fun.exact())
+ {
+ }
+
+ template <typename Image, typename Fun>
+ typename two_way<Image, Fun>::rvalue_t
+ two_way<Image, Fun>::impl_op_read(const typename two_way<Image, Fun>::psite_t& p) const
+ {
+ return fun_.direct(image_(p));
+ }
+
+ template <typename Image, typename Fun>
+ typename two_way<Image, Fun>::lvalue_t
+ two_way<Image, Fun>::impl_op_readwrite(const typename two_way<Image, Fun>::psite_t& p)
+ {
+ value::two_way<Image, Fun> tmp(image_, fun_, p);
+ return tmp;
+ }
+
+# endif
+
+ } // end of namespace oln::morpher
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ namespace value
+ {
+
+ // Ctor.
+ template <typename I, typename F>
+ two_way<I,F>::two_way(I& ima,
+ F fun,
+ const oln_psite(I)& p)
+ : ima_(ima),
+ fun_(fun),
+ p_(p)
+ {
+ }
+
+ // Read.
+ template <typename I, typename F>
+ template <typename V>
+ two_way<I,F>::operator V() const
+ {
+ return fun_.direct(ima_(p_));
+ }
+
+ // Explicit read.
+ template <typename I, typename F>
+ typename F::result_type
+ two_way<I,F>::value() const
+ {
+ return fun_.direct(ima_(p_));
+ }
+
+ // Write.
+
+ template <typename I, typename F>
+ template <typename V>
+ two_way<I,F>&
+ two_way<I,F>::operator=(const V& value)
+ {
+ ima_(p_) = fun_.reverse(value);
+ return *this;
+ }
+
+ // Op <<.
+ template <typename I, typename F>
+ std::ostream& operator<<(std::ostream& ostr,
+ const two_way<I,F>& proxy)
+ {
+ return ostr << proxy.value();
+ }
+
+ } // end of namespace oln::value
+
+
+ namespace abstract
+ {
+
+ template <typename F>
+ template <typename I>
+ oln::morpher::two_way<I, F>
+ fun_v2w2v<F>::operator()(oln::abstract::mutable_image<I>& input) const
+ {
+ morpher::two_way<I, F> tmp(input.exact(), this->exact());
+ return tmp;
+ }
+
+ } // end of namespace oln::abstract
+
+# endif
+
+
+
+} // end of namespace oln
+
+
+#endif // ! OLN_MORPHER_TWO_WAY_HH
2006-10-25 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
Add oln abstract functions + move slice vtype definitions.
* oln/level/assign.hh: New.
* oln/level/apply.hh: New.
* oln/level/clone.hh: New.
* oln/core/abstract/functions.hh: New.
* oln/debug/track.hh (dummy): Add code to remove warning.
* oln/debug/print.hh (OLN_ENV_2D): Guard specific code.
* oln/level/fill.hh (fill): New couple of versions.
* oln/basics1d.hh (OLN_ENV_1D): New.
* oln/core/typedefs.hh (oln_plain_value, oln_plain_value_): New.
* oln/core/iterator_vtypes.hh (slice): Move type definitions to...
* oln/morpher/slice.hh: ...here.
* oln/basics2d.hh (OLN_ENV_2D): New.
* oln/basics3d.hh (OLN_ENV_3D): New.
* oln/Makefile.am: Update.
Index: oln/debug/track.hh
===================================================================
--- oln/debug/track.hh (revision 678)
+++ oln/debug/track.hh (working copy)
@@ -38,6 +38,16 @@
static unsigned n_images = 0;
static unsigned n_arrays = 0;
+
+# ifndef OLN_INCLUDE_ONLY
+ namespace dummy {
+ // FIXME: Quick hack to suppress the warning
+ // "'oln::debug::n_arrays' defined but not used"
+ void foo() { n_arrays = n_arrays; }
+ }
+# endif
+
+
} // end of namespace oln::debug
} // end of namespace oln
Index: oln/debug/print.hh
===================================================================
--- oln/debug/print.hh (revision 678)
+++ oln/debug/print.hh (working copy)
@@ -34,9 +34,12 @@
# include <oln/core/abstract/iterator.hh>
# include <oln/core/spe/row.hh>
# include <oln/core/spe/col.hh>
-# include <oln/core/2d/point2d.hh>
+# ifdef OLN_ENV_2D
+# include <oln/core/2d/point2d.hh>
+# endif
+
namespace oln
{
@@ -76,6 +79,8 @@
}
+# ifdef OLN_ENV_2D
+
/// Version for classical 2D images.
template <typename I>
void print(const abstract::classical_2d_image<I>& input,
@@ -96,10 +101,12 @@
}
}
+# endif
+
+
} // end of namespace oln::debug::impl
-
/// Facade.
template <typename I>
void print(const abstract::image<I>& input, std::ostream& ostr)
Index: oln/level/assign.hh
===================================================================
--- oln/level/assign.hh (revision 0)
+++ oln/level/assign.hh (revision 0)
@@ -0,0 +1,85 @@
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 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_LEVEL_ASSIGN_HH
+# define OLN_LEVEL_ASSIGN_HH
+
+# include <iostream>
+
+# include <mlc/assert.hh>
+# include <mlc/is_a.hh>
+
+# include <oln/core/abstract/image.hh>
+# include <oln/core/abstract/iterator.hh>
+# include <oln/core/automatic/image/mutable_image.hh>
+
+
+namespace oln
+{
+
+ namespace level
+ {
+
+ /// Fwd decls.
+
+ template <typename Idest, typename Isrc>
+ void assign(abstract::mutable_image<Idest>& dest, const abstract::image<Isrc>& src);
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ namespace impl
+ {
+
+ /// Generic version.
+ template <typename Idest, typename Isrc>
+ void assign(abstract::mutable_image<Idest>& dest, const abstract::image<Isrc>& src)
+ {
+ oln_piter(Isrc) p(src.topo());
+ for_all(p)
+ dest(p) = src(p);
+ }
+
+ } // end of namespace oln::level::impl
+
+
+ /// Facade.
+ template <typename Idest, typename Isrc>
+ void assign(abstract::mutable_image<Idest>& dest, const abstract::image<Isrc>& src)
+ {
+ impl::assign(dest.exact(), src.exact());
+ }
+
+# endif
+
+ } // end of namespace oln::level
+
+} // end of namespace oln
+
+
+#endif // ! OLN_LEVEL_ASSIGN_HH
Index: oln/level/apply.hh
===================================================================
--- oln/level/apply.hh (revision 0)
+++ oln/level/apply.hh (revision 0)
@@ -0,0 +1,109 @@
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 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_LEVEL_APPLY_HH
+# define OLN_LEVEL_APPLY_HH
+
+# include <oln/core/abstract/image.hh>
+# include <oln/core/abstract/iterator.hh>
+# include <oln/core/abstract/functions.hh>
+
+
+namespace oln
+{
+
+ namespace level
+ {
+
+ /// Fwd decl.
+ template <typename I, typename V>
+ oln_plain_value(I, V)
+ apply(const abstract::image<I>& input, V (*fun)(const oln_value(I)&));
+
+ /// Fwd decl.
+ template <typename I, typename F>
+ oln_plain_value(I, typename F::result_value)
+ apply(const abstract::image<I>& input, const abstract::fun_v2v<F>& fun);
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ namespace impl
+ {
+
+ /// Generic version.
+ template <typename I, typename V>
+ oln_plain_value(I, V)
+ apply(const abstract::image<I>& input, V (*fun)(const oln_value(I)&))
+ {
+ oln_plain_value(I, V) output(input.topo());
+ oln_piter(I) p(input.topo());
+ for_all(p)
+ output(p) = fun(input(p));
+ return output;
+ }
+
+ /// Generic version.
+ template <typename I, typename F>
+ oln_plain_value(I, typename F::result_value)
+ apply(const abstract::image<I>& input, const abstract::fun_v2v<F>& fun)
+ {
+ oln_plain_value(I, typename F::result_value) output(input.topo());
+ oln_piter(I) p(input.topo());
+ for_all(p)
+ output(p) = fun.exact()(input(p));
+ return output;
+ }
+
+ } // end of namespace oln::level::impl
+
+
+ /// Facade.
+ template <typename I, typename V>
+ oln_plain_value(I, V)
+ apply(const abstract::image<I>& input, V (*fun)(const oln_value(I)&))
+ {
+ return impl::apply(input, fun);
+ }
+
+ /// Facade.
+ template <typename I, typename F>
+ oln_plain_value(I, typename F::result_value)
+ apply(const abstract::image<I>& input, const abstract::fun_v2v<F>& fun)
+ {
+ return impl::apply(input, fun);
+ }
+
+# endif
+
+ } // end of namespace oln::level
+
+} // end of namespace oln
+
+
+#endif // ! OLN_LEVEL_APPLY_HH
Index: oln/level/fill.hh
===================================================================
--- oln/level/fill.hh (revision 678)
+++ oln/level/fill.hh (working copy)
@@ -36,6 +36,7 @@
# include <oln/core/abstract/image.hh>
# include <oln/core/abstract/iterator.hh>
+# include <oln/core/abstract/functions.hh>
# include <oln/core/automatic/image/mutable_image.hh>
@@ -68,7 +69,16 @@
template <typename I, typename V>
void fill(abstract::mutable_image<I>& input, const V values[]);
+ /// Fwd decl.
+ template <typename I, typename V, typename P>
+ void fill(abstract::mutable_image<I>& input, V (*fun)(const P&));
+ /// Fwd decl.
+ template <typename I, typename F>
+ void fill(abstract::mutable_image<I>& input,
+ const abstract::fun_p2v<F>& fun);
+
+
# ifndef OLN_INCLUDE_ONLY
namespace impl
@@ -93,9 +103,30 @@
input(p) = values[i++];
}
- } // end of namespace oln::level::fill
+ /// Generic version.
+ template <typename I, typename V, typename P>
+ void fill(abstract::mutable_image<I>& input, V (*fun)(const P&))
+ {
+ oln_piter(I) p(input.topo());
+ unsigned i = 0;
+ for_all(p)
+ input(p) = fun(p);
+ }
+ /// Generic version.
+ template <typename I, typename F>
+ void fill(abstract::mutable_image<I>& input,
+ const abstract::fun_p2v<F>& fun)
+ {
+ oln_piter(I) p(input.topo());
+ unsigned i = 0;
+ for_all(p)
+ input(p) = fun.exact()(p);
+ }
+ } // end of namespace oln::level::impl
+
+
/// Facade.
template <typename I>
void fill(abstract::mutable_image<I>& input, const oln_value(I)& value)
@@ -110,7 +141,21 @@
return impl::fill(input.exact(), values);
}
+ /// Facade.
+ template <typename I, typename V, typename P>
+ void fill(abstract::mutable_image<I>& input, V (*fun)(const P&))
+ {
+ return impl::fill(input.exact(), fun);
+ }
+ /// Facade.
+ template <typename I, typename F>
+ void fill(abstract::mutable_image<I>& input,
+ const abstract::fun_p2v<F>& fun)
+ {
+ return impl::fill(input.exact(), fun);
+ }
+
# endif
} // end of namespace oln::level
Index: oln/level/clone.hh
===================================================================
--- oln/level/clone.hh (revision 0)
+++ oln/level/clone.hh (revision 0)
@@ -0,0 +1,80 @@
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 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_LEVEL_CLONE_HH
+# define OLN_LEVEL_CLONE_HH
+
+# include <oln/core/abstract/image.hh>
+# include <oln/core/abstract/iterator.hh>
+
+
+namespace oln
+{
+
+ namespace level
+ {
+
+ /// Fwd decl.
+ template <typename I>
+ oln_plain(I) clone(const abstract::image<I>& input);
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ namespace impl
+ {
+
+ /// Generic version.
+ template <typename I>
+ oln_plain(I) clone(const abstract::image<I>& input)
+ {
+ oln_plain(I) output(input.topo());
+ oln_piter(I) p(input.topo());
+ for_all(p)
+ output(p) = input(p);
+ return output;
+ }
+
+ } // end of namespace oln::level::impl
+
+
+ /// Facade.
+ template <typename I>
+ oln_plain(I) clone(const abstract::image<I>& input)
+ {
+ return impl::clone(input);
+ }
+
+# endif
+
+ } // end of namespace oln::level
+
+} // end of namespace oln
+
+
+#endif // ! OLN_LEVEL_CLONE_HH
Index: oln/basics1d.hh
===================================================================
--- oln/basics1d.hh (revision 678)
+++ oln/basics1d.hh (working copy)
@@ -30,6 +30,9 @@
# define OLN_BASICS1D_HH
+# define OLN_ENV_1D
+
+
# include <oln/core/1d/aliases.hh>
# include <oln/core/gen/grid.hh>
Index: oln/core/typedefs.hh
===================================================================
--- oln/core/typedefs.hh (revision 678)
+++ oln/core/typedefs.hh (working copy)
@@ -279,6 +279,9 @@
# define oln_plain(T) typename oln::type_fun::plain<T>::ret
# define oln_plain_(T) oln::type_fun::plain<T>::ret
+# define oln_plain_value(I, V) typename oln::type_fun::ch_value< oln_plain(I), V >::ret
+# define oln_plain_value_(I, V) oln::type_fun::ch_value< oln_plain(I), V >::ret
+
/// \}
Index: oln/core/iterator_vtypes.hh
===================================================================
--- oln/core/iterator_vtypes.hh (revision 678)
+++ oln/core/iterator_vtypes.hh (working copy)
@@ -33,7 +33,7 @@
# include <oln/core/1d/aliases.hh>
# include <oln/core/2d/aliases.hh>
# include <oln/core/3d/aliases.hh>
-# include <oln/core/type_fun/slice.hh>
+// # include <oln/core/type_fun/slice.hh>
namespace oln
@@ -272,67 +272,7 @@
};
- /*-----------------------------.
- | oln::morpher::slice<Image>. |
- `-----------------------------*/
- // Forward declarations.
- namespace morpher
- {
- template <typename Image> struct slice;
- }
- template <typename Piter, typename Topo> class piter_slice_;
-
-
- // piters.
-
- /// fwd_piter vtype of morpher::slice.
- template <typename Image>
- struct single_vtype< morpher::slice<Image>, typedef_::fwd_piter_type >
- {
- private:
- typedef oln_type_of(Image, fwd_piter) orig_fwd_piter;
- public:
- typedef typename type_fun::slice_iterator<orig_fwd_piter>::ret ret;
- };
-
- /// bkd_piter vtype of morpher::slice.
- template <typename Image>
- struct single_vtype< morpher::slice<Image>, typedef_::bkd_piter_type >
- {
- private:
- typedef oln_type_of(Image, bkd_piter) orig_bkd_piter;
- public:
- typedef typename type_fun::slice_iterator<orig_bkd_piter>::ret ret;
- };
-
-
- // qiters.
-
- /// fwd_qiter vtype of morpher::slice.
- template <typename Image>
- struct single_vtype< morpher::slice<Image>, typedef_::fwd_qiter_type >
- {
- private:
- typedef oln_type_of(Image, fwd_qiter) orig_fwd_qiter;
- public:
- typedef typename type_fun::slice_iterator<orig_fwd_qiter>::ret ret;
- };
-
- /// bkd_qiter vtype of morpher::slice.
- template <typename Image>
- struct single_vtype< morpher::slice<Image>, typedef_::bkd_qiter_type >
- {
- private:
- typedef oln_type_of(Image, bkd_qiter) orig_bkd_qiter;
- public:
- typedef typename type_fun::slice_iterator<orig_bkd_qiter>::ret ret;
- };
-
-
- // FIXME: What about niters?
-
-
} // end of namespace oln
Index: oln/core/abstract/functions.hh
===================================================================
--- oln/core/abstract/functions.hh (revision 0)
+++ oln/core/abstract/functions.hh (revision 0)
@@ -0,0 +1,98 @@
+// 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_CORE_ABSTRACT_FUNCTIONS_HH
+# define OLN_CORE_ABSTRACT_FUNCTIONS_HH
+
+# include <stc/any.hh>
+# include <oln/core/type.hh>
+
+
+namespace oln
+{
+
+ namespace abstract
+ {
+
+ // Point -> Value.
+
+ template <typename E>
+ struct fun_p2v : public virtual stc::any__simple<E>,
+ public oln::type
+ {
+ protected:
+ fun_p2v();
+ };
+
+
+ // Value -> Value.
+
+ template <typename E>
+ struct fun_v2v : public virtual stc::any__simple<E>,
+ public oln::type
+ {
+ protected:
+ fun_v2v();
+ };
+
+
+ // Point -> Point.
+
+ template <typename E>
+ struct fun_p2p : public virtual stc::any__simple<E>,
+ public oln::type
+ {
+ protected:
+ fun_p2p();
+ };
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename E>
+ fun_p2v<E>::fun_p2v()
+ {
+ }
+
+ template <typename E>
+ fun_v2v<E>::fun_v2v()
+ {
+ }
+
+ template <typename E>
+ fun_p2p<E>::fun_p2p()
+ {
+ }
+
+# endif
+
+ } // end of namespace oln::abstract
+
+} // end of namespace oln
+
+
+#endif // ! OLN_CORE_ABSTRACT_FUNCTIONS_HH
Index: oln/basics2d.hh
===================================================================
--- oln/basics2d.hh (revision 678)
+++ oln/basics2d.hh (working copy)
@@ -30,6 +30,9 @@
# define OLN_BASICS2D_HH
+# define OLN_ENV_2D
+
+
# include <oln/core/2d/aliases.hh>
# include <oln/core/gen/grid.hh>
Index: oln/Makefile.am
===================================================================
--- oln/Makefile.am (revision 678)
+++ oln/Makefile.am (working copy)
@@ -80,6 +80,7 @@
core/abstract/bbox.hh \
core/abstract/dpoint.hh \
core/abstract/entry.hh \
+ core/abstract/functions.hh \
core/abstract/fwd_decls.hh \
core/abstract/grid.hh \
core/abstract/image.hh \
@@ -165,6 +166,9 @@
\
io/pnm.hh \
\
+ level/apply.hh \
+ level/assign.hh \
+ level/clone.hh \
level/fill.hh \
\
morpher/internal/image_extension.hh \
Index: oln/basics3d.hh
===================================================================
--- oln/basics3d.hh (revision 678)
+++ oln/basics3d.hh (working copy)
@@ -30,6 +30,9 @@
# define OLN_BASICS3D_HH
+# define OLN_ENV_3D
+
+
# include <oln/core/3d/aliases.hh>
# include <oln/core/gen/grid.hh>
Index: oln/morpher/slice.hh
===================================================================
--- oln/morpher/slice.hh (revision 678)
+++ oln/morpher/slice.hh (working copy)
@@ -140,6 +140,58 @@
/// \}
+
+
+
+ // piters.
+
+ /// fwd_piter vtype of morpher::slice.
+ template <typename Image>
+ struct single_vtype< morpher::slice<Image>, typedef_::fwd_piter_type >
+ {
+ private:
+ typedef oln_type_of(Image, fwd_piter) orig_fwd_piter;
+ public:
+ typedef typename type_fun::slice_iterator<orig_fwd_piter>::ret ret;
+ };
+
+ /// bkd_piter vtype of morpher::slice.
+ template <typename Image>
+ struct single_vtype< morpher::slice<Image>, typedef_::bkd_piter_type >
+ {
+ private:
+ typedef oln_type_of(Image, bkd_piter) orig_bkd_piter;
+ public:
+ typedef typename type_fun::slice_iterator<orig_bkd_piter>::ret ret;
+ };
+
+
+ // qiters.
+
+ /// fwd_qiter vtype of morpher::slice.
+ template <typename Image>
+ struct single_vtype< morpher::slice<Image>, typedef_::fwd_qiter_type >
+ {
+ private:
+ typedef oln_type_of(Image, fwd_qiter) orig_fwd_qiter;
+ public:
+ typedef typename type_fun::slice_iterator<orig_fwd_qiter>::ret ret;
+ };
+
+ /// bkd_qiter vtype of morpher::slice.
+ template <typename Image>
+ struct single_vtype< morpher::slice<Image>, typedef_::bkd_qiter_type >
+ {
+ private:
+ typedef oln_type_of(Image, bkd_qiter) orig_bkd_qiter;
+ public:
+ typedef typename type_fun::slice_iterator<orig_bkd_qiter>::ret ret;
+ };
+
+
+
+
+
namespace morpher
{
@@ -203,4 +255,5 @@
} // end of namespace oln
+
#endif // ! OLN_MORPHER_SLICE_HH
2006-10-24 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
Add point-wise values.
* tests/core/pw_value.cc: New.
* tests/core/Makefile.am: Update.
* oln/core/gen/pw_value.hh: New.
* oln/Makefile.am: Update.
Index: tests/core/pw_value.cc
===================================================================
--- tests/core/pw_value.cc (revision 0)
+++ tests/core/pw_value.cc (revision 0)
@@ -0,0 +1,50 @@
+// 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 pw_value.
+
+#include <cassert>
+
+#include <oln/basics2d.hh>
+#include <oln/core/gen/pw_value.hh>
+
+
+
+int main()
+{
+ using namespace oln;
+
+ point2d p(0,0);
+ image2d<int> ima1(3,3);
+ ima1(p) = 1;
+
+ image2d<float> ima2(3,3);
+ ima2(p) = 2.3;
+
+ double d = ((pw_value(ima1) + 4 * pw_value(ima2)) / .2)(p);
+ assert(d > 50.9999 and d < 51.0001);
+}
Index: tests/core/Makefile.am
===================================================================
--- tests/core/Makefile.am (revision 675)
+++ tests/core/Makefile.am (working copy)
@@ -27,6 +27,7 @@
image2d \
image3d \
npoints \
+ pw_value \
window2d \
\
at
@@ -40,6 +41,7 @@
image2d_SOURCES = image2d.cc
image3d_SOURCES = image3d.cc
npoints_SOURCES = npoints.cc
+pw_value_SOURCES = pw_value.cc
window2d_SOURCES = window2d.cc
# Methods.
Index: oln/core/gen/pw_value.hh
===================================================================
--- oln/core/gen/pw_value.hh (revision 0)
+++ oln/core/gen/pw_value.hh (revision 0)
@@ -0,0 +1,106 @@
+// Copyright (C) 2005, 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_CORE_GEN_PW_VALUE_HH
+# define OLN_CORE_GEN_PW_VALUE_HH
+
+# include <oln/core/abstract/image.hh>
+# include <xtd/abstract/meta_nary_fun.hh>
+# include <xtd/math.hh>
+
+
+
+namespace xtd
+{
+
+ // Fwd decl.
+ template <typename I>
+ class pw_value_type;
+
+
+ template <typename I, typename A>
+ struct res_< pw_value_type<I>, A >
+ {
+ typedef oln_rvalue(I) ret;
+ };
+
+
+ template <typename I>
+ class pw_value_type : public xtd::abstract::meta_nary_fun_< 1, pw_value_type<I> >
+ {
+ public:
+
+ pw_value_type(const I& ima);
+
+ template <typename P>
+ oln_rvalue(I) impl_calc(const P& p) const;
+
+ protected:
+
+ const I& ima_;
+ };
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename I>
+ template <typename A>
+ oln_rvalue(I)
+ pw_value_type<I>::impl_calc(const A& a) const
+ {
+ mlc::assert_< mlc_is_a(A, oln::abstract::point) >::check();
+ return ima_(a);
+ }
+
+ template <typename I>
+ pw_value_type<I>::pw_value_type(const I& ima)
+ : ima_(ima)
+ {
+ }
+
+# endif
+
+
+} // end of namespace xtd
+
+
+namespace oln
+{
+
+ template <typename I>
+ xtd::m1expr_< xtd::pw_value_type<I>, xtd::arg_<1> >
+ pw_value(const abstract::image<I>& ima)
+ {
+ xtd::pw_value_type<I> pwv(ima.exact());
+ using xtd::_1;
+ return pwv(_1); // expects one argument (for instance a point) or an expression :)
+ }
+
+} // end of namespace oln
+
+
+#endif // ! OLN_CORE_GEN_PW_VALUE_HH
Index: oln/Makefile.am
===================================================================
--- oln/Makefile.am (revision 675)
+++ oln/Makefile.am (working copy)
@@ -123,6 +123,7 @@
core/gen/grid.hh \
core/gen/mapimage.hh \
core/gen/neighb.hh \
+ core/gen/pw_value.hh \
core/gen/topo_add_nbh.hh \
core/gen/topo_bbox.hh \
core/gen/topo_lbbox.hh \
https://svn.lrde.epita.fr/svn/oln/trunk/olena
Index: ChangeLog
from Roland Levillain <roland(a)lrde.epita.fr>
Add a morpher adding a look-up table to an image.
* oln/core/lookup_table.hh: New.
* oln/morpher/with_lut.hh: New morpher.
* oln/Makefile.am (nobase_oln_HEADERS): Add core/lookup_table.hh
and morpher/with_lut.hh.
* tests/morphers/with_lut.cc: New test.
* tests/morphers/Makefile.am (check_PROGRAMS): Add with_lut.
(with_lut_SOURCES): New.
oln/Makefile.am | 2
oln/core/lookup_table.hh | 125 +++++++++++++++++++++++++++++++
oln/morpher/with_lut.hh | 177 +++++++++++++++++++++++++++++++++++++++++++++
tests/morphers/Makefile.am | 2
tests/morphers/with_lut.cc | 96 ++++++++++++++++++++++++
5 files changed, 402 insertions(+)
Index: tests/morphers/with_lut.cc
--- tests/morphers/with_lut.cc (revision 0)
+++ tests/morphers/with_lut.cc (revision 0)
@@ -0,0 +1,96 @@
+// 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 look-up table morpher.
+
+#include <oln/basics2d.hh>
+#include <oln/morpher/with_lut.hh>
+#include <oln/value/color/rgb.hh>
+#include <oln/level/fill.hh>
+#include <oln/debug/print.hh>
+
+
+// FIXME: Remove.
+using namespace oln;
+
+template <typename I>
+void image_test(const oln::abstract::image<I>&)
+{
+ // Do nothing.
+}
+
+oln::value::color::rgb8 white(255, 255, 255);
+oln::value::color::rgb8 blue ( 0, 0, 255);
+
+int main()
+{
+ using oln::value::color::rgb8;
+
+ unsigned data[] = { 0, 1, 2, 0, 1, 2, 0, 1, 2};
+
+ typedef image2d<unsigned> image_t;
+ image_t ima(3, 3);
+ level::fill(ima, data);
+ debug::print(ima);
+
+ typedef lookup_table<unsigned, rgb8> lut_t;
+ lut_t lut;
+ rgb8 c(16, 6, 4);
+ lut.
+ add(0, blue).
+ add(1, white).
+ add(2, c);
+ std::cout << lut << std::endl;
+
+ typedef morpher::with_lut<image_t, lut_t> lutimage_t;
+ lutimage_t ima2 = ima + lut;
+
+ // ima2 is an image, and can be as argument to to image routines.
+ image_test(ima2);
+
+ // FIXME: To be enabled later.
+#if 0
+ // it is value-wise accessible:
+ ima2.value(c) = red;
+#endif
+
+ // let's look at it
+ debug::print(ima2);
+ std::cout << std::endl;
+
+ // it is a 2D image so we have:
+ point2d p(1, 1);
+ std::cout << "ima2(p) =" << ima2(p) << std::endl;
+ // or (likewise):
+ std::cout << "ima2.at(1, 1) =" << ima2.at(1, 1) << std::endl;
+
+ // FIXME: To be enabled later.
+#if 0
+ // FIXME...
+ level::apply(ima2, fun); // 3 ops only !!!
+#endif
+}
Index: tests/morphers/Makefile.am
--- tests/morphers/Makefile.am (revision 673)
+++ tests/morphers/Makefile.am (working copy)
@@ -24,6 +24,7 @@
slice_morpher \
stack_morpher \
value_cast \
+ with_lut \
\
morphers
@@ -33,6 +34,7 @@
slice_morpher_SOURCES = slice_morpher.cc
stack_morpher_SOURCES = stack_morpher.cc
value_cast_SOURCES = value_cast.cc
+with_lut_SOURCES = with_lut.cc
morphers_SOURCES = morphers.cc
Index: oln/core/lookup_table.hh
--- oln/core/lookup_table.hh (revision 0)
+++ oln/core/lookup_table.hh (revision 0)
@@ -0,0 +1,125 @@
+// 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_CORE_LOOKUP_TABLE_HH
+# define OLN_CORE_LOOKUP_TABLE_HH
+
+# include <map>
+# include <ostream>
+
+namespace oln
+{
+
+ template <typename Key, typename Data>
+ class lookup_table
+ {
+ typedef lookup_table<Key, Data> self_t;
+
+ public:
+ typedef Key key_type;
+ typedef Data data_type;
+ typedef std::map<Key, Data> map_type;
+
+ public:
+ lookup_table();
+
+ self_t& add (const key_type& k, const data_type& d);
+
+ const data_type operator () (const key_type& key) const;
+
+ const map_type& map() const;
+
+ private:
+ std::map<Key, Data> map_;
+ };
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename Key, typename Data>
+ lookup_table<Key, Data>::lookup_table() :
+ map_()
+ {
+ }
+
+ template <typename Key, typename Data>
+ lookup_table<Key, Data>&
+ lookup_table<Key, Data>::add (const Key& k, const Data& d)
+ {
+ map_.insert(std::make_pair(k, d));
+ return *this;
+ }
+
+ template <typename Key, typename Data>
+ const Data
+ lookup_table<Key, Data>::operator () (const Key& key) const
+ {
+ typedef typename lookup_table<Key, Data>::map_type map_t;
+ typename map_t::const_iterator i = map_.find(key);
+ // FIXME: Is this the expected behavior when the LUT has no data
+ // for \a key.
+ assert(i != map_.end());
+ return i->second;
+ }
+
+ template <typename Key, typename Data>
+ const typename lookup_table<Key, Data>::map_type&
+ lookup_table<Key, Data>::map() const
+ {
+ return map_;
+ }
+
+# endif
+
+
+ /// Print a look-up table.
+ template <typename Key, typename Data>
+ std::ostream&
+ operator<< (std::ostream& ostr, const lookup_table<Key, Data>& lut);
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename Key, typename Data>
+ std::ostream&
+ operator<< (std::ostream& ostr, const lookup_table<Key, Data>& lut)
+ {
+ typedef lookup_table<Key, Data> lut_t;
+ const typename lut_t::map_type& map = lut.map();
+ for (typename lut_t::map_type::const_iterator i = map.begin ();
+ i != map.end(); ++i)
+ ostr << " " << i->first << " -> " << i->second << std::endl;
+ return ostr;
+ }
+
+# endif
+
+} // end of namespace oln
+
+
+
+#endif // ! OLN_CORE_LOOKUP_TABLE_HH
Index: oln/Makefile.am
--- oln/Makefile.am (revision 673)
+++ oln/Makefile.am (working copy)
@@ -148,6 +148,7 @@
core/fwd_decls.hh \
core/image_entry.hh \
core/iterator_vtypes.hh \
+ core/lookup_table.hh \
core/macros.hh \
core/neighborhood_entry.hh \
core/point_set_entry.hh \
@@ -177,6 +178,7 @@
morpher/thru_fun.hh \
morpher/thru_mfun.hh \
morpher/value_cast.hh \
+ morpher/with_lut.hh \
\
value/color/rgb.hh \
\
Index: oln/morpher/with_lut.hh
--- oln/morpher/with_lut.hh (revision 0)
+++ oln/morpher/with_lut.hh (revision 0)
@@ -0,0 +1,177 @@
+// 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_WITH_LUT_HH
+# define OLN_MORPHER_WITH_LUT_HH
+
+# include <oln/morpher/internal/image_value_morpher.hh>
+# include <oln/core/lookup_table.hh>
+
+
+namespace oln
+{
+
+ namespace morpher
+ {
+ // Forward declaration.
+ template <typename Image, typename Lut> struct with_lut;
+
+ } // end of namespace oln::morpher
+
+
+ /// Super type.
+ template <typename Image, typename Lut>
+ struct set_super_type< morpher::with_lut<Image, Lut> >
+ {
+ typedef morpher::with_lut<Image, Lut> self_t;
+ typedef morpher::internal::image_value_morpher<Image, self_t> ret;
+ };
+
+ /// Virtual types associated to oln::morpher::with_lut<Image, Lut>.
+ /// \{
+ template <typename Image, typename Lut>
+ struct vtypes< morpher::with_lut<Image, Lut> >
+ {
+ private:
+ typedef oln_type_of(Image, rvalue) orig_value_type;
+ public:
+ typedef mlc::true_ is_computed_type;
+ // Value type.
+ typedef typename Lut::data_type value_type;
+ // Look-up table type.
+ typedef Lut lut_type;
+ };
+
+ // Rvalue.
+ template <typename Image, typename Lut>
+ struct single_vtype< morpher::with_lut<Image, Lut>, typedef_::rvalue_type >
+ {
+ typedef morpher::with_lut<Image, Lut> self_t;
+ typedef oln_value(self_t) ret;
+ };
+
+ // FIXME: What about lvalue type?
+
+// // Lvalue.
+// template <typename Image>
+// struct single_vtype< morpher::slice<Image>, typedef_::lvalue_type >
+// {
+// typedef oln_type_of(Image, lvalue) ret;
+// };
+ /// \}
+
+
+ namespace morpher
+ {
+ /// Look-up table addition morpher.
+ template <typename Image, typename Lut>
+ class with_lut : public stc_get_supers(mlc_comma_1(with_lut<Image, Lut>))
+ // FIXME: Ensure oln_value(Image) == Lut::data_type? Or just let
+ // the ctor check this property?
+ {
+ private:
+ typedef with_lut<Image, Lut> self_t;
+ typedef stc_get_super(self_t) super_t;
+ typedef Lut lut_t;
+ typedef oln_type_of(self_t, value) value_t;
+ typedef oln_type_of(self_t, rvalue) rvalue_t;
+ typedef oln_type_of(self_t, psite) psite_t;
+ // FIXME: Useful typedef?
+// typedef oln_type_of(Image, value) orig_value_t;
+
+ public:
+ with_lut(const Image& image, const Lut& lut);
+ const lut_t& lut() const;
+
+ rvalue_t impl_op_read(const psite_t& p) const;
+
+ // FIXME: Implement impl_op_write() when there is value proxy?
+
+ protected:
+ lut_t lut_;
+ };
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename Image, typename Lut>
+ with_lut<Image, Lut>::with_lut(const Image& image, const Lut& lut) :
+ super_t(image),
+ lut_(lut)
+ {
+ mlc::assert_equal_< oln_value(Image), typename Lut::key_type >::check();
+ }
+
+ template <typename Image, typename Lut>
+ typename with_lut<Image, Lut>::rvalue_t
+ with_lut<Image, Lut>::
+ impl_op_read(const typename with_lut<Image, Lut>::psite_t& p) const
+ {
+ // FIXME: What if lut_ has no value for `this->image_(p)'? At
+ // least, document the behavior of this method (will it abort,
+ // does the LUT have to provide a default value, etc.)
+ return lut_(this->image_(p));
+ }
+
+ template <typename Image, typename Lut>
+ const typename with_lut<Image, Lut>::lut_t&
+ with_lut<Image, Lut>::lut() const
+ {
+ return lut_;
+ }
+
+# endif
+
+ } // end of namespace oln::morpher
+
+
+
+ template <typename I, typename K, typename D>
+ morpher::with_lut< I, lookup_table<K, D> >
+ operator + (const abstract::image<I>& image,
+ const lookup_table<K, D>& lut);
+
+
+# ifndef OLN_INCLUDE_ONLY
+
+ template <typename I, typename K, typename D>
+ morpher::with_lut< I, lookup_table<K, D> >
+ operator + (const abstract::image<I>& image,
+ const lookup_table<K, D>& lut)
+ {
+ typedef lookup_table<K, D> lut_t;
+ mlc::assert_equal_< oln_value(I), typename lut_t::key_type >::check();
+ morpher::with_lut<I, lut_t> tmp(image.exact(), lut);
+ return tmp;
+ }
+
+# endif
+
+} // end of namespace oln
+
+
+#endif // ! OLN_MORPHER_WITH_LUT_HH