- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Fixed a bug in DB_Row_Impl_Handler<T>::Impl: :construct_upward_approximation(const U&).
by Roberto Bagnara 29 Jul '10

29 Jul '10

Module: ppl/ppl Branch: floating_point Commit: faddfe9c6c24c08d38d9cd7b3d07f9966b1cd015 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=faddfe9c6c24… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jul 29 09:22:05 2010 +0200 Fixed a bug in DB_Row_Impl_Handler<T>::Impl::construct_upward_approximation(const U&). This prevented compilation with compilers not supporting flexible arrays. --- src/DB_Row.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/DB_Row.templates.hh b/src/DB_Row.templates.hh index 7c09573..e886b61 100644 --- a/src/DB_Row.templates.hh +++ b/src/DB_Row.templates.hh @@ -41,7 +41,7 @@ DB_Row_Impl_Handler<T>::Impl::construct_upward_approximation(const U& y) { #else // PPL_CXX_SUPPORTS_FLEXIBLE_ARRAYS PPL_ASSERT(y_size > 0); if (y_size > 0) { - vec_[0] = y[0]; + assign_r(vec_[0], y[0], ROUND_UP); bump_size(); // Construct in direct order: will destroy in reverse order. for (dimension_type i = 1; i < y_size; ++i) {

1 0

[GIT] ppl/ppl(floating_point): Added missing inclusion.
by Roberto Bagnara 29 Jul '10

29 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 6e11577095f565d2016f1b72656b31df64066a53 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6e11577095f5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Jul 27 21:39:45 2010 +0200 Added missing inclusion. --- src/termination.templates.hh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 8582e22..2a92f75 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,6 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Generator.defs.hh" #include "Constraint_System.defs.hh" #include "C_Polyhedron.defs.hh" +#include "NNC_Polyhedron.defs.hh" #include <stdexcept>

1 0

[GIT] ppl/ppl(master): Unwanted assertions removed.
by Roberto Bagnara 29 Jul '10

29 Jul '10

Module: ppl/ppl Branch: master Commit: ab1d650d0dcb0d122abf3d965c16ebdf94ac3325 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ab1d650d0dcb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jul 29 14:15:10 2010 +0200 Unwanted assertions removed. --- src/DB_Row.templates.hh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/DB_Row.templates.hh b/src/DB_Row.templates.hh index 8684c04..765e719 100644 --- a/src/DB_Row.templates.hh +++ b/src/DB_Row.templates.hh @@ -39,7 +39,6 @@ DB_Row_Impl_Handler<T>::Impl::construct_upward_approximation(const U& y) { bump_size(); } #else // PPL_CXX_SUPPORTS_FLEXIBLE_ARRAYS - PPL_ASSERT(y_size > 0); if (y_size > 0) { assign_r(vec_[0], y[0], ROUND_UP); bump_size(); @@ -100,7 +99,6 @@ DB_Row_Impl_Handler<T>::Impl::copy_construct_coefficients(const Impl& y) { bump_size(); } #else // PPL_CXX_SUPPORTS_FLEXIBLE_ARRAYS - PPL_ASSERT(y_size > 0); if (y_size > 0) { vec_[0] = y.vec_[0]; bump_size();

1 0

[GIT] ppl/ppl(master): Fixed a bug in DB_Row_Impl_Handler<T>::Impl:: expand_within_capacity(dimension_type).
by Roberto Bagnara 29 Jul '10

29 Jul '10

Module: ppl/ppl Branch: master Commit: 4a26e69ad62c5c2b9d256f20392289d3161fc7bb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4a26e69ad62c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jul 29 11:24:08 2010 +0200 Fixed a bug in DB_Row_Impl_Handler<T>::Impl::expand_within_capacity(dimension_type). This affected only compilers not supporting flexible arrays. --- src/DB_Row.templates.hh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/DB_Row.templates.hh b/src/DB_Row.templates.hh index e886b61..8684c04 100644 --- a/src/DB_Row.templates.hh +++ b/src/DB_Row.templates.hh @@ -58,9 +58,11 @@ DB_Row_Impl_Handler<T>:: Impl::expand_within_capacity(const dimension_type new_size) { PPL_ASSERT(size() <= new_size && new_size <= max_size()); #if !PPL_CXX_SUPPORTS_FLEXIBLE_ARRAYS - // vec_[0] is already constructed. - if (size() == 0 && new_size > 0) + if (size() == 0 && new_size > 0) { + // vec_[0] is already constructed: we just need to assign +infinity. + assign_r(vec_[0], PLUS_INFINITY, ROUND_NOT_NEEDED); bump_size(); + } #endif // Construct in direct order: will destroy in reverse order. for (dimension_type i = size(); i < new_size; ++i) {

1 0

[GIT] ppl/ppl(master): Fixed a bug in DB_Row_Impl_Handler<T>::Impl:: construct_upward_approximation(const U&).
by Roberto Bagnara 29 Jul '10

29 Jul '10

Module: ppl/ppl Branch: master Commit: faddfe9c6c24c08d38d9cd7b3d07f9966b1cd015 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=faddfe9c6c24… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jul 29 09:22:05 2010 +0200 Fixed a bug in DB_Row_Impl_Handler<T>::Impl::construct_upward_approximation(const U&). This prevented compilation with compilers not supporting flexible arrays. --- src/DB_Row.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/DB_Row.templates.hh b/src/DB_Row.templates.hh index 7c09573..e886b61 100644 --- a/src/DB_Row.templates.hh +++ b/src/DB_Row.templates.hh @@ -41,7 +41,7 @@ DB_Row_Impl_Handler<T>::Impl::construct_upward_approximation(const U& y) { #else // PPL_CXX_SUPPORTS_FLEXIBLE_ARRAYS PPL_ASSERT(y_size > 0); if (y_size > 0) { - vec_[0] = y[0]; + assign_r(vec_[0], y[0], ROUND_UP); bump_size(); // Construct in direct order: will destroy in reverse order. for (dimension_type i = 1; i < y_size; ++i) {

1 0

[GIT] ppl/ppl(floating_point): Added method get_integer_interval() ( make check not working yet).
by Fabio Bossi 28 Jul '10

28 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 986fb317391e4e937a918d53a955594f2abe84c6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=986fb317391e… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 28 19:03:22 2010 +0200 Added method get_integer_interval() (make check not working yet). --- src/Concrete_Expression.defs.hh | 27 +++++++++++- tests/Concrete_Expression/C_Expr.defs.hh | 63 ++++++++++++++++++++++++++- tests/Concrete_Expression/C_Expr.inlines.hh | 40 +++++++++++++++++ tests/Concrete_Expression/linearize.cc | 24 ++++++----- 4 files changed, 141 insertions(+), 13 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=986fb317…

1 0

[GIT] ppl/ppl(floating_point): Avoid dangerous casts when computing errors.
by Fabio Bossi 28 Jul '10

28 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 5a827fc7a229ed6474101c2d951da3aa14c2d358 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5a827fc7a229… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 28 11:51:32 2010 +0200 Avoid dangerous casts when computing errors. --- src/Float.templates.hh | 12 ++++++------ src/Linear_Form.templates.hh | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Float.templates.hh b/src/Float.templates.hh index a784723..6b911ac 100644 --- a/src/Float.templates.hh +++ b/src/Float.templates.hh @@ -109,12 +109,12 @@ const FP_Interval_Type& compute_absolute_error( PPL_ASSERT(to_compute != NULL); - // FIXME: the inner cast may be dangerous. - analyzer_format omega = std::max( - static_cast<analyzer_format>(pow(f_base, - static_cast<analyzer_format>(1) - - f_exponent_bias - f_mantissa_bits)), - std::numeric_limits<analyzer_format>::denorm_min()); + // We assume that f_base is a power of 2. + analyzer_format omega; + int power = static_cast<int>(log2(f_base)) * + (1 - f_exponent_bias - f_mantissa_bits); + omega = std::max(static_cast<analyzer_format>(ldexpl(1.0, power)), + std::numeric_limits<analyzer_format>::denorm_min()); to_compute->build(i_constraint(GREATER_OR_EQUAL, -omega), i_constraint(LESS_OR_EQUAL, omega)); diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index fcb57c7..5bb64c0 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -418,9 +418,11 @@ Linear_Form<C>::relative_error( } C error_propagator; - // FIXME: this cast may be dangerous. - analyzer_format lb = -pow(f_base, - -static_cast<analyzer_format>(f_mantissa_bits)); + // We assume that f_base is a power of 2. + int power = static_cast<int>(log2(f_base)) * + (-f_mantissa_bits); + analyzer_format lb = -static_cast<analyzer_format>(ldexpl(1.0, power)); + error_propagator.build(i_constraint(GREATER_OR_EQUAL, lb), i_constraint(LESS_OR_EQUAL, -lb));

1 0

[GIT] ppl/ppl(floating_point): Constructors now take a Concrete_Expression_Type.
by Fabio Bossi 28 Jul '10

28 Jul '10

Module: ppl/ppl Branch: floating_point Commit: f396b2fa43531c01bca0fee89127acdf8c001de9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f396b2fa4353… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 28 10:39:33 2010 +0200 Constructors now take a Concrete_Expression_Type. --- tests/Concrete_Expression/C_Expr.defs.hh | 21 ++++++++------ tests/Concrete_Expression/C_Expr.inlines.hh | 40 +++++++++++++++------------ tests/Concrete_Expression/linearize.cc | 38 +++++++++++++------------ 3 files changed, 54 insertions(+), 45 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f396b2fa…

1 0

[GIT] ppl/ppl(floating_point): Fixed a bug in is().
by Fabio Bossi 28 Jul '10

28 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 60479359fdb9e44b03132077149759c216343fcf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=60479359fdb9… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 28 09:56:28 2010 +0200 Fixed a bug in is(). Make check now works again. --- src/Concrete_Expression.inlines.hh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/Concrete_Expression.inlines.hh b/src/Concrete_Expression.inlines.hh index 1d1d222..cf65a8a 100644 --- a/src/Concrete_Expression.inlines.hh +++ b/src/Concrete_Expression.inlines.hh @@ -92,7 +92,8 @@ template <typename Target> template <template <typename T> class Derived> inline bool Concrete_Expression_Common<Target>::is() const { - return Concrete_Expression<Target>::kind() == Derived<Target>::KIND; + return static_cast<const Concrete_Expression<Target>*>(this)->kind() == + Derived<Target>::KIND; } template <typename Target>

1 0

[GIT] ppl/ppl(floating_point): Commented and moved methods is() and as().
by Fabio Bossi 28 Jul '10

28 Jul '10

Module: ppl/ppl Branch: floating_point Commit: ba58fa9f47cfefd4464f8e366e34ae92beded2d3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba58fa9f47cf… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 28 09:47:52 2010 +0200 Commented and moved methods is() and as(). Make check not working due to bad implementation of is(). --- src/Concrete_Expression.defs.hh | 23 ++++++++++++----------- src/Concrete_Expression.inlines.hh | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 3bafbbd..d52cad6 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -124,22 +124,23 @@ public: //! Returns the kind of \* this. Concrete_Expression_Kind kind() const; + //! Tests if \p *this has the same kind as <CODE>Derived<Target></CODE>. template <template <typename T> class Derived> - bool is() const { - return Concrete_Expression<Target>::kind() == Derived<Target>::KIND; - } + bool is() const; + /*! \brief + Returns a pointer to \p *this converted to type + <CODE>Derived<Target>*</CODE>. + */ template <template <typename T> class Derived> - Derived<Target>* as() { - PPL_ASSERT(is<Derived>()); - return static_cast<Derived<Target>*>(this); - } + Derived<Target>* as(); + /*! \brief + Returns a pointer to \p *this converted to type + <CODE>const Derived<Target>*</CODE>. + */ template <template <typename T> class Derived> - const Derived<Target>* as() const { - PPL_ASSERT(is<Derived>()); - return static_cast<const Derived<Target>*>(this); - } + const Derived<Target>* as() const; }; diff --git a/src/Concrete_Expression.inlines.hh b/src/Concrete_Expression.inlines.hh index c812919..1d1d222 100644 --- a/src/Concrete_Expression.inlines.hh +++ b/src/Concrete_Expression.inlines.hh @@ -88,6 +88,29 @@ Concrete_Expression_Type::floating_point_format() const { return impl.floating_point_format; } +template <typename Target> +template <template <typename T> class Derived> +inline bool +Concrete_Expression_Common<Target>::is() const { + return Concrete_Expression<Target>::kind() == Derived<Target>::KIND; +} + +template <typename Target> +template <template <typename T> class Derived> +inline Derived<Target>* +Concrete_Expression_Common<Target>::as() { + PPL_ASSERT(is<Derived>()); + return static_cast<Derived<Target>*>(this); +} + +template <typename Target> +template <template <typename T> class Derived> +inline const Derived<Target>* +Concrete_Expression_Common<Target>::as() const { + PPL_ASSERT(is<Derived>()); + return static_cast<const Derived<Target>*>(this); +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_Concrete_Expression_inlines_hh)

1 0