Module: ppl/ppl Branch: floating_point Commit: fbfb2232f9296687e66d16da67b3f5ccfc8b48b6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fbfb2232f9296... Author: Fabio Bossi <bossi@cs.unipr.it> Date: Tue Nov 30 15:29:01 2010 +0100 Renamed Integer_Interval_Type into Integer_Interval and moved it to Integer_Interval.hh. --- doc/devref.doxyconf-html.in | 2 + src/Concrete_Expression.defs.hh | 19 ------------- src/Integer_Interval.hh | 55 +++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 1 + 4 files changed, 58 insertions(+), 19 deletions(-) diff --git a/doc/devref.doxyconf-html.in b/doc/devref.doxyconf-html.in index c2dc731..99bfb68 100644 --- a/doc/devref.doxyconf-html.in +++ b/doc/devref.doxyconf-html.in @@ -179,6 +179,7 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Bit_Matrix.defs.hh \ @srcdir@/../src/Bit_Matrix.inlines.hh \ @srcdir@/../src/Bit_Matrix.cc \ + @srcdir@/../src/Integer_Interval.hh \ @srcdir@/../src/Variable.types.hh \ @srcdir@/../src/Variable.defs.hh \ @srcdir@/../src/Variable.inlines.hh \ @@ -191,6 +192,7 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/Linear_Expression.defs.hh \ @srcdir@/../src/Linear_Expression.inlines.hh \ @srcdir@/../src/Linear_Expression.cc \ + @srcdir@/../src/Rational_Interval.hh \ @srcdir@/../src/Constraint.types.hh \ @srcdir@/../src/Constraint.defs.hh \ @srcdir@/../src/Constraint.inlines.hh \ diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 4f02260..c71b122 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -116,25 +116,6 @@ private: Implementation impl; }; -struct Integer_Interval_Info_Policy { - const_bool_nodef(store_special, true); - const_bool_nodef(store_open, false); - const_bool_nodef(cache_empty, true); - const_bool_nodef(cache_singleton, true); - const_bool_nodef(cache_normalized, false); - const_int_nodef(next_bit, 0); - const_bool_nodef(may_be_empty, true); - const_bool_nodef(may_contain_infinity, false); - const_bool_nodef(check_empty_result, false); - const_bool_nodef(check_inexact, false); -}; - -typedef Interval_Restriction_None -<Interval_Info_Bitset<unsigned int, Integer_Interval_Info_Policy> > -Integer_Interval_Info; - -typedef Interval<mpz_class, Integer_Interval_Info> Integer_Interval_Type; - template <typename Target> class Concrete_Expression_Common { public: diff --git a/src/Integer_Interval.hh b/src/Integer_Interval.hh new file mode 100644 index 0000000..f4ea09e --- /dev/null +++ b/src/Integer_Interval.hh @@ -0,0 +1,55 @@ +/* Integer_Interval class declaration and implementation. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara@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_Integer_Interval_hh +#define PPL_Integer_Interval_hh 1 + +#include "Interval.defs.hh" +#include <gmpxx.h> + +namespace Parma_Polyhedra_Library { + +struct Integer_Interval_Info_Policy { + const_bool_nodef(store_special, true); + const_bool_nodef(store_open, false); + const_bool_nodef(cache_empty, true); + const_bool_nodef(cache_singleton, true); + const_bool_nodef(cache_normalized, false); + const_int_nodef(next_bit, 0); + const_bool_nodef(may_be_empty, true); + const_bool_nodef(may_contain_infinity, false); + const_bool_nodef(check_empty_result, false); + const_bool_nodef(check_inexact, false); +}; + +typedef Interval_Restriction_None +<Interval_Info_Bitset<unsigned int, Integer_Interval_Info_Policy> > +Integer_Interval_Info; + +#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS +//! An interval with integral, necessarily closed boundaries. +#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) +typedef Interval<mpz_class, Integer_Interval_Info> Integer_Interval; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_Integer_Interval_hh) diff --git a/src/Makefile.am b/src/Makefile.am index a2aaf54..04f30cb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -234,6 +234,7 @@ Box.defs.hh \ Box_Status.inlines.hh \ Box.inlines.hh \ Box.templates.hh \ +Integer_Interval.hh \ Rational_Interval.hh \ Rational_Box.hh \ Variable.defs.hh \