July 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Added class absolute_error.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 7421b099f14c21bd61400d345201e92022d836aa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7421b099f14c… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 12:01:17 2010 +0200 Added class absolute_error. --- src/Float.defs.hh | 59 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index fff7b68..d2f2678 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -364,11 +364,62 @@ template <typename FP_Interval_Type> FP_Interval_Type compute_absolute_error(const Floating_Point_Format analyzed_format); -// TODO. -/* +template <typename FP_Interval_Type, Floating_Point_Format> +class absolute_error; + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_HALF> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_HALF>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_HALF); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_SINGLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_SINGLE>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_SINGLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_DOUBLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_DOUBLE>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_DOUBLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IBM_SINGLE> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IBM_SINGLE>::value = + compute_absolute_error<FP_Interval_Type>(IBM_SINGLE); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, IEEE754_QUAD> { + static const FP_Interval_Type value; +}; + +template <typename FP_Interval_Type> +const FP_Interval_Type absolute_error<FP_Interval_Type, IEEE754_QUAD>::value = + compute_absolute_error<FP_Interval_Type>(IEEE754_QUAD); + +template <typename FP_Interval_Type> +class absolute_error<FP_Interval_Type, INTEL_DOUBLE_EXTENDED> { + static const FP_Interval_Type value; +}; + template <typename FP_Interval_Type> -FP_Interval_Type absolute_error = compute_absolute_error(); -*/ +const FP_Interval_Type absolute_error<FP_Interval_Type, INTEL_DOUBLE_EXTENDED>::value = + compute_absolute_error<FP_Interval_Type>(INTEL_DOUBLE_EXTENDED); } // namespace Parma_Polyhedra_Library

1 0

[GIT] ppl/ppl(floating_point): Implemented compute_absolute_error.
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 95846dca5e7fe0afec95c2489192e4f3eab81f61 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=95846dca5e7f… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 10:54:28 2010 +0200 Implemented compute_absolute_error. --- src/Float.defs.hh | 12 +++++++ src/Float.templates.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 1 + 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/src/Float.defs.hh b/src/Float.defs.hh index 1e3e413..fff7b68 100644 --- a/src/Float.defs.hh +++ b/src/Float.defs.hh @@ -23,6 +23,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Float_defs_hh #define PPL_Float_defs_hh 1 +#include "globals.types.hh" #include "meta_programming.hh" #include "compiler.hh" #include <gmp.h> @@ -359,8 +360,19 @@ public: }; #endif +template <typename FP_Interval_Type> +FP_Interval_Type compute_absolute_error(const Floating_Point_Format + analyzed_format); + +// TODO. +/* +template <typename FP_Interval_Type> +FP_Interval_Type absolute_error = compute_absolute_error(); +*/ + } // namespace Parma_Polyhedra_Library #include "Float.inlines.hh" +#include "Float.templates.hh" #endif // !defined(PPL_Float_defs_hh) diff --git a/src/Float.templates.hh b/src/Float.templates.hh new file mode 100644 index 0000000..5cc53fc --- /dev/null +++ b/src/Float.templates.hh @@ -0,0 +1,87 @@ +/* IEC 559 floating point format related functions: + non-inline 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/ . */ + +#ifndef PPL_Float_templates_hh +#define PPL_Float_Templates_hh 1 + +#include <cmath> + +namespace Parma_Polyhedra_Library { + +template <typename FP_Interval_Type> +FP_Interval_Type compute_absolute_error( + const Floating_Point_Format analyzed_format) { + typedef typename FP_Interval_Type::boundary_type analyzer_format; + + // Get the necessary information on the analyzed's format. + unsigned int f_base; + int f_exponent_bias; + unsigned int f_mantissa_bits; + switch (analyzed_format) { + case IEEE754_HALF: + f_base = float_ieee754_half::BASE; + f_exponent_bias = float_ieee754_half::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_half::MANTISSA_BITS; + break; + case IEEE754_SINGLE: + f_base = float_ieee754_single::BASE; + f_exponent_bias = float_ieee754_single::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_single::MANTISSA_BITS; + break; + case IEEE754_DOUBLE: + f_base = float_ieee754_double::BASE; + f_exponent_bias = float_ieee754_double::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_double::MANTISSA_BITS; + break; + case IBM_SINGLE: + f_base = float_ibm_single::BASE; + f_exponent_bias = float_ibm_single::EXPONENT_BIAS; + f_mantissa_bits = float_ibm_single::MANTISSA_BITS; + break; + case IEEE754_QUAD: + f_base = float_ieee754_quad::BASE; + f_exponent_bias = float_ieee754_quad::EXPONENT_BIAS; + f_mantissa_bits = float_ieee754_quad::MANTISSA_BITS; + break; + case INTEL_DOUBLE_EXTENDED: + f_base = float_intel_double_extended::BASE; + f_exponent_bias = float_intel_double_extended::EXPONENT_BIAS; + f_mantissa_bits = float_intel_double_extended::MANTISSA_BITS; + break; + } + + 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()); + + FP_Interval_Type result; + result.build(i_constraint(GREATER_OR_EQUAL, -omega), + i_constraint(LESS_OR_EQUAL, omega)); + return result; +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_Float_Templates_hh) diff --git a/src/Makefile.am b/src/Makefile.am index 62efcad..e4dbcb7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -182,6 +182,7 @@ Octagonal_Shape.types.hh \ fpu.types.hh \ Float.defs.hh \ Float.inlines.hh \ +Float.templates.hh \ C_Integer.hh \ fpu.defs.hh \ fpu-c99.inlines.hh \

1 0

[GIT] ppl/ppl(floating_point): Fixed Concrete_Expression. cc so that it compiles
by Fabio Bossi 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 14cd19f366e8c39a409d2d8fa16653e1774714d8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=14cd19f366e8… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Jul 21 10:52:39 2010 +0200 Fixed Concrete_Expression.cc so that it compiles with NDEBUG activated. --- src/Concrete_Expression.cc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Concrete_Expression.cc b/src/Concrete_Expression.cc index 126a1a0..cc7b34d 100644 --- a/src/Concrete_Expression.cc +++ b/src/Concrete_Expression.cc @@ -21,6 +21,9 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include <ppl-config.h> +#ifdef NDEBUG +#include <stdio> +#endif #include "Concrete_Expression.defs.hh" @@ -34,7 +37,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.bounded_integer_type_width != BITS_32 && impl.bounded_integer_type_width != BITS_64 && impl.bounded_integer_type_width != BITS_128) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal width " << impl.bounded_integer_type_width << std::endl; @@ -44,7 +47,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_representation != UNSIGNED && impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal representation " << impl.bounded_integer_type_representation << std::endl; @@ -55,7 +58,7 @@ PPL::Concrete_Expression_Type::OK() const { if (impl.bounded_integer_type_overflow != OVERFLOW_WRAPS && impl.bounded_integer_type_overflow != OVERFLOW_UNDEFINED && impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal overflow " << impl.bounded_integer_type_overflow << std::endl; @@ -64,7 +67,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.floating_point_format != IEEE754_HALF) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "bounded integer type has illegal (unused) fp format " << impl.floating_point_format << std::endl; @@ -80,7 +83,7 @@ PPL::Concrete_Expression_Type::OK() const { && impl.floating_point_format != IBM_SINGLE && impl.floating_point_format != IEEE754_QUAD && impl.floating_point_format != INTEL_DOUBLE_EXTENDED) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal format " << impl.floating_point_format << std::endl; @@ -89,7 +92,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_width != BITS_128) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi width " << impl.bounded_integer_type_width << std::endl; @@ -98,7 +101,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_representation != SIGNED_2_COMPLEMENT) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi representation " << impl.bounded_integer_type_representation << std::endl; @@ -107,7 +110,7 @@ PPL::Concrete_Expression_Type::OK() const { } if (impl.bounded_integer_type_overflow != OVERFLOW_IMPOSSIBLE) { -#ifndef NDEBUG +#ifdef NDEBUG std::cerr << "floating point type has illegal (unused) bi overflow " << impl.bounded_integer_type_overflow << std::endl;

1 0

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

21 Jul '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=109c913c02d1… Merge: 31eb3edd5909fd3fe9c13c6dbae2355c3949a692 75de3adbd70ca2f2d42112a53e719c27cbea4731 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Jul 21 09:11:46 2010 +0200 Merge branch 'master' into sparse_matrices Conflicts: CREDITS configure.ac src/MIP_Problem.cc src/MIP_Problem.defs.hh 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. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7e35772519cb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Jun 15 20:56:50 2010 +0200 Put aside changes related to Floating_Point and Linear_Form classes. These will not enter release 0.11. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=24d6f3e03340… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 10 14:04:20 2010 +0200 Moved Katy Dobson to the list of past contributors. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e452159271ab… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 08:44:28 2010 +0200 Fixed comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d7c20fa14445… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:49:16 2010 +0200 Removed current implementation of PPL_{LT,GT}_SILENT: the cure was worse than the disease. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f9182bb6ab09… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 07:20:52 2010 +0200 Avoid temporary in smod_2exp. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df9bcf9e4ed2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 7 06:11:49 2010 +0200 Better/canonical way to avoid gcc warning. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=258de934add2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue May 4 13:11:29 2010 +0200 Revert "Optimized smod_2exp_signed_int." This reverts commit 21d120a07448821720acd415213f9b08a9a14338. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=21d120a07448… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue May 4 13:07:37 2010 +0200 Optimized smod_2exp_signed_int. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b07586183751… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Apr 17 12:00:38 2010 +0200 Refuse to compile on (very obsolete) architectures that are not using two's complement. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=140b42a24737… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Apr 23 08:33:56 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b75b69c4ea3e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 23 00:51:39 2010 +0200 Put under git control. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d882d4ea5dbe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 23:59:57 2010 +0200 Added class Partial_Function to the PPL library. Java, Prolog and OCaml interfaces now use an object of this Partial_Function class when mapping the space dimensions of teh vector space. Some of the consistency checks that were performed by other variants of Partial_Function are now only done when in debugging mode. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b80536886e3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 15:20:33 2010 +0200 Fixed expected results for tests/Octagonal_Shape/writeoctagon1.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c976419bcc8f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 14:42:20 2010 +0200 Use a C++ object to encode a Partial_Function in the Java interface. Current implementation is based on a copy of the Partial_Function type used in C++ tests: we should consider whether or not it would be appropriate to have this Partial_Function type as a first class PPL object. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64faa9223236… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Apr 22 10:17:09 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c30a06c1bbee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 10:05:12 2010 +0200 Modified signature of method maps() in Java Partial_Function interface. Modified test implementation in tests/Test_Partial_Function.java accordingly (note though that TreeMap still uses Long objects). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=212a7409b929… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:55:53 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a04daee5e4dc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:54:32 2010 +0200 Fixed the printing of equality constraints. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9088b000d17c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 19 19:33:08 2010 +0200 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4fd40ebc37d0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Apr 19 19:19:42 2010 +0200 Added $(noinst_HEADERS) to BUILT_SOURCES so as to build ppl.hh early when !BUILD_CXX_INTERFACE. (Thanks to Ralf Wildenhues who identified the problem and to Sebastian Pop who reported a parallel build failure due to it.)

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: drop optimizations meant for sparse implementations that are about to be removed .
by Marco Poletti 21 Jul '10

21 Jul '10

Module: ppl/ppl Branch: sparse_matrices Commit: 31eb3edd5909fd3fe9c13c6dbae2355c3949a692 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=31eb3edd5909… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Jul 20 18:08:22 2010 +0200 MIP_Problem: drop optimizations meant for sparse implementations that are about to be removed. --- src/MIP_Problem.cc | 102 ---------------------------------------------------- 1 files changed, 0 insertions(+), 102 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 0eca841..2a1cbf0 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -718,11 +718,6 @@ PPL::MIP_Problem::process_pending_constraints() { typedef process_pending_constraints_helper_struct buffer_element_t; -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_READS - // Used to optimize access to tableau_k. - std::vector<std::pair<dimension_type, dimension_type> > vars_in_base; -#endif - // Used to improve performance, ordering writes to tableau_k. std::vector<buffer_element_t> buffer; @@ -733,64 +728,6 @@ PPL::MIP_Problem::process_pending_constraints() { // Copy the original constraint in the tableau. matrix_row_reference_type tableau_k = tableau[--k]; -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES - const Constraint& cs_i = input_cs[i]; - for (dimension_type sd = cs_i.space_dimension(); sd-- > 0; ) { - const Coefficient& current_coefficient = - cs_i.coefficient(Variable(sd)); - // The test against 0 is not needed, but improves performance. - if (current_coefficient != 0) { - buffer.push_back(buffer_element_t(mapping[sd + 1].first, - &current_coefficient, false)); - // Split if needed. - if (mapping[sd + 1].second != 0) - buffer.push_back(buffer_element_t(mapping[sd + 1].second, - &current_coefficient, true)); - } - } - const Coefficient& cs_i_inhomogeneous_term = cs_i.inhomogeneous_term(); - // The test against 0 is not needed, but improves performance. - if (cs_i_inhomogeneous_term != 0) { - buffer.push_back(buffer_element_t(mapping[0].first, - &cs_i_inhomogeneous_term, false)); - // Split if needed. - if (mapping[0].second != 0) - buffer.push_back(buffer_element_t(mapping[0].second, - &cs_i_inhomogeneous_term, true)); - } - - // Add the slack variable, if needed. - if (cs_i.is_inequality()) { - buffer.push_back(buffer_element_t(--slack_index, &(Coefficient_one()), - true)); - // If the constraint is already satisfied, we will not use artificial - // variables to compute a feasible base: this to speed up - // the algorithm. - if (satisfied_ineqs[i]) { - base[k] = slack_index; - worked_out_row[k] = true; - } - } - { - std::sort(buffer.begin(), buffer.end()); - // Dump map content into tableau_k. - std::vector<buffer_element_t>::iterator j = buffer.begin(); - std::vector<buffer_element_t>::iterator j_end = buffer.end(); - if (j != j_end) { - matrix_row_iterator itr; - tableau_k.find_create_assign(j->index, *(j->data), itr); - if (j->toggle_sign) - neg_assign(itr->second); - ++j; - for ( ; j != j_end; ++j) { - tableau_k.find_create_hint_assign(j->index, *(j->data), itr); - if (j->toggle_sign) - neg_assign(itr->second); - } - } - buffer.clear(); - } -#else // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES) const Constraint& cs_i = input_cs[i]; for (dimension_type sd = cs_i.space_dimension(); sd-- > 0; ) { const Coefficient& current_coefficient = @@ -824,50 +761,11 @@ PPL::MIP_Problem::process_pending_constraints() { worked_out_row[k] = true; } } -#endif // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_WRITES) - - -#ifdef PPL_SPARSE_BACKEND_SLOW_RANDOM_READS - // We need to sort accesses by base[j], not by j. - - for (dimension_type j = base_size; j-- > 0; ) - if (base[j] != 0 && j != k) - vars_in_base.push_back(std::make_pair(base[j], j)); - - std::sort(vars_in_base.begin(), vars_in_base.end()); - - std::vector< std::pair<dimension_type, dimension_type> >::iterator j - = vars_in_base.begin(); - std::vector< std::pair<dimension_type, dimension_type> >::iterator j_end - = vars_in_base.end(); - matrix_row_const_iterator itr = tableau_k.begin(); - matrix_row_const_iterator itr_end = tableau_k.end(); - while (j != j_end && itr != itr_end) { - if (itr->first < j->first) - tableau_k.lower_bound_hint_assign(j->first, itr); - else - if (itr->first > j->first) - ++j; - else { - PPL_ASSERT(itr->first == j->first); - if (k != j->second && itr->second != 0) { - linear_combine(tableau_k, tableau[j->second], base[j->second]); - // linear_combine() invalidates itr and itr_end. - tableau_k.lower_bound_assign(j->first, itr); - itr_end = tableau_k.end(); - } else - ++itr; - ++j; - } - } - vars_in_base.clear(); -#else // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_READS) for (dimension_type j = base_size; j-- > 0; ) if (k != j && base[j] != 0 && tableau_k.get(base[j]) != 0) linear_combine(tableau_k, tableau[j], base[j]); -#endif // defined(PPL_SPARSE_BACKEND_SLOW_RANDOM_READS) } // We negate the row if tableau[i][0] <= 0 to get the inhomogeneous term > 0.

1 0

[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