- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Added the class Concrete_Expression_Type.
by Roberto Bagnara 17 Jul '10

17 Jul '10

Module: ppl/ppl Branch: floating_point Commit: a7342b17d584af1d0c446ff52f018b8d59b13ba0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a7342b17d584… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 17 18:31:37 2010 +0200 Added the class Concrete_Expression_Type. --- src/Concrete_Expression.cc | 121 ++++++++++++++++++++++++++++++++++++ src/Concrete_Expression.defs.hh | 89 ++++++++++++++++++++++++++- src/Concrete_Expression.inlines.hh | 93 +++++++++++++++++++++++++++ src/Concrete_Expression.types.hh | 10 +--- src/Makefile.am | 2 + src/globals.types.hh | 15 +++++ 6 files changed, 321 insertions(+), 9 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=a7342b17…

1 0

build fails for ppl-0.10.2; ppl_interface_generator_c_cc_files.m4 "killed".
by Steve Murphy 05 Jul '10

05 Jul '10

I'm on a linux machine, a VM running Centos 5.5, just in case it makes any difference. /usr/bin/m4 --prefix-builtin -I.. -I. -I./.. ./ppl_interface_generator_c_cc_files.m4 dies with "Killed". The last thing it says before it dies, is: int ppl_BD_Shape_double_add_recycled_constraints (ppl_BD_Shape_double_t ph, ppl_Constraint_System_t cs) try { BD_Shape<double>& pph = *to_nonconst(ph); Constraint_System& ccs = *to_nonconst(cs); pph.add_recycled_constraints(ccs); return 0; } CATCH_ALL int ppl_BD_Shape_double_add_recycled_congruences (ppl_BD_Shape_double_t ph, ppl_Congruence_System_t cs) try { BD_Shape<double>& pph = *to_nonconst(ph); Congruence_System& ccs = *to_nonconst(cs); pph.add_recycled_congruences(ccs); return 0; } CATCH_ALL DEFINE_OUTPUT_FUNCTIONS(BD_Shape_double) Killed (which I see when it by hand. What gives? It takes a few seconds after generating the "DEFINE" lines, and does this several times. But with *this* define, it gets Killed. Any way to avoid this? work around it? Is it running out of memory or swap or something? murf -- Steve Murphy ParseTree Corp

2 2

[GIT] ppl/ppl(floating_point): Changed operator names.
by Abramo Bagnara 04 Jul '10

04 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 2878e40c4194a0d969f877627361fee89ced3321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2878e40c4194… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sun Jul 4 18:13:18 2010 +0200 Changed operator names. --- src/Concrete_Expression.types.hh | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Concrete_Expression.types.hh b/src/Concrete_Expression.types.hh index 3f10c23..c5bf77e 100644 --- a/src/Concrete_Expression.types.hh +++ b/src/Concrete_Expression.types.hh @@ -67,8 +67,7 @@ typedef int Concrete_Expression_Kind; Encodes a binary operator of concrete expressions. The values should be uniquely defined by the particular instance and - named: PLUS, MINUS, TIMES, DIV, REM, BAND, BOR, BXOR, LSHIFT, - RSHIFT. + named: ADD, SUB, MUL, DIV, REM, BAND, BOR, BXOR, LSHIFT, RSHIFT. */ typedef int Concrete_Expression_BOP; @@ -76,7 +75,7 @@ typedef int Concrete_Expression_BOP; Encodes a unary operator of concrete expressions. The values should be uniquely defined by the particular instance and - named: UPLUS, UMINUS, BNOT. + named: PLUS, MINUS, BNOT. */ typedef int Concrete_Expression_UOP;

1 0

[GIT] ppl/ppl(floating_point): Some progress in the definition of the classes.
by Roberto Bagnara 04 Jul '10

04 Jul '10

Module: ppl/ppl Branch: floating_point Commit: df824f255b127832cf64d21ee9cd4b4cef9bdbc2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df824f255b12… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 4 16:56:01 2010 +0200 Some progress in the definition of the classes. --- src/Concrete_Expression.defs.hh | 16 +++++++ src/Concrete_Expression.types.hh | 17 ++++++++ tests/Concrete_Expression/C_Expr.defs.hh | 58 +++++++++++++++++++++++---- tests/Concrete_Expression/C_Expr.inlines.hh | 17 ++++++++ 4 files changed, 100 insertions(+), 8 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 2666d2b..f013170 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -30,6 +30,7 @@ namespace Parma_Polyhedra_Library { template <typename Target> class Concrete_Expression_Base { +public: //! Returns the type of \* this. Concrete_Expression_Type type() const; @@ -39,10 +40,25 @@ class Concrete_Expression_Base { template <typename Target> class Binary_Operator_Base : public Concrete_Expression<Target> { +public: + //! Returns a constant identifying the operator of \p *this. + int get_bop() const; + + //! Returns the left-hand side of \p *this. + const Concrete_Expression<Target>* get_lhs() const; + + //! Returns the right-hand side of \p *this. + const Concrete_Expression<Target>* get_rhs() const; }; template <typename Target> class Unary_Operator_Base : public Concrete_Expression<Target> { +public: + //! Returns a constant identifying the operator of \p *this. + int get_uop() const; + + //! Returns the argument \p *this. + const Concrete_Expression<Target>* get_arg() const; }; template <typename Target> diff --git a/src/Concrete_Expression.types.hh b/src/Concrete_Expression.types.hh index 6fe20eb..3f10c23 100644 --- a/src/Concrete_Expression.types.hh +++ b/src/Concrete_Expression.types.hh @@ -63,6 +63,23 @@ enum Concrete_Expression_Type { */ typedef int Concrete_Expression_Kind; +/*! \brief + Encodes a binary operator of concrete expressions. + + The values should be uniquely defined by the particular instance and + named: PLUS, MINUS, TIMES, DIV, REM, BAND, BOR, BXOR, LSHIFT, + RSHIFT. +*/ +typedef int Concrete_Expression_BOP; + +/*! \brief + Encodes a unary operator of concrete expressions. + + The values should be uniquely defined by the particular instance and + named: UPLUS, UMINUS, BNOT. +*/ +typedef int Concrete_Expression_UOP; + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_Concrete_Expression_types_hh) diff --git a/tests/Concrete_Expression/C_Expr.defs.hh b/tests/Concrete_Expression/C_Expr.defs.hh index 95042a7..05c2311 100644 --- a/tests/Concrete_Expression/C_Expr.defs.hh +++ b/tests/Concrete_Expression/C_Expr.defs.hh @@ -39,19 +39,43 @@ class C_Expr { class Bin_Op : public C_Expr { public: + //! Constructor from operator, lhs and rhs. + Bin_Op(Concrete_Expression_BOP binary_operator, + const C_Expr* left_hand_side, const C_Expr* right_hand_side); + + //! Do-nothing destructor. + ~Bin_Op(); + //! Returns the type of \p *this. Concrete_Expression_Type type() const; //! Returns the kind of \p *this. Concrete_Expression_Kind kind() const; + //! Returns the binary operator of \p *this. + Concrete_Expression_BOP binary_operator() const; + //! Returns the left-hand side of \p *this. const C_Expr* left_hand_side() const; //! Returns the right-hand side of \p *this. const C_Expr* right_hand_side() const; + static const Concrete_Expression_BOP PLUS = 0; + static const Concrete_Expression_BOP MINUS = 1; + static const Concrete_Expression_BOP TIMES = 2; + static const Concrete_Expression_BOP DIV = 3; + static const Concrete_Expression_BOP REM = 4; + static const Concrete_Expression_BOP BAND = 5; + static const Concrete_Expression_BOP BOR = 6; + static const Concrete_Expression_BOP BXOR = 7; + static const Concrete_Expression_BOP LSHIFT = 8; + static const Concrete_Expression_BOP RSHIFT = 9; + private: + //! The operator of \p *this. + const Concrete_Expression_BOP bop; + //! The left-hand side of \p *this. const C_Expr* lhs; @@ -60,6 +84,31 @@ private: }; class Un_Op : public C_Expr { + //! Constructor from operator, lhs and rhs. + Un_Op(Concrete_Expression_UOP unary_operator, const C_Expr* argument); + + //! Do-nothing destructor. + ~Un_Op(); + + //! Returns the type of \p *this. + Concrete_Expression_Type type() const; + + //! Returns the kind of \p *this. + Concrete_Expression_Kind kind() const; + + //! Returns the argument of \p *this. + const C_Expr* argument() const; + + static const Concrete_Expression_UOP UPLUS = 0; + static const Concrete_Expression_UOP UMINUS = 1; + static const Concrete_Expression_UOP BNOT = 2; + +private: + //! The operator of \p *this. + const Concrete_Expression_UOP uop; + + //! The argument of \p *this. + const C_Expr* arg; }; class Cast_Op : public C_Expr { @@ -104,14 +153,6 @@ private: typedef Exposed_To_Underlying<PPL_C_Expr, Concrete_Expression<PPL_C_Expr> >::Type Underlying; - -public: -#if 0 - template <typename T> - static bool classof(const T* expr) { - return Underlying::classof(underlying(expr)); - } -#endif }; template <> @@ -125,6 +166,7 @@ public: } // namespace Parma_Polyhedra_Library +#include "Concrete_Expression.defs.hh" #include "C_Expr.inlines.hh" //#include "C_Expr.templates.hh" diff --git a/tests/Concrete_Expression/C_Expr.inlines.hh b/tests/Concrete_Expression/C_Expr.inlines.hh index 47f35b5..69ffcd0 100644 --- a/tests/Concrete_Expression/C_Expr.inlines.hh +++ b/tests/Concrete_Expression/C_Expr.inlines.hh @@ -25,6 +25,23 @@ site: http://www.cs.unipr.it/ppl/ . */ namespace Parma_Polyhedra_Library { +inline +Bin_Op::Bin_Op(Concrete_Expression_BOP binary_operator, + const C_Expr* left_hand_side, const C_Expr* right_hand_side) + : bop(binary_operator), + lhs(left_hand_side), + rhs(right_hand_side) { +} + +inline +Bin_Op::~Bin_Op() { +} + +inline Concrete_Expression_BOP +Bin_Op:: binary_operator() const { + return bop; +} + inline const C_Expr* Bin_Op::left_hand_side() const { return lhs;

1 0

[GIT] ppl/ppl(floating_point): Started drafting the classes to be used withing the PPL for testing purposes .
by Roberto Bagnara 04 Jul '10

04 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 0e4329676d8e481e3fa96cada83f3701ac91039a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e4329676d8e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 4 14:11:14 2010 +0200 Started drafting the classes to be used withing the PPL for testing purposes. --- src/Concrete_Expression.defs.hh | 2 +- src/Concrete_Expression.types.hh | 2 +- src/Makefile.am | 2 + tests/Concrete_Expression/C_Expr.cc | 31 +++++++ tests/Concrete_Expression/C_Expr.defs.hh | 131 +++++++++++++++++++++++++++ tests/Concrete_Expression/C_Expr.inlines.hh | 40 ++++++++ tests/Concrete_Expression/C_Expr.types.hh | 27 ++++++ tests/Concrete_Expression/Makefile.am | 21 +++-- 8 files changed, 245 insertions(+), 11 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 1324389..2666d2b 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -63,6 +63,6 @@ class Approximable_Reference_Base : public Concrete_Expression<Target> { } // namespace Parma_Polyhedra_Library -#include "Concrete_Expression.inlines.hh" +//#include "Concrete_Expression.inlines.hh" #endif // !defined(PPL_Concrete_Expression_defs_hh) diff --git a/src/Concrete_Expression.types.hh b/src/Concrete_Expression.types.hh index 9666319..6fe20eb 100644 --- a/src/Concrete_Expression.types.hh +++ b/src/Concrete_Expression.types.hh @@ -42,7 +42,7 @@ class Floating_Point_Constant; template <typename Target> class Approximable_Reference; -enum Concrete_Expression_Type = { +enum Concrete_Expression_Type { // To be defined with all the floating point formats and using // Bounded_Integer_Type_Width, Bounded_Integer_Type_Representation // and Bounded_Integer_Type_Overflow. diff --git a/src/Makefile.am b/src/Makefile.am index f89fd67..53e9a1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,6 +122,8 @@ mp_std_bits.inlines.hh \ Proxy.types.hh \ Proxy.defs.hh \ Proxy.inlines.hh \ +Concrete_Expression.types.hh \ +Concrete_Expression.defs.hh \ Temp.defs.hh \ Temp.inlines.hh \ Temp.templates.hh \ diff --git a/tests/Concrete_Expression/C_Expr.cc b/tests/Concrete_Expression/C_Expr.cc new file mode 100644 index 0000000..4dbaec6 --- /dev/null +++ b/tests/Concrete_Expression/C_Expr.cc @@ -0,0 +1,31 @@ +/* Definitions for the C_Expr class and its subclasses: non-inline, + non-template functions. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL 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 program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#include "ppl_test.hh" + +#include "C_Expr.defs.hh" + +int +main() { + return 0; +} diff --git a/tests/Concrete_Expression/C_Expr.defs.hh b/tests/Concrete_Expression/C_Expr.defs.hh new file mode 100644 index 0000000..95042a7 --- /dev/null +++ b/tests/Concrete_Expression/C_Expr.defs.hh @@ -0,0 +1,131 @@ +/* Declarations for the C_Expr class and its subclasses. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL 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 program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#ifndef PPL_C_Expr_defs_hh +#define PPL_C_Expr_defs_hh 1 + +#include "C_Expr.types.hh" +#include "Concrete_Expression.types.hh" +#include "Proxy.defs.hh" + +namespace Parma_Polyhedra_Library { + +class C_Expr { + //! Returns the type of \p *this. + virtual Concrete_Expression_Type type() const = 0; + + //! Returns the kind of \p *this. + virtual Concrete_Expression_Kind kind() const = 0; +}; + +class Bin_Op : public C_Expr { +public: + //! Returns the type of \p *this. + Concrete_Expression_Type type() const; + + //! Returns the kind of \p *this. + Concrete_Expression_Kind kind() const; + + //! Returns the left-hand side of \p *this. + const C_Expr* left_hand_side() const; + + //! Returns the right-hand side of \p *this. + const C_Expr* right_hand_side() const; + +private: + //! The left-hand side of \p *this. + const C_Expr* lhs; + + //! The right-hand side of \p *this. + const C_Expr* rhs; +}; + +class Un_Op : public C_Expr { +}; + +class Cast_Op : public C_Expr { +}; + +class Int_Const : public C_Expr { +}; + +class Float_Const : public C_Expr { +}; + +class Appr_Ref : public C_Expr { +}; + +struct PPL_C_Expr; + +template <> +struct Underlying_To_Exposed<PPL_C_Expr, C_Expr> { + typedef Concrete_Expression<PPL_C_Expr> Type; +}; + +template <> +struct Underlying_To_Exposed<PPL_C_Expr, Bin_Op> { + typedef Binary_Operator<PPL_C_Expr> Type; +}; + +template<> +struct Exposed_To_Underlying<PPL_C_Expr, Concrete_Expression<PPL_C_Expr> > { + typedef C_Expr Type; +}; + +template<> +struct Exposed_To_Underlying<PPL_C_Expr, Binary_Operator<PPL_C_Expr> > { + typedef Bin_Op Type; +}; + +template <> +class Concrete_Expression<PPL_C_Expr> + : public Concrete_Expression_Base<PPL_C_Expr>, + public Proxy<PPL_C_Expr> { +private: + typedef Exposed_To_Underlying<PPL_C_Expr, + Concrete_Expression<PPL_C_Expr> >::Type + Underlying; + +public: +#if 0 + template <typename T> + static bool classof(const T* expr) { + return Underlying::classof(underlying(expr)); + } +#endif +}; + +template <> +class Binary_Operator<PPL_C_Expr> + : public Binary_Operator_Base<PPL_C_Expr> { +public: + const Concrete_Expression<PPL_C_Expr>* get_lhs() { + return exposed(underlying(this)->left_hand_side()); + } +}; + +} // namespace Parma_Polyhedra_Library + +#include "C_Expr.inlines.hh" +//#include "C_Expr.templates.hh" + +#endif // !defined(PPL_C_Expr_defs_hh) diff --git a/tests/Concrete_Expression/C_Expr.inlines.hh b/tests/Concrete_Expression/C_Expr.inlines.hh new file mode 100644 index 0000000..47f35b5 --- /dev/null +++ b/tests/Concrete_Expression/C_Expr.inlines.hh @@ -0,0 +1,40 @@ +/* Definitions for the C_Expr class and its subclasses: inline functions. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL 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 program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#ifndef PPL_C_Expr_inlines_hh +#define PPL_C_Expr_inlines_hh 1 + +namespace Parma_Polyhedra_Library { + +inline const C_Expr* +Bin_Op::left_hand_side() const { + return lhs; +} + +inline const C_Expr* +Bin_Op::right_hand_side() const { + return rhs; +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_C_Expr_inlines_hh) diff --git a/tests/Concrete_Expression/C_Expr.types.hh b/tests/Concrete_Expression/C_Expr.types.hh new file mode 100644 index 0000000..60371dc --- /dev/null +++ b/tests/Concrete_Expression/C_Expr.types.hh @@ -0,0 +1,27 @@ +/* Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. */ + +#ifndef PPL_C_Expr_types_hh +#define PPL_C_Expr_types_hh 1 + +namespace Parma_Polyhedra_Library { + +class C_Expr; +class Bin_Op; +class Un_Op; +class Cast_Op; +class Int_Const; +class Float_Const; +class Appr_Ref; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_C_Expr_types_hh) diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index 55a958c..c433cad 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -51,15 +51,16 @@ $(top_builddir)/src/libppl.la \ @extra_libraries@ ORIGINAL_TESTS = \ -bdshape1 \ -bdshape2 \ -digitalfilters1 \ -floatingpointexpr1 \ -linearform1 \ -octagonalshape1 \ -octagonalshape2 \ -polyhedron1 \ -polyhedron2 +C_Expr +#bdshape1 \ +#bdshape2 \ +#digitalfilters1 \ +#floatingpointexpr1 \ +#linearform1 \ +#octagonalshape1 \ +#octagonalshape2 \ +#polyhedron1 \ +#polyhedron2 DERIVED_TESTS = @@ -129,6 +130,8 @@ print_INSTANCES: # Sources for the tests # +C_Expr_SOURCES = C_Expr.defs.hh C_Expr.inlines.hh C_Expr.cc + bdshape1_SOURCES = bdshape1.cc bdshape2_SOURCES = bdshape2.cc

1 0

[GIT] ppl/ppl(floating_point): Started working on the new scheme for the representation of concrete expressions .
by Roberto Bagnara 04 Jul '10

04 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 71f19792e6036a89d4dc818cc10f2b041bfec937 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71f19792e603… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Jul 4 10:51:27 2010 +0200 Started working on the new scheme for the representation of concrete expressions. --- configure.ac | 2 +- src/Concrete_Expression.defs.hh | 68 ++++++++++++++++++++ src/Concrete_Expression.types.hh | 68 ++++++++++++++++++++ src/Makefile.am | 3 + src/Proxy.defs.hh | 54 ++++++++++++++++ src/Proxy.inlines.hh | 54 ++++++++++++++++ src/Proxy.types.hh | 28 ++++++++ .../.gitignore | 0 .../Makefile.am | 0 .../bdshape1.cc | 0 .../bdshape2.cc | 0 .../digitalfilters1.cc | 0 .../floatingpointexpr1.cc | 0 .../linearform1.cc | 0 .../octagonalshape1.cc | 0 .../octagonalshape2.cc | 0 .../polyhedron1.cc | 0 .../polyhedron2.cc | 0 .../run_tests | 0 tests/Makefile.am | 2 +- 20 files changed, 277 insertions(+), 2 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=71f19792…

1 0

[GIT] ppl/ppl(floating_point): New commits
by Roberto Bagnara 03 Jul '10

03 Jul '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=82b6eee4e36f… Merge: dc4a6a3651215889f2324fa073a85605ebe870b0 75de3adbd70ca2f2d42112a53e719c27cbea4731 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 3 12:32:28 2010 +0200 Merge branch 'master' into floating_point URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=75de3adbd70c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 3 12:03:09 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16cbdda5d7d3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 09:36:56 2010 +0200 Improved specification and implementation of erase_artificials(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e23face68ebf… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 08:48:32 2010 +0200 Use PPL_ASSERT() instead of plain assert(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=40ab909d8ec6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Jun 26 21:40:44 2010 +0200 Improved MIP_Problem preprocessing phase and solved an efficiency bug. Rewritten private methods parse_constraints(), merge_split_variable() and process_pending_constraints(): specification clarified and implementation improved to avoid allocating more tableau rows and columns than needed. This results in an overall speedup, in particular when solving problems incrementally. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3e33e00ded13… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jun 17 16:29:18 2010 +0200 Updated from Libtool 2.2.10. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=044730210d62… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jun 17 16:20:34 2010 +0200 Added missing argument names.

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 03 Jul '10

03 Jul '10

Module: ppl/ppl Branch: master Commit: 75de3adbd70ca2f2d42112a53e719c27cbea4731 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=75de3adbd70c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jul 3 12:03:09 2010 +0200 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 82ad834..1bedb40 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre24], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre25], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Improved specification and implementation of erase_artificials().
by Enea Zaffanella 28 Jun '10

28 Jun '10

Module: ppl/ppl Branch: master Commit: 16cbdda5d7d356f811034951fa25bb45f89aa9cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16cbdda5d7d3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 09:36:56 2010 +0200 Improved specification and implementation of erase_artificials(). --- src/MIP_Problem.cc | 29 ++++++++++++++--------------- src/MIP_Problem.defs.hh | 12 ++++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 30e88e6..c388715 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -832,8 +832,8 @@ PPL::MIP_Problem::process_pending_constraints() { base[i] = artificial_index; ++artificial_index; } - // The last column index of the tableau containing an artificial variable. - const dimension_type end_artificials = artificial_index - 1; + // One past the last tableau column index containing an artificial variable. + const dimension_type end_artificials = artificial_index; // Set the extra-coefficient of the cost functions to record its sign. // This is done to keep track of the possible sign's inversion. @@ -1326,16 +1326,18 @@ PPL::MIP_Problem::compute_simplex_using_exact_pricing() { void PPL::MIP_Problem::erase_artificials(const dimension_type begin_artificials, const dimension_type end_artificials) { - const dimension_type tableau_last_index = tableau.num_columns() - 1; + PPL_ASSERT(0 < begin_artificials && begin_artificials < end_artificials); + + const dimension_type old_last_column = tableau.num_columns() - 1; dimension_type tableau_n_rows = tableau.num_rows(); // Step 1: try to remove from the base all the remaining slack variables. for (dimension_type i = 0; i < tableau_n_rows; ++i) - if (begin_artificials <= base[i] && base[i] <= end_artificials) { + if (begin_artificials <= base[i] && base[i] < end_artificials) { // Search for a non-zero element to enter the base. Row& tableau_i = tableau[i]; bool redundant = true; - for (dimension_type j = end_artificials+1; j-- > 1; ) - if (!(begin_artificials <= j && j <= end_artificials) + for (dimension_type j = end_artificials; j-- > 1; ) + if (!(begin_artificials <= j && j < end_artificials) && tableau_i[j] != 0) { pivot(j, i); redundant = false; @@ -1360,21 +1362,18 @@ PPL::MIP_Problem::erase_artificials(const dimension_type begin_artificials, // Step 2: Adjust data structures so as to enter phase 2 of the simplex. - // Compute the dimensions of the new tableau. - dimension_type num_artificials = 0; - for (dimension_type i = end_artificials + 1; i-- > 1; ) - if (begin_artificials <= i && i <= end_artificials) { - ++num_artificials; - tableau.remove_trailing_columns(1); - } + // Resize the tableau. + const dimension_type num_artificials = end_artificials - begin_artificials; + tableau.remove_trailing_columns(num_artificials); // Zero the last column of the tableau. + const dimension_type new_last_column = tableau.num_columns() - 1; for (dimension_type i = tableau_n_rows; i-- > 0; ) - tableau[i][tableau.num_columns()-1] = 0; + tableau[i][new_last_column] = 0; // ... then properly set the element in the (new) last column, // encoding the kind of optimization; ... - working_cost[tableau.num_columns()-1] = working_cost[tableau_last_index]; + working_cost[new_last_column] = working_cost[old_last_column]; // ... and finally remove redundant columns. const dimension_type working_cost_new_size = working_cost.size() - num_artificials; diff --git a/src/MIP_Problem.defs.hh b/src/MIP_Problem.defs.hh index f39f453..63a39db 100644 --- a/src/MIP_Problem.defs.hh +++ b/src/MIP_Problem.defs.hh @@ -728,6 +728,18 @@ private: /*! \brief Drop unnecessary artificial variables from the tableau and get ready for the second phase of the simplex algorithm. + + \note + The two parameters denote a STL-like half-open range. + It is assumed that \p begin_artificials is strictly greater than 0 + and smaller than \p end_artificials. + + \param begin_artificials + The start of the tableau column index range for artificial variables. + + \param end_artificials + The end of the tableau column index range for artificial variables. + Note that column index end_artificial is \e excluded from the range. */ void erase_artificials(dimension_type begin_artificials, dimension_type end_artificials);

1 0

[GIT] ppl/ppl(master): Use PPL_ASSERT() instead of plain assert().
by Enea Zaffanella 28 Jun '10

28 Jun '10

Module: ppl/ppl Branch: master Commit: e23face68ebfc2b001ed1fa82014ec61cd8be0db URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e23face68ebf… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jun 28 08:48:32 2010 +0200 Use PPL_ASSERT() instead of plain assert(). --- src/MIP_Problem.cc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 72b6c87..30e88e6 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -456,10 +456,10 @@ PPL::MIP_Problem std::deque<bool>& is_nonnegative_variable, std::deque<bool>& is_remergeable_variable) const { // Initially all containers are empty. - assert(is_tableau_constraint.empty() - && is_satisfied_inequality.empty() - && is_nonnegative_variable.empty() - && is_remergeable_variable.empty()); + PPL_ASSERT(is_tableau_constraint.empty() + && is_satisfied_inequality.empty() + && is_nonnegative_variable.empty() + && is_remergeable_variable.empty()); const dimension_type cs_space_dim = external_space_dim; const dimension_type cs_num_rows = input_cs.size(); @@ -616,7 +616,7 @@ PPL::MIP_Problem is_nonnegative_variable[nonzero_var_index] = true; if (nonzero_coeff_column_index < mapping_size) { // Remember to merge back the positive and negative parts. - assert(nonzero_var_index < internal_space_dim); + PPL_ASSERT(nonzero_var_index < internal_space_dim); is_remergeable_variable[nonzero_var_index] = true; } } @@ -625,7 +625,7 @@ PPL::MIP_Problem } // Cases 8-9: apply method A. else { - assert(cs_i.is_inequality()); + PPL_ASSERT(cs_i.is_inequality()); ++additional_slack_variables; } }

1 0