- Olena-patches

last-svn-commit-519-gba4ead1 Add a warning about Python 2.6 and greater regarding Swilena.
by Roland Levillain 22 Oct '10

22 Oct '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89ba9f1..e584ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add a warning about Python 2.6 and greater regarding Swilena. + + * configure.ac: Here. + 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> Factor the implementations of OLN_WITH_LIB and OLN_WITH_LIB_PKG_CONFIG. diff --git a/configure.ac b/configure.ac index 9e5a830..4f0ddd6 100644 --- a/configure.ac +++ b/configure.ac @@ -279,6 +279,8 @@ disabled. Try to invoke configure with `--enable-shared'.]) # Check for Python. AM_PATH_PYTHON([2.4], [], [AC_MSG_ERROR([Python 2.4 is required for Swilena.])]) + AS_VERSION_COMPARE([2.5], [$am_cv_python_version], + [AC_MSG_WARN([Python 2.6 and greater may not work with Swilena.])]) adl_CHECK_PYTHON # Check for Python headers. save_CPPFLAGS=$CPPFLAGS -- 1.5.6.5

1 0

last-svn-commit-518-g2dafa47 Disable the non deterministic test on mln::labeling::colorize.
by Roland Levillain 21 Oct '10

21 Oct '10

* tests/labeling/Makefile.am (check_PROGRAMS): Remove colorize. (colorize_SOURCES): Disable. --- milena/ChangeLog | 7 +++++++ milena/tests/labeling/Makefile.am | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4fa2864..578464c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Disable the non deterministic test on mln::labeling::colorize. + + * tests/labeling/Makefile.am (check_PROGRAMS): Remove colorize. + (colorize_SOURCES): Disable. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Add a test on built-in floating point value's traits. * tests/value/builtin/floatings.cc: New. diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index d7515fa..c272da4 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -21,7 +21,6 @@ check_PROGRAMS = \ background \ blobs \ blobs_and_compute \ - colorize \ compute \ fill_holes \ flat_zones \ @@ -38,7 +37,6 @@ check_PROGRAMS = \ background_SOURCES = background.cc blobs_SOURCES = blobs.cc blobs_and_compute_SOURCES = blobs_and_compute.cc -colorize_SOURCES = colorize.cc compute_SOURCES = compute.cc fill_holes_SOURCES = fill_holes.cc flat_zones_SOURCES = flat_zones.cc @@ -52,4 +50,11 @@ relabel_SOURCES = relabel.cc value_SOURCES = value.cc wrap_SOURCES = wrap.cc +### FIXME: Disable this test, since labeling::colorize depends on +### rand(), which does not behave uniformly among the various targeted +### platforms. +## check_PROGRAMS += \ +## colorize \ +## colorize_SOURCES = colorize.cc + TESTS = $(check_PROGRAMS) -- 1.5.6.5

1 0

last-svn-commit-517-ga42fcb6 Add a test on built-in floating point value's traits.
by Roland Levillain 21 Oct '10

21 Oct '10

* tests/value/builtin/floatings.cc: New. * tests/value/builtin/Makefile.am (check_PROGRAMS): Add floatings. (floatings_SOURCES): New. --- milena/ChangeLog | 8 ++++++ milena/tests/value/builtin/Makefile.am | 6 +++- .../tests/value/builtin/floatings.cc | 24 +++++++------------ 3 files changed, 21 insertions(+), 17 deletions(-) copy scribo/tests/toolchain/nepomuk/text_extraction.cc => milena/tests/value/builtin/floatings.cc (75%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 59ce01f..4fa2864 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Add a test on built-in floating point value's traits. + + * tests/value/builtin/floatings.cc: New. + * tests/value/builtin/Makefile.am (check_PROGRAMS): Add floatings. + (floatings_SOURCES): New. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Add macros for non-template contexts in mln/value/ops.hh. * mln/value/ops.hh (mln_trait_value_sum_product_) diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am index fd5347d..31ac350 100644 --- a/milena/tests/value/builtin/Makefile.am +++ b/milena/tests/value/builtin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -18,9 +18,11 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - builtin + builtin \ + floatings # FIXME: Rename this test, as `builtin' is not enough relevant. builtin_SOURCES = builtin.cc +floatings_SOURCES = floatings.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/milena/tests/value/builtin/floatings.cc similarity index 75% copy from scribo/tests/toolchain/nepomuk/text_extraction.cc copy to milena/tests/value/builtin/floatings.cc index 027ad99..87d493a 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/milena/tests/value/builtin/floatings.cc @@ -23,22 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file -/// -/// Test of scribo::toolchain::nepomuk::text_extraction - -#include <QtGui/QImage> -#include <QtCore> -#include <scribo/toolchain/nepomuk/text_extraction.hh> - -#include "tests/data.hh" +#include <mln/value/ops.hh> +#include <mln/value/builtin/floatings.hh> int main() { - QImage ima(SCRIBO_IMG_DIR "/wildly.pbm"); - QSet<QString> words = scribo::toolchain::nepomuk::text_extraction(ima); - - mln_assertion(words.size() == 1); - mln_assertion(words.contains("Wildly")); - return 0; + std::cout << "mln_sum_product_(float, float) is `" + << mln_trait_value_name(mln_sum_product_(float, float)) << "'" + << std::endl; + // FIXME: Displays `float': probably not good. :( + std::cout << "mln_sum_product_(double, double)) is `" + << mln_trait_value_name(mln_sum_product_(double, double)) << "'" + << std::endl; } -- 1.5.6.5

1 0

last-svn-commit-516-g8a8fddc Add macros for non-template contexts in mln/value/ops.hh.
by Roland Levillain 21 Oct '10

21 Oct '10

* mln/value/ops.hh (mln_trait_value_sum_product_) (mln_sum_product_): New macros. --- milena/ChangeLog | 7 +++++++ milena/mln/value/ops.hh | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb2b087..59ce01f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Add macros for non-template contexts in mln/value/ops.hh. + + * mln/value/ops.hh (mln_trait_value_sum_product_) + (mln_sum_product_): New macros. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Improve the genericity of vector normalization. * mln/algebra/vec.hh (mln::algebra::vec<n,T>::normalize): Use diff --git a/milena/mln/value/ops.hh b/milena/mln/value/ops.hh index 49d35ea..5d76002 100644 --- a/milena/mln/value/ops.hh +++ b/milena/mln/value/ops.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -44,10 +45,13 @@ /// Type trait for value sum. # define mln_trait_value_sum_product(T, U) \ typename mln::trait::value_< mln_trait_op_times(T,U) >::sum +# define mln_trait_value_sum_product_(T, U) \ + mln::trait::value_< mln_trait_op_times_(T,U) >::sum /// Shortcut for type trait for value sum. # define mln_sum_product(T, U) mln_trait_value_sum_product(T, U) +# define mln_sum_product_(T, U) mln_trait_value_sum_product_(T, U) // FIXME: In the definitions below, is that equiv or interop? -- 1.5.6.5

1 0

last-svn-commit-515-g3086fc9 Improve the genericity of vector normalization.
by Roland Levillain 21 Oct '10

21 Oct '10

* mln/algebra/vec.hh (mln::algebra::vec<n,T>::normalize): Use mln_sum_product(T,T) instead of the hard-coded type `float' as return value of mln::norm::l2. --- milena/ChangeLog | 8 ++++++++ milena/mln/algebra/vec.hh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9ed9189..fb2b087 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Improve the genericity of vector normalization. + + * mln/algebra/vec.hh (mln::algebra::vec<n,T>::normalize): Use + mln_sum_product(T,T) instead of the hard-coded type `float' as + return value of mln::norm::l2. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + * mln/fun/x2x/rotation.hh: Aesthetic changes. 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/algebra/vec.hh b/milena/mln/algebra/vec.hh index 096f558..22ebc02 100644 --- a/milena/mln/algebra/vec.hh +++ b/milena/mln/algebra/vec.hh @@ -540,8 +540,8 @@ namespace mln inline const vec<n, T>& vec<n, T>::normalize() { - float l2_norm = float(norm::l2(*this)); - mln_assertion(l2_norm > 0.f); + mln_sum_product(T,T) l2_norm = norm::l2(*this); + mln_assertion(l2_norm > mln_sum_product(T,T)(0)); for (unsigned i = 0; i < n; ++i) data_[i] = static_cast<T>(data_[i] / l2_norm); return *this; -- 1.5.6.5

1 0

last-svn-commit-514-gbddf6ea mln/fun/x2x/rotation.hh: Aesthetic changes.
by Roland Levillain 21 Oct '10

21 Oct '10

--- milena/ChangeLog | 4 + milena/mln/fun/x2x/rotation.hh | 211 ++++++++++++++++++++-------------------- 2 files changed, 110 insertions(+), 105 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e5fef24..9ed9189 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + * mln/fun/x2x/rotation.hh: Aesthetic changes. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Ensure non implemented rotation code stops the execution. * mln/fun/x2x/rotation.hh diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index d9e5940..3cd54f1 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -61,80 +61,83 @@ namespace mln namespace internal { - template < unsigned n, typename C > - algebra::h_mat<n, C> - get_rot_h_mat(const C alpha_, const algebra::vec<n,C>& axis_) - { + // (Axis, angle)-based rotation: general case (not implemented). + template < unsigned n, typename C > + algebra::h_mat<n, C> + get_rot_h_mat(const C alpha_, const algebra::vec<n,C>& axis_) + { std::cerr << __FILE__ << ":" << __LINE__ << ": error:" << " generic mln::fun::x2x::internal::get_rot_h_mat<n, C>" << " not implemented." << std::endl; std::abort(); - } - - template <typename C > - algebra::h_mat<3, C> - get_rot_h_mat(const C alpha_, const algebra::vec<3,C>& axis_) - { - //test axis is valid + } + + // (Axis, angle)-based rotation: 2D case. + template <typename C > + algebra::h_mat<2, C> + get_rot_h_mat(const C alpha, const algebra::vec<2,C>&) + { + const C cos_a = cos(alpha); + const C sin_a = sin(alpha); + + algebra::h_mat<2, C> m; + + m(0,0) = cos_a; m(0,1) = -sin_a; m(0,2) = 0; + m(1,0) = sin_a; m(1,1) = cos_a; m(1,2) = 0; + m(2,0) = 0; m(2,1) = 0; m(2,2) = 1; + + return m; + } + + // (Axis, angle)-based rotation: 3D case. + template <typename C > + algebra::h_mat<3, C> + get_rot_h_mat(const C alpha, const algebra::vec<3,C>& axis) + { + // Ensure axis is valid. typedef algebra::vec<3,C> vec_t; - //FIXME: cannot use '!=' operator. - mln_precondition(!(axis_ == vec_t(literal::zero))); - - /// Be sure that axis is normalized. - algebra::vec<3,C> axis = axis_; - axis.normalize(); - - const C cos_a = cos(alpha_); - const C sin_a = sin(alpha_); - const C u = axis_[0]; - const C v = axis_[1]; - const C w = axis_[2]; - const C u2 = u * u; - const C v2 = v * v; - const C w2 = w * w; - - algebra::h_mat<3, C> m_; - - m_(0,0) = u2 + (1 - u2) * cos_a; - m_(0,1) = u*v * (1 - cos_a) - w * sin_a; - m_(0,2) = u*w * (1 - cos_a) + v * sin_a; - m_(0,3) = 0; - - m_(1,0) = u*v * (1 - cos_a) + w * sin_a; - m_(1,1) = v2 + (1 - v2) * cos_a; - m_(1,2) = v * w * (1 - cos_a) - u * sin_a; - m_(1,3) = 0; - - m_(2,0) = u * w * (1 - cos_a) - v * sin_a; - m_(2,1) = v * w * (1 - cos_a) + u * sin_a; - m_(2,2) = w2 + (1 - w2) * cos_a; - m_(2,3) = 0; - - m_(3,0) = 0; - m_(3,1) = 0; - m_(3,2) = 0; - m_(3,3) = 1; - - return m_; - } - - template <typename C > - algebra::h_mat<2, C> - get_rot_h_mat(const C alpha_, const algebra::vec<2,C>&) - { - const C cos_a = cos(alpha_); - const C sin_a = sin(alpha_); - - algebra::h_mat<2, C> m_; - - m_(0,0) = cos_a; m_(0,1) = -sin_a; m_(0,2) = 0; - m_(1,0) = sin_a; m_(1,1) = cos_a; m_(1,2) = 0; - m_(2,0) = 0; m_(2,1) = 0; m_(2,2) = 1; - - return m_; - } + // FIXME: This check is not precise enought when the vector + // holds floating point values. + mln_precondition(axis != vec_t(literal::zero)); + + algebra::vec<3,C> normed_axis = axis; + normed_axis.normalize(); + + const C cos_a = cos(alpha); + const C sin_a = sin(alpha); + const C u = normed_axis[0]; + const C v = normed_axis[1]; + const C w = normed_axis[2]; + const C u2 = u * u; + const C v2 = v * v; + const C w2 = w * w; + + algebra::h_mat<3, C> m; + + m(0,0) = u2 + (1 - u2) * cos_a; + m(0,1) = u * v * (1 - cos_a) - w * sin_a; + m(0,2) = u * w * (1 - cos_a) + v * sin_a; + m(0,3) = 0; + + m(1,0) = u * v * (1 - cos_a) + w * sin_a; + m(1,1) = v2 + (1 - v2) * cos_a; + m(1,2) = v * w * (1 - cos_a) - u * sin_a; + m(1,3) = 0; + + m(2,0) = u * w * (1 - cos_a) - v * sin_a; + m(2,1) = v * w * (1 - cos_a) + u * sin_a; + m(2,2) = w2 + (1 - w2) * cos_a; + m(2,3) = 0; + + m(3,0) = 0; + m(3,1) = 0; + m(3,2) = 0; + m(3,3) = 1; + + return m; + } } // end of namespace internal @@ -142,44 +145,43 @@ namespace mln /// Represent a rotation function. template <unsigned n, typename C> struct rotation - : - fun::internal::x2x_linear_impl_< algebra::vec<n,C>, C, rotation<n,C> > - , - public Function_v2v< rotation<n,C> > + : fun::internal::x2x_linear_impl_< algebra::vec<n,C>, C, rotation<n,C> >, + public Function_v2v< rotation<n,C> > { /// Type of the underlying data stored in vectors and matrices. typedef C data_t; /// Type of the inverse function. typedef rotation<n,C> invert; - /// Return the invere function. + /// Return the inverse function. invert inv() const; /// Constructor without argument. - rotation(); - /// Constructor with radian alpha and a facultative direction (rotation axis). - rotation(C alpha, const algebra::vec<n,C>& axis); - /// Constructor with quaternion - rotation(const algebra::quat& q); + rotation(); + /// Constructor with radian alpha and a facultative direction + /// (rotation axis). + rotation(C alpha, const algebra::vec<n,C>& axis); + /// Constructor with quaternion + rotation(const algebra::quat& q); /// Constructor with h_mat. - rotation(const algebra::h_mat<n,C>& m); + rotation(const algebra::h_mat<n,C>& m); /// Perform the rotation of the given vector. - algebra::vec<n,C> operator()(const algebra::vec<n,C>& v) const; + algebra::vec<n,C> operator()(const algebra::vec<n,C>& v) const; /// Set a new grade alpha. - void set_alpha(C alpha); + void set_alpha(C alpha); /// Set a new rotation axis. - void set_axis(const algebra::vec<n,C>& axis); + void set_axis(const algebra::vec<n,C>& axis); protected: - void update(); + void update(); bool check_rotation(const algebra::quat& q); - - /// FIXME: Is it useful? - C alpha_; - algebra::vec<n,C> axis_; + /* FIXME: Is it useful to keep these values, since they are + primarily used to build the matrix `m_'? */ + C alpha_; + algebra::vec<n,C> axis_; }; @@ -194,8 +196,8 @@ namespace mln template <unsigned n, typename C> inline rotation<n,C>::rotation(C alpha, const algebra::vec<n,C>& axis) - :alpha_(alpha), - axis_(axis) + : alpha_(alpha), + axis_(axis) { this->m_ = algebra::h_mat<n,C>::Id; update(); @@ -205,25 +207,24 @@ namespace mln inline rotation<n,C>::rotation(const algebra::quat& q) { - // FIXME: Should also work for 2d. - mlc_bool(n == 3)::check(); - mln_precondition(q.is_unit()); + // FIXME: Should also work for 2D. + mlc_bool(n == 3)::check(); + mln_precondition(q.is_unit()); - C - w = q.to_vec()[0], - x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, - y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, - z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; + C + w = q.to_vec()[0], + x = q.to_vec()[1], x2 = 2*x*x, xw = 2*x*w, + y = q.to_vec()[2], y2 = 2*y*y, xy = 2*x*y, yw = 2*y*w, + z = q.to_vec()[3], z2 = 2*z*z, xz = 2*x*z, yz = 2*y*z, zw = 2*z*w; - C t[9] = {1.f - y2 - z2, xy - zw, xz + yw, - xy + zw, 1.f - x2 - z2, yz - xw, - xz - yw, yz + xw, 1.f - x2 - y2}; + C t[9] = {1.f - y2 - z2, xy - zw, xz + yw, + xy + zw, 1.f - x2 - z2, yz - xw, + xz - yw, yz + xw, 1.f - x2 - y2}; - this->m_ = mln::make::h_mat(t); + this->m_ = mln::make::h_mat(t); mln_assertion(check_rotation(q)); - /// Update attributes - + /// Update attributes. alpha_ = acos(w) * 2; axis_[0] = x; axis_[1] = y; @@ -281,18 +282,18 @@ namespace mln void rotation<n,C>::set_axis(const algebra::vec<n,C>& axis) { - axis_ = axis; + axis_ = axis; update(); } // Homogenous matrix for a rotation of a point (x,y,z) - // about the vector (u,v,w) by the angle alpha + // about the vector (u,v,w) by the angle alpha. template <unsigned n, typename C> inline void rotation<n,C>::update() { - this->m_ = internal::get_rot_h_mat(alpha_, axis_); + this->m_ = internal::get_rot_h_mat(alpha_, axis_); } template <unsigned n, typename C> -- 1.5.6.5

1 0

last-svn-commit-513-g89cb68c Ensure non implemented rotation code stops the execution.
by Roland Levillain 21 Oct '10

21 Oct '10

* mln/fun/x2x/rotation.hh (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<n,C>&)): Use std::abort instead of a precondition to stop the execution, since preconditions can be skipped by defining NDEBUG. --- milena/ChangeLog | 9 +++++++++ milena/mln/fun/x2x/rotation.hh | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c45e994..e5fef24 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Ensure non implemented rotation code stops the execution. + + * mln/fun/x2x/rotation.hh + (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<n,C>&)): + Use std::abort instead of a precondition to stop the execution, + since preconditions can be skipped by defining NDEBUG. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix test fun/x2x/composed. * tests/fun/x2x/composed.cc: Fix the initialization of the axis diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index ac30ce3..d9e5940 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -37,6 +37,7 @@ /// Conversion from Quaternion to (angle,axis), Source: /// http://jeux.developpez.com/faq/matquat/?page=quaternions#Q56 +# include <cstdlib> # include <cmath> # include <mln/core/concept/function.hh> @@ -64,7 +65,12 @@ namespace mln algebra::h_mat<n, C> get_rot_h_mat(const C alpha_, const algebra::vec<n,C>& axis_) { - mln_assertion(!"get_h_mat : n not implemented"); + std::cerr + << __FILE__ << ":" << __LINE__ << ": error:" + << " generic mln::fun::x2x::internal::get_rot_h_mat<n, C>" + << " not implemented." + << std::endl; + std::abort(); } template <typename C > -- 1.5.6.5

1 0

last-svn-commit-512-gb369b21 Fix test fun/x2x/composed.
by Roland Levillain 21 Oct '10

21 Oct '10

* tests/fun/x2x/composed.cc: Fix the initialization of the axis vector. --- milena/ChangeLog | 7 +++++++ milena/tests/fun/x2x/composed.cc | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 64b4f97..c45e994 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix test fun/x2x/composed. + + * tests/fun/x2x/composed.cc: Fix the initialization of the axis + vector. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix 3D rotations. * mln/fun/x2x/rotation.hh diff --git a/milena/tests/fun/x2x/composed.cc b/milena/tests/fun/x2x/composed.cc index 3367097..f07b302 100644 --- a/milena/tests/fun/x2x/composed.cc +++ b/milena/tests/fun/x2x/composed.cc @@ -24,13 +24,13 @@ // executable file might be covered by the GNU General Public License. #include <iostream> + #include <mln/fun/x2x/translation.hh> #include <mln/fun/x2x/rotation.hh> #include <mln/fun/x2x/composed.hh> #include <mln/fun/i2v/all_to.hh> - int main() { using namespace mln; @@ -43,9 +43,7 @@ int main() algebra::vec<3,float> vec1 = make::vec(a, b, c); fun::x2x::translation<3,float> tr(all_to(1.6)); algebra::vec<3,float> axis; - axis[0] = 0; - axis[1] = 1; - axis[0] = 0; + axis.set(0, 1, 0); fun::x2x::rotation<3,float> rot(0.3, axis); std::cout << "vec : " << vec1 << std::endl; -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-497-ge102484
by lazzara＠lrde.epita.fr 21 Oct '10

21 Oct '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/next-build-ok has been updated via e102484ec1067be75dd6589397b5582a103f38e4 (commit) via 9c95965d51707c380726c4e04e7f5d583298a412 (commit) via 87288fed8c7c58240b9da5a6b6838b97fbc40f8e (commit) via b44674d0134c582ab347d94f0cdf0489eca2c00b (commit) via b63755a60df439aecf78e36d4a8d702ef620abc3 (commit) via a913e1f860971df1a7b804daca3d190bfcefc729 (commit) from 396cb06881fb4ce584e9c9fdfe3bd49ea2e565be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- e102484 Make use of value::next in Milena. 9c95965 Small fixes in Scribo 87288fe Fix issues with object_links and ignored components. b44674d scribo/core/component_set.hh: Fix component_set id type. b63755a Make use of value::next routine in Scribo. a913e1f Add value::next routine. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++++ milena/mln/accu/label_used.hh | 3 +- milena/mln/core/internal/labeled_image_base.hh | 6 +- milena/mln/labeling/colorize.hh | 7 +- milena/mln/labeling/compute.hh | 23 +++--- milena/mln/labeling/relabel.hh | 6 +- milena/mln/labeling/superpose.hh | 14 ++- milena/mln/make/relabelfun.hh | 9 +- milena/mln/set/compute_with_weights.hh | 6 +- milena/mln/value/{cast.hh => next.hh} | 92 +++++++++++++------- scribo/ChangeLog | 44 +++++++++ scribo/scribo/core/component_set.hh | 18 +++-- scribo/scribo/core/line_set.hh | 2 +- scribo/scribo/core/object_links.hh | 4 +- scribo/scribo/debug/highlight_text_area.hh | 2 +- scribo/scribo/filter/object_groups_with_holes.hh | 5 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 2 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 7 +- .../filter/object_links_non_aligned_simple.hh | 9 +- scribo/scribo/filter/objects_with_holes.hh | 11 +-- scribo/scribo/postprocessing/fill_object_holes.hh | 6 +- scribo/scribo/primitive/link/compute.hh | 5 +- .../link/internal/link_single_dmax_base.hh | 14 --- scribo/scribo/primitive/link/merge_double_link.hh | 5 +- .../link/with_single_left_link_dmax_ratio.hh | 2 +- scribo/scribo/table/internal/align_lines.hh | 2 +- scribo/scribo/text/merging.hh | 38 ++++---- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 6 +- 28 files changed, 230 insertions(+), 138 deletions(-) copy milena/mln/value/{cast.hh => next.hh} (59%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-511-g1085d06 Fix 3D rotations.
by Roland Levillain 21 Oct '10

21 Oct '10

* mln/fun/x2x/rotation.hh (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<3,C>&)): Fix the definition of the (2,1) coefficient. --- milena/ChangeLog | 8 ++++++++ milena/mln/fun/x2x/rotation.hh | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0a495d7..64b4f97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix 3D rotations. + + * mln/fun/x2x/rotation.hh + (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<3,C>&)): + Fix the definition of the (2,1) coefficient. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with Boost-related changes in configure.ac. * tests/accu/Makefile.am: Remove uses of the old diff --git a/milena/mln/fun/x2x/rotation.hh b/milena/mln/fun/x2x/rotation.hh index 2e0ee15..ac30ce3 100644 --- a/milena/mln/fun/x2x/rotation.hh +++ b/milena/mln/fun/x2x/rotation.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -101,7 +102,7 @@ namespace mln m_(1,3) = 0; m_(2,0) = u * w * (1 - cos_a) - v * sin_a; - m_(2,1) = u * w * (1 - cos_a) + u * sin_a; + m_(2,1) = v * w * (1 - cos_a) + u * sin_a; m_(2,2) = w2 + (1 - w2) * cos_a; m_(2,3) = 0; -- 1.5.6.5

1 0