February 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Group together documentation of functions controlling FPU.
by Enea Zaffanella 27 Feb '12

27 Feb '12

Module: ppl/ppl Branch: master Commit: 7fdb4199db20f7eb06cb25dff3c374f6092dccb9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7fdb4199db20… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 27 10:37:41 2012 +0100 Group together documentation of functions controlling FPU. --- src/fpu.defs.hh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/fpu.defs.hh b/src/fpu.defs.hh index d2a4e12..a3acf1a 100644 --- a/src/fpu.defs.hh +++ b/src/fpu.defs.hh @@ -29,6 +29,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +//! \name Functions Controlling Floating Point Unit +//@{ + //! Initializes the FPU control functions. void fpu_initialize_control_functions(); @@ -73,6 +76,8 @@ fpu_reset_inexact(); int fpu_check_inexact(); +//@} // Functions Controlling Floating Point Unit + } // namespace Parma_Polyhedra_Library #if PPL_CAN_CONTROL_FPU

1 0

[GIT] ppl/ppl(master): Fixed documentation for linearize and added \relates directive.
by Enea Zaffanella 27 Feb '12

27 Feb '12

Module: ppl/ppl Branch: master Commit: 521ce21afd82500e219f795ee8acd0c5a87cc2d8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=521ce21afd82… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 27 10:25:56 2012 +0100 Fixed documentation for linearize and added \relates directive. --- src/linearize.hh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/linearize.hh b/src/linearize.hh index e5ac48a..ec24bb5 100644 --- a/src/linearize.hh +++ b/src/linearize.hh @@ -643,8 +643,10 @@ cast_linearize(const Cast_Operator<Target>& cast_expr, return !result.overflows(); } -//! Linearizes a floating point expression. /*! \brief + Linearizes a floating point expression. + + \relates Concrete_Expression Makes \p result become a linear form that correctly approximates the value of \p expr in the given composite abstract store.

1 0

[GIT] ppl/ppl(master): Grouped together docs for the linear-ranking functions.
by Enea Zaffanella 27 Feb '12

27 Feb '12

Module: ppl/ppl Branch: master Commit: 5ef9269b43b18f0b49dfe647cc5457ed93bea9e0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5ef9269b43b1… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 27 10:24:43 2012 +0100 Grouped together docs for the linear-ranking functions. --- src/termination.defs.hh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/termination.defs.hh b/src/termination.defs.hh index 08e6985..937f7e2 100644 --- a/src/termination.defs.hh +++ b/src/termination.defs.hh @@ -30,6 +30,9 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +//! \name Functions for the Synthesis of Linear Rankings +//@{ + /*! \brief \ingroup PPL_CXX_interface Termination test using an improvement of the method by Mesnard and Serebrenik \ref BMPZ10 "[BMPZ10]". @@ -463,6 +466,8 @@ all_affine_ranking_functions_PR_2(const PSET& pset_before, const PSET& pset_after, NNC_Polyhedron& mu_space); +//@} // Functions for the Synthesis of Linear Rankings + } // namespace Parma_Polyhedra_Library #include "termination.templates.hh"

1 0

[GIT] ppl/ppl(master): CO_Tree and Sparse_Row should only appear in the devref manual.
by Enea Zaffanella 27 Feb '12

27 Feb '12

Module: ppl/ppl Branch: master Commit: a9f93b1ac29223079b9d894b3081cabf43cf407f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a9f93b1ac292… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 27 10:07:48 2012 +0100 CO_Tree and Sparse_Row should only appear in the devref manual. --- src/CO_Tree.defs.hh | 2 ++ src/Sparse_Row.defs.hh | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index cba1e10..8482273 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -51,6 +51,7 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS //! A cache-oblivious binary search tree of pairs. /*! \ingroup PPL_CXX_interface This class implements a binary search tree with keys of dimension_type type @@ -97,6 +98,7 @@ namespace Parma_Polyhedra_Library { The tree can store up to \f$(-(dimension_type)1)/100\f$ elements. This limit allows faster density computations, but can be removed if needed. */ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) class CO_Tree { public: diff --git a/src/Sparse_Row.defs.hh b/src/Sparse_Row.defs.hh index 180a2d1..376907b 100644 --- a/src/Sparse_Row.defs.hh +++ b/src/Sparse_Row.defs.hh @@ -33,6 +33,7 @@ site: http://bugseng.com/products/ppl/ . */ namespace Parma_Polyhedra_Library { +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS //! A finite sparse sequence of coefficients. /*! \ingroup PPL_CXX_interface This class is implemented using a CO_Tree. See the documentation of CO_Tree @@ -56,6 +57,7 @@ namespace Parma_Polyhedra_Library { \see Sparse_Matrix \see CO_Tree */ +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) class Sparse_Row { public:

1 0

[GIT] ppl/ppl(master): Fixed missing namespace.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: eeb8c755e6c6092967511944881d24120a89fd93 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eeb8c755e6c6… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 20:17:36 2012 +0100 Fixed missing namespace. --- src/Row_Flags.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Row_Flags.cc b/src/Row_Flags.cc index 60063a4..cb4d758 100644 --- a/src/Row_Flags.cc +++ b/src/Row_Flags.cc @@ -35,7 +35,7 @@ PPL::Row_Flags::ascii_dump(std::ostream& s) const { std::ios::basefield); const std::streamsize new_sz = static_cast<std::streamsize>(2 * sizeof(Row_Flags::base_type)); - s << std::setw(new_sz) << setfill('0') << bits; + s << std::setw(new_sz) << std::setfill('0') << bits; s.flags(old_flags); }

1 0

[GIT] ppl/ppl(master): Fixed and uniformed iomanip uses.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 9cdc037cdf468b82a6d14217c6c1caad531b0bbd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9cdc037cdf46… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 20:14:48 2012 +0100 Fixed and uniformed iomanip uses. --- src/Checked_Number.templates.hh | 13 +++++++------ src/Interval.templates.hh | 2 +- src/Interval_Info.inlines.hh | 18 +++++++++--------- src/Row_Flags.cc | 24 ++++++++++-------------- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/Checked_Number.templates.hh b/src/Checked_Number.templates.hh index d756717..5c6c596 100644 --- a/src/Checked_Number.templates.hh +++ b/src/Checked_Number.templates.hh @@ -39,12 +39,11 @@ ascii_dump(std::ostream& s, const T& t) { else { // An inexact data type (probably floating point): // first dump its hexadecimal representation ... - const std::ios_base::fmtflags old_flags = s.flags(); - s << std::hex; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); const unsigned char* p = reinterpret_cast<const unsigned char*>(&t); for (unsigned i = 0; i < sizeof(T); ++i) { - s << std::setw(2) << std::setfill('0'); - s << static_cast<unsigned>(p[i]); + s << std::setw(2) << std::setfill('0') << static_cast<unsigned>(p[i]); } s.flags(old_flags); // ... and then pretty print it for readability. @@ -55,9 +54,11 @@ ascii_dump(std::ostream& s, const T& t) { template <typename T> typename Enable_If<Is_Native_Or_Checked<T>::value, bool>::type ascii_load(std::istream& s, T& t) { - if (std::numeric_limits<T>::is_exact) + if (std::numeric_limits<T>::is_exact) { // An exact data type: input from pretty printed version is accurate. - return s >> t; + s >> t; + return !s.fail(); + } else { // An inexact data type (probably floating point): // first load its hexadecimal representation ... diff --git a/src/Interval.templates.hh b/src/Interval.templates.hh index 6e9dbc7..d785ac1 100644 --- a/src/Interval.templates.hh +++ b/src/Interval.templates.hh @@ -291,7 +291,7 @@ operator>>(std::istream& is, Interval<Boundary, Info>& x) { unexpected: is.unget(); fail: - is.setstate(std::ios_base::failbit); + is.setstate(std::ios::failbit); return is; } diff --git a/src/Interval_Info.inlines.hh b/src/Interval_Info.inlines.hh index da03cc8..4453019 100644 --- a/src/Interval_Info.inlines.hh +++ b/src/Interval_Info.inlines.hh @@ -77,20 +77,20 @@ Interval_Info_Bitset<T, Policy>::m_swap(Interval_Info_Bitset<T, Policy>& y) { template <typename T, typename Policy> inline void Interval_Info_Bitset<T, Policy>::ascii_dump(std::ostream& s) const { - std::ios_base::fmtflags old = s.flags(); - s << std::hex << bitset; - s.flags(old); + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s << bitset; + s.flags(old_flags); } template <typename T, typename Policy> inline bool Interval_Info_Bitset<T, Policy>::ascii_load(std::istream& s) { - std::ios_base::fmtflags old = s.flags(); - s >> std::hex >> bitset; - if (!s) - return false; - s.flags(old); - return true; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s >> bitset; + s.flags(old_flags); + return !s.fail(); } #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS diff --git a/src/Row_Flags.cc b/src/Row_Flags.cc index 39a3c8c..60063a4 100644 --- a/src/Row_Flags.cc +++ b/src/Row_Flags.cc @@ -31,15 +31,12 @@ namespace PPL = Parma_Polyhedra_Library; void PPL::Row_Flags::ascii_dump(std::ostream& s) const { s << "0x"; - std::istream::fmtflags f = s.setf(std::istream::hex); + std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); const std::streamsize new_sz = static_cast<std::streamsize>(2 * sizeof(Row_Flags::base_type)); - const std::streamsize old_sz = s.width(new_sz); - std::ostream::char_type ch = s.fill('0'); - s << bits; - s.fill(ch); - s.width(old_sz); - s.flags(f); + s << std::setw(new_sz) << setfill('0') << bits; + s.flags(old_flags); } PPL_OUTPUT_DEFINITIONS_ASCII_ONLY(Row_Flags) @@ -47,12 +44,11 @@ PPL_OUTPUT_DEFINITIONS_ASCII_ONLY(Row_Flags) bool PPL::Row_Flags::ascii_load(std::istream& s) { std::string str; - std::streamsize sz = s.width(2); - if (!(s >> str) || str != "0x") + if (!(s >> std::setw(2) >> str) || str != "0x") return false; - s.width(sz); - std::istream::fmtflags f = s.setf(std::istream::hex); - bool r = s >> bits; - s.flags(f); - return r; + const std::ios::fmtflags old_flags = s.setf(std::ios::hex, + std::ios::basefield); + s >> bits; + s.flags(old_flags); + return !s.fail(); }

1 0

[GIT] ppl/ppl(master): Avoid mixing plain character data with numeric data.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: a819fa12f81baba2e8b939e7cf1ec43dae8f6573 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a819fa12f81b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 19:20:46 2012 +0100 Avoid mixing plain character data with numeric data. Detected by ECLAIR service utypflag. --- src/wrap_string.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/wrap_string.cc b/src/wrap_string.cc index 06dac11..b9ba6f4 100644 --- a/src/wrap_string.cc +++ b/src/wrap_string.cc @@ -62,7 +62,7 @@ wrap_string(const std::string& src_string, else if (last_space != npos) split_pos = last_space; else { - for ( ; src[idx] != 0; ++idx) { + for ( ; src[idx] != '\0'; ++idx) { if (src[idx] == ',') { ++idx; break;

1 0

[GIT] ppl/ppl(master): Removed references to an obsolete file.
by Roberto Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: a4a27887eb1a1c28eb2b985a8a5acbc0cf702c0a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4a27887eb1a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Feb 26 15:43:55 2012 +0100 Removed references to an obsolete file. --- doc/devref.doxyconf-html.in | 1 - doc/devref.doxyconf-latex.in | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/doc/devref.doxyconf-html.in b/doc/devref.doxyconf-html.in index 5792164..9b90877 100644 --- a/doc/devref.doxyconf-html.in +++ b/doc/devref.doxyconf-html.in @@ -267,7 +267,6 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Poly_Gen_Relation.defs.hh \ @srcdir@/../src/Poly_Gen_Relation.inlines.hh \ @srcdir@/../src/Poly_Gen_Relation.cc \ - @srcdir@/../src/Interval_Restriction.defs.hh \ @srcdir@/../src/Interval_Info.types.hh \ @srcdir@/../src/Interval_Info.defs.hh \ @srcdir@/../src/Interval_Info.inlines.hh \ diff --git a/doc/devref.doxyconf-latex.in b/doc/devref.doxyconf-latex.in index 0c84017..2d9186d 100644 --- a/doc/devref.doxyconf-latex.in +++ b/doc/devref.doxyconf-latex.in @@ -265,7 +265,6 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Poly_Gen_Relation.defs.hh \ @srcdir@/../src/Poly_Gen_Relation.inlines.hh \ @srcdir@/../src/Poly_Gen_Relation.cc \ - @srcdir@/../src/Interval_Restriction.defs.hh \ @srcdir@/../src/Interval_Info.types.hh \ @srcdir@/../src/Interval_Info.defs.hh \ @srcdir@/../src/Interval_Info.inlines.hh \

1 0

[GIT] ppl/ppl(master): Removed redundant and unused stuff.
by Abramo Bagnara 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: e08bd14506912121a1c188ecbb337e82ec6534c8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e08bd1450691… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Feb 26 15:28:06 2012 +0100 Removed redundant and unused stuff. --- src/CO_Tree.defs.hh | 2 -- src/MIP_Problem.cc | 27 +-------------------------- 2 files changed, 1 insertions(+), 28 deletions(-) diff --git a/src/CO_Tree.defs.hh b/src/CO_Tree.defs.hh index 0a84211..cba1e10 100644 --- a/src/CO_Tree.defs.hh +++ b/src/CO_Tree.defs.hh @@ -145,8 +145,6 @@ public: typedef Coefficient data_type; typedef Coefficient_traits::const_reference data_type_const_reference; - class iterator; - //! A const %iterator on the tree elements, ordered by key. /*! Iterator increment and decrement operations are \f$O(1)\f$ time. diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 9eb8022..66c9978 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -644,29 +644,6 @@ PPL::MIP_Problem return true; } -namespace { - -// This is used as a template argument in process_pending_constraints(), -// so it must be a global declaration. -struct process_pending_constraints_helper_struct { - - PPL::dimension_type index; - const PPL::Coefficient* data; - bool toggle_sign; - - process_pending_constraints_helper_struct(PPL::dimension_type index1, - const PPL::Coefficient* data1, - bool toggle_sign1) - : index(index1), data(data1), toggle_sign(toggle_sign1) { - } - - bool operator<(const process_pending_constraints_helper_struct& x) const { - return index < x.index; - } -}; - -} // namespace - bool PPL::MIP_Problem::process_pending_constraints() { // Check the pending constraints to adjust the data structures. @@ -791,8 +768,6 @@ PPL::MIP_Problem::process_pending_constraints() { ? artificial_index : 0; - typedef process_pending_constraints_helper_struct buffer_element_t; - // Proceed with the insertion of the constraints. for (dimension_type k = tableau_num_rows, i = input_cs.size() - first_pending_constraint; i-- > 0; ) { @@ -2390,7 +2365,7 @@ PPL::MIP_Problem::OK() const { for (dimension_type i = base.size(); i-- > 0; ) vars_in_base.push_back(std::make_pair(base[i], i)); - std::sort(vars_in_base.begin(),vars_in_base.end()); + std::sort(vars_in_base.begin(), vars_in_base.end()); for (dimension_type j = tableau_num_rows; j-- > 0; ) { const Row& tableau_j = tableau[j];

1 0

[GIT] ppl/ppl(master): Use the same typenames in function declarations/ definitions.
by Enea Zaffanella 26 Feb '12

26 Feb '12

Module: ppl/ppl Branch: master Commit: 58dff7089d77a0d9762953c66734f95d52b2ddca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58dff7089d77… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Feb 26 14:49:39 2012 +0100 Use the same typenames in function declarations/definitions. Detected by ECLAIR service funtypes. --- src/Checked_Number.defs.hh | 2 +- src/Ptr_Iterator.defs.hh | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh index a5d91a9..92c60b9 100644 --- a/src/Checked_Number.defs.hh +++ b/src/Checked_Number.defs.hh @@ -568,7 +568,7 @@ PPL_DECLARE_FUNC4(gcdext_assign_r) //! Returns the total size in bytes of the memory occupied by \p x. /*! \relates Checked_Number */ template <typename T, typename Policy> -size_t +memory_size_type total_memory_in_bytes(const Checked_Number<T, Policy>& x); //! Returns the size in bytes of the memory managed by \p x. diff --git a/src/Ptr_Iterator.defs.hh b/src/Ptr_Iterator.defs.hh index c4ed6e7..2f6c852 100644 --- a/src/Ptr_Iterator.defs.hh +++ b/src/Ptr_Iterator.defs.hh @@ -31,27 +31,27 @@ namespace Parma_Polyhedra_Library { namespace Implementation { -template<typename Q, typename R> -bool operator==(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator==(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator!=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator!=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator<(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator<(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator<=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator<=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator>(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator>(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -bool operator>=(const Ptr_Iterator<Q>& x, const Ptr_Iterator<R>& y); +template<typename P, typename Q> +bool operator>=(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); -template<typename Q, typename R> -typename Ptr_Iterator<Q>::difference_type operator-(const Ptr_Iterator<Q>& x, - const Ptr_Iterator<R>& y); +template<typename P, typename Q> +typename Ptr_Iterator::difference_type +operator-(const Ptr_Iterator& x, const Ptr_Iterator<Q>& y); template<typename P> Ptr_Iterator operator+(typename Ptr_Iterator::difference_type m,

1 0