Module: ppl/ppl Branch: master Commit: 0a65a2985d7b8856807ee8b4d6390fa57530ec20 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0a65a2985d7b8...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Mon Mar 1 11:15:05 2010 +0100

Completed removal of support for circular intervals.

Removed now ambiguous method CC76_narrowing_assign(). While at it, also wrapped a few long lines.

---

src/Box.defs.hh | 15 +++++++++------ src/Box.templates.hh | 18 +++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 52c201f..b6d8a92 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -1311,7 +1311,9 @@ public: Thrown if \p *this and \p y are dimension-incompatible. */ template <typename T> - typename Enable_If<Is_Same<T, Box>::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type + typename Enable_If<Is_Same<T, Box>::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type CC76_widening_assign(const T& y, unsigned* tp = 0);

/*! \brief @@ -1331,7 +1333,9 @@ public: Thrown if \p *this and \p y are dimension-incompatible. */ template <typename T, typename Iterator> - typename Enable_If<Is_Same<T, Box>::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type + typename Enable_If<Is_Same<T, Box>::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type CC76_widening_assign(const T& y, Iterator first, Iterator last);

@@ -1382,10 +1386,9 @@ public: the result of the computation \f$\mathtt{y} \Delta \mathtt{x}\f$. */ template <typename T> - typename Enable_If<Is_Same<T, Box>::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type - CC76_narrowing_assign(const T& y); - template <typename T> - typename Enable_If<Is_Same<T, Box>::value, void>::type + typename Enable_If<Is_Same<T, Box>::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type CC76_narrowing_assign(const T& y);

//@} Space-Dimension Preserving Member Functions that May Modify [...] diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 3de3094..9e8af10 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -3540,7 +3540,9 @@ Box<ITV>::generalized_affine_preimage(const Linear_Expression& lhs,

template <typename ITV> template <typename T, typename Iterator> -typename Enable_If<Is_Same<T, Box<ITV> >::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type +typename Enable_If<Is_Same<T, Box<ITV> >::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type Box<ITV>::CC76_widening_assign(const T& y, Iterator first, Iterator last) { if (y.is_empty()) return; @@ -3553,7 +3555,9 @@ Box<ITV>::CC76_widening_assign(const T& y, Iterator first, Iterator last) {

template <typename ITV> template <typename T> -typename Enable_If<Is_Same<T, Box<ITV> >::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type +typename Enable_If<Is_Same<T, Box<ITV> >::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type Box<ITV>::CC76_widening_assign(const T& y, unsigned* tp) { static typename ITV::boundary_type stop_points[] = { typename ITV::boundary_type(-2), @@ -3660,7 +3664,9 @@ Box<ITV>::limited_CC76_extrapolation_assign(const Box& y,

template <typename ITV> template <typename T> -typename Enable_If<Is_Same<T, Box<ITV> >::value && Is_Same_Or_Derived<Interval_Base, ITV>::value, void>::type +typename Enable_If<Is_Same<T, Box<ITV> >::value + && Is_Same_Or_Derived<Interval_Base, ITV>::value, + void>::type Box<ITV>::CC76_narrowing_assign(const T& y) { const dimension_type space_dim = space_dimension();

@@ -3707,12 +3713,6 @@ Box<ITV>::CC76_narrowing_assign(const T& y) { }

template <typename ITV> -template <typename T> -typename Enable_If<Is_Same<T, Box<ITV> >::value, void>::type -Box<ITV>::CC76_narrowing_assign(const T& y) { -} - -template <typename ITV> Constraint_System Box<ITV>::constraints() const { Constraint_System cs;