September 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Fixed missing make dependency for recently added header file.
by François Galea 07 Sep '09

07 Sep '09

Module: ppl/ppl Branch: pip Commit: 544e8ba18471243e740b81f9e4d4f05b839788eb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=544e8ba18471… Author: François Galea <francois.galea(a)uvsq.fr> Date: Fri Sep 4 18:25:13 2009 +0200 Fixed missing make dependency for recently added header file. --- src/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b50562d..2160973 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -276,6 +276,7 @@ PIP_Tree.defs.hh \ PIP_Tree.inlines.hh \ PIP_Problem.defs.hh \ PIP_Problem.inlines.hh \ +PIP_Problem.templates.hh \ Poly_Con_Relation.defs.hh \ Poly_Con_Relation.inlines.hh \ Poly_Gen_Relation.defs.hh \

1 0

[GIT] ppl/ppl(floating_point): Fixed comments and documentation
by Fabio Biselli 07 Sep '09

07 Sep '09

Module: ppl/ppl Branch: floating_point Commit: ce4f16e3106adf4f03d8d3e6b9ea0abc996ea50a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ce4f16e3106a… Author: Fabio Biselli <fabio.biselli(a)studenti.unipr.it> Date: Mon Sep 7 12:31:54 2009 +0200 Fixed comments and documentation --- src/Constant_Floating_Point_Expression.defs.hh | 31 ++++++++++--------- src/Difference_Floating_Point_Expression.defs.hh | 31 ++++++++++--------- src/Division_Floating_Point_Expression.defs.hh | 24 +++++++------- src/Floating_Point_Expression.defs.hh | 29 +++++++++--------- ...ultiplication_Floating_Point_Expression.defs.hh | 31 ++++++++++--------- src/Sum_Floating_Point_Expression.defs.hh | 25 ++++++++------- src/Variable_Floating_Point_Expression.defs.hh | 23 +++++++------- 7 files changed, 99 insertions(+), 95 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=ce4f16e3…

1 0

[GIT] ppl/ppl(floating_point): Made absolute_error constant.
by Fabio Bossi 07 Sep '09

07 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 04e68873c8a8f3e85682506f36d2c8626a48f1e5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=04e68873c8a8… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Mon Sep 7 09:37:36 2009 +0200 Made absolute_error constant. --- src/Floating_Point_Expression.defs.hh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Floating_Point_Expression.defs.hh b/src/Floating_Point_Expression.defs.hh index b0f9ef0..d5e82ca 100644 --- a/src/Floating_Point_Expression.defs.hh +++ b/src/Floating_Point_Expression.defs.hh @@ -101,7 +101,7 @@ public: number in the less precise format between the analyzer and the analyzed format. */ - static boundary_type absolute_error; + static const boundary_type absolute_error; /* \brief Verification if a given linear form overflows. @@ -128,7 +128,8 @@ public: template <typename FP_Interval_Type, typename FP_Format> -typename Floating_Point_Expression<FP_Interval_Type, FP_Format>::boundary_type +const typename Floating_Point_Expression<FP_Interval_Type, FP_Format>:: +boundary_type Floating_Point_Expression<FP_Interval_Type, FP_Format>::absolute_error = std::max(static_cast<typename Floating_Point_Expression<FP_Interval_Type, FP_Format>::boundary_type>

1 0

[GIT] ppl/ppl(floating_point): Fixed erroneous use of const&.
by Fabio Bossi 05 Sep '09

05 Sep '09

Module: ppl/ppl Branch: floating_point Commit: b1fbafc2fb396154d0fa5fd4ee2d0eda860e0e3b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b1fbafc2fb39… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Sat Sep 5 20:07:04 2009 +0200 Fixed erroneous use of const&. --- src/Floating_Point_Expression.templates.hh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Floating_Point_Expression.templates.hh b/src/Floating_Point_Expression.templates.hh index de52808..03654fb 100644 --- a/src/Floating_Point_Expression.templates.hh +++ b/src/Floating_Point_Expression.templates.hh @@ -40,9 +40,9 @@ Floating_Point_Expression<FP_Interval_Type, FP_Format> pow(2, -FP_Format::fraction_bits))); // Handle the inhomogeneous term. - const FP_Interval_Type& current_term = lf.inhomogeneous_term(); - FP_Interval_Type current_multiplier(std::max(abs(current_term.lower()), - abs(current_term.upper()))); + const FP_Interval_Type* current_term = &lf.inhomogeneous_term(); + FP_Interval_Type current_multiplier(std::max(abs(current_term->lower()), + abs(current_term->upper()))); FP_Linear_Form current_result_term(current_multiplier); current_result_term *= error_propagator; result = FP_Linear_Form(current_result_term); @@ -50,9 +50,9 @@ Floating_Point_Expression<FP_Interval_Type, FP_Format> // Handle the other terms. dimension_type dimension = lf.space_dimension(); for (dimension_type i = 0; i < dimension; ++i) { - current_term = lf.coefficient(Variable(i)); - current_multiplier = FP_Interval_Type(std::max(abs(current_term.lower()), - abs(current_term.upper()))); + current_term = &lf.coefficient(Variable(i)); + current_multiplier = FP_Interval_Type(std::max(abs(current_term->lower()), + abs(current_term->upper()))); current_result_term = FP_Linear_Form(Variable(i)); current_result_term *= current_multiplier; current_result_term *= error_propagator;

1 0

[GIT] ppl/ppl(floating_point): Added operator/= and method negate for class Linear_Form.
by Fabio Bossi 05 Sep '09

05 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 70431729da6b1ee33ff65eee4a5283c96bb2f20c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=70431729da6b… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Sat Sep 5 17:57:11 2009 +0200 Added operator/= and method negate for class Linear_Form. Refactored code of class Floating_Point_Exception and its derivate classes in order to avoid creating unnecessary temporaries. --- src/Constant_Floating_Point_Expression.defs.hh | 5 +- src/Constant_Floating_Point_Expression.inlines.hh | 10 ++-- src/Difference_Floating_Point_Expression.defs.hh | 3 +- ...fference_Floating_Point_Expression.templates.hh | 25 ++++++----- src/Division_Floating_Point_Expression.defs.hh | 3 +- ...Division_Floating_Point_Expression.templates.hh | 35 +++++++------- src/Floating_Point_Expression.defs.hh | 12 +++-- src/Floating_Point_Expression.templates.hh | 33 +++++++------ src/Linear_Form.defs.hh | 16 +++++++ src/Linear_Form.templates.hh | 18 +++++++ ...ultiplication_Floating_Point_Expression.defs.hh | 3 +- ...lication_Floating_Point_Expression.templates.hh | 48 +++++++++++--------- src/Opposite_Floating_Point_Expression.defs.hh | 3 +- src/Opposite_Floating_Point_Expression.inlines.hh | 10 +++-- src/Sum_Floating_Point_Expression.defs.hh | 3 +- src/Sum_Floating_Point_Expression.templates.hh | 24 ++++++---- src/Variable_Floating_Point_Expression.defs.hh | 3 +- src/Variable_Floating_Point_Expression.inlines.hh | 10 ++-- 18 files changed, 162 insertions(+), 102 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=70431729…

1 0

[GIT] ppl/ppl(pip): Corrected bug in PIP_Problem:: add_space_dimensions_and_embed().
by Enea Zaffanella 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: pip Commit: 8abcfae5a3f83a37b57a6fb676df3fcf87f1f680 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8abcfae5a3f8… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Sep 4 17:26:01 2009 +0200 Corrected bug in PIP_Problem::add_space_dimensions_and_embed(). --- src/PIP_Problem.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index fa290d2..a5955d2 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -341,10 +341,9 @@ PPL::PIP_Problem // First add PIP variables ... external_space_dim += m_pip_vars; // ... then add PIP parameters. - if (m_pip_vars > 0) { - parameters.insert(Variable(external_space_dim), - Variable(external_space_dim - 1 + m_pip_vars)); - external_space_dim += m_pip_vars; + for (dimension_type i = m_pip_params; i-- > 0; ) { + parameters.insert(Variable(external_space_dim)); + ++external_space_dim; } // Update problem status. if (status != UNSATISFIABLE)

1 0

[GIT] ppl/ppl(floating_point): Added more documentation
by Fabio Biselli 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: floating_point Commit: da78c30d4893169e3a095e9b91fd0a411fb00947 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=da78c30d4893… Author: Fabio Biselli <fabio.biselli(a)studenti.unipr.it> Date: Fri Sep 4 19:05:11 2009 +0200 Added more documentation --- src/Constant_Floating_Point_Expression.defs.hh | 11 ++++++++++- src/Difference_Floating_Point_Expression.defs.hh | 15 ++++++++++++++- src/Floating_Point_Expression.defs.hh | 19 ++++++++++++++++--- ...ultiplication_Floating_Point_Expression.defs.hh | 11 ++++++++++- src/Opposite_Floating_Point_Expression.defs.hh | 5 ++++- src/Sum_Floating_Point_Expression.defs.hh | 15 ++++++++++++++- src/Variable_Floating_Point_Expression.defs.hh | 9 ++++++--- 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/src/Constant_Floating_Point_Expression.defs.hh b/src/Constant_Floating_Point_Expression.defs.hh index b189dcf..5301c17 100644 --- a/src/Constant_Floating_Point_Expression.defs.hh +++ b/src/Constant_Floating_Point_Expression.defs.hh @@ -101,9 +101,18 @@ public: //@} // Constructors and Destructor - // TODO: comment + // FIXME: Modify documentation when exceptions are fixed + /* \brief + Returns a linear form in the abstract store \p store corresponding to + an inhomogenous term which over-approximates the value of + <CODE>this</CODE> argument. + + \exception Parma_Polyhedra_Library::Linearization_Failed + Thrown if the method <CODE>linearize</CODE> fails. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; + //! Swaps \p *this with \p y. void swap(Constant_Floating_Point_Expression& y); private: diff --git a/src/Difference_Floating_Point_Expression.defs.hh b/src/Difference_Floating_Point_Expression.defs.hh index 397191b..ac7240f 100644 --- a/src/Difference_Floating_Point_Expression.defs.hh +++ b/src/Difference_Floating_Point_Expression.defs.hh @@ -105,7 +105,20 @@ public: //@} // Constructors and Destructor - //TODO: comment + // FIXME: Modify documentation when exceptions are fixed + /* \brief + Returns a linear form in the abstract store \p store constructed by + adding the following linear forms: + + - the linearization of the <CODE>first_operand</CODE> minus the + linearization of the <CODE>second_operand</CODE>; + - the relative error related to the <CODE>first_operand</CODE>; + - the relative error related to the <CODE>second_operand</CODE>; + - the absolute error. + + \exception Parma_Polyhedra_Library::Linearization_Failed + Thrown if the method <CODE>linearize</CODE> fails. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; //! Swaps \p *this with \p y. diff --git a/src/Floating_Point_Expression.defs.hh b/src/Floating_Point_Expression.defs.hh index 5513daa..48de2a8 100644 --- a/src/Floating_Point_Expression.defs.hh +++ b/src/Floating_Point_Expression.defs.hh @@ -96,6 +96,11 @@ public: const FP_Interval_Abstract_Store& store) const = 0; //! Absolute error. + /* \brief + Initialized by computing the smallest non-zero positive + number in the less precise format between the analyzer and the analyzed + format. + */ static boundary_type absolute_error; /* \brief @@ -104,14 +109,22 @@ public: */ // FIXME: this may not be the best place for them. static bool overflows(const FP_Linear_Form& lf); - static FP_Linear_Form relative_error(const FP_Linear_Form&); + /* \brief + Returns a linear form that is used by <CODE>linearize</CODE> to account + for the relative errors on \p lf. + */ + static FP_Linear_Form relative_error(const FP_Linear_Form& lf); - static FP_Interval_Type intervalize(const FP_Linear_Form&, + /* \brief + Returns an interval that over approximates the range of \p lf in + the apstract store \p store. + */ + static FP_Interval_Type intervalize(const FP_Linear_Form& lf, const FP_Interval_Abstract_Store& store); }; // class Floating_Point_Expression -//! Initialize static members of the class. + template <typename FP_Interval_Type, typename FP_Format> typename Floating_Point_Expression<FP_Interval_Type, FP_Format>::boundary_type Floating_Point_Expression<FP_Interval_Type, FP_Format>::absolute_error = diff --git a/src/Multiplication_Floating_Point_Expression.defs.hh b/src/Multiplication_Floating_Point_Expression.defs.hh index d574dd1..a46ca0d 100644 --- a/src/Multiplication_Floating_Point_Expression.defs.hh +++ b/src/Multiplication_Floating_Point_Expression.defs.hh @@ -105,7 +105,16 @@ public: //@} // Constructors and Destructor. - // TODO: comment + // FIXME: Modify documentation when exceptions are fixed + // FIXME: Add complete description of method + /* \brief + Returns a linear form in the abstract store \p store constructed by + adding the following linear forms: + + + \exception Parma_Polyhedra_Library::Linearization_Failed + Thrown if the method <CODE>linearize</CODE> fails. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; //! Swaps \p *this with \p y. diff --git a/src/Opposite_Floating_Point_Expression.defs.hh b/src/Opposite_Floating_Point_Expression.defs.hh index f2660b5..7ad2991 100644 --- a/src/Opposite_Floating_Point_Expression.defs.hh +++ b/src/Opposite_Floating_Point_Expression.defs.hh @@ -102,7 +102,10 @@ public: //@} // Constructors and Destructor - // TODO: comment + /* \brief + Returns a linear form in the abstract store \p store that simply + represents the opposite of the operand linearization. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; //! Swaps \p *this with \p y. diff --git a/src/Sum_Floating_Point_Expression.defs.hh b/src/Sum_Floating_Point_Expression.defs.hh index 92d9d6d..c359526 100644 --- a/src/Sum_Floating_Point_Expression.defs.hh +++ b/src/Sum_Floating_Point_Expression.defs.hh @@ -103,7 +103,20 @@ public: //@} // Constructors and Destructor - // TODO: comment + // FIXME: Modify documentation when exceptions are fixed + /* \brief + Returns a linear form in the abstract store \p store constructed by + adding the following linear forms: + + - the linearization of the <CODE>first_operand</CODE>; + - the linearization of the <CODE>second_operand</CODE>; + - the relative error related to the <CODE>first_operand</CODE>; + - the relative error related to the <CODE>second_operand</CODE>; + - the absolute error. + + \exception Parma_Polyhedra_Library::Linearization_Failed + Thrown if the method <CODE>linearize</CODE> fails. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; //! Swaps \p *this with \p y. diff --git a/src/Variable_Floating_Point_Expression.defs.hh b/src/Variable_Floating_Point_Expression.defs.hh index 0dc0038..bc8e5a5 100644 --- a/src/Variable_Floating_Point_Expression.defs.hh +++ b/src/Variable_Floating_Point_Expression.defs.hh @@ -89,8 +89,8 @@ public: //! \name Constructors and Destructor //@{ /*! \brief - Constructor with a parameter: builds the variable floating point expression - from \p v_index corresponding to the variable index. + Constructor with a parameter: builds the variable floating point + expression from \p v_index corresponding to the variable index. */ explicit Variable_Floating_Point_Expression(const dimension_type v_index); @@ -99,7 +99,10 @@ public: //@} // Constructors and Destructor - // TODO: comment + /* \brief + Returns a linear form in the abstract store \p store corresponding to + <CODE>this</CODE> variable with coefficent \f$[1,1]\f$. + */ FP_Linear_Form linearize(const FP_Interval_Abstract_Store& store) const; //! Swaps \p *this with \p y.

1 0

[GIT] ppl/ppl(master): Corrected a couple of typos in documentation of Variables_Set.
by Enea Zaffanella 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: master Commit: d3dc3a4686aaf3319695a946e8dd9890da9827d0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3dc3a4686aa… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Sep 4 17:00:16 2009 +0200 Corrected a couple of typos in documentation of Variables_Set. --- src/Variables_Set.defs.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Variables_Set.defs.hh b/src/Variables_Set.defs.hh index 6692c69..41c78ab 100644 --- a/src/Variables_Set.defs.hh +++ b/src/Variables_Set.defs.hh @@ -62,7 +62,7 @@ public: If <CODE>v.id() <= w.id()</CODE>, this constructor builds the set of variables' indexes <CODE>v.id()</CODE>, <CODE>v.id()+1</CODE>, ..., <CODE>w.id()</CODE>. - The empty set it built otherwise. + The empty set is built otherwise. */ Variables_Set(const Variable& v, const Variable& w); @@ -75,13 +75,13 @@ public: */ dimension_type space_dimension() const; - //! Inserts the index of variavle \p v into the set. + //! Inserts the index of variable \p v into the set. void insert(Variable v); + // The `insert' method above overloads (instead of hiding) the // other `insert' method of std::set. using Base::insert; - /*! \brief Loads from \p s an ASCII representation (as produced by ascii_dump(std::ostream&) const) and sets \p *this accordingly.

1 0

[GIT] ppl/ppl(pip): Implemented methods querying/ adding space dimensions and parameters.
by Enea Zaffanella 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: pip Commit: 322a2b9a124af9e1e82f87054de70ce300336c15 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=322a2b9a124a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Sep 4 16:56:54 2009 +0200 Implemented methods querying/adding space dimensions and parameters. --- src/PIP_Problem.cc | 31 ++++++++++++++++++++++++++++++- src/PIP_Problem.inlines.hh | 10 ++++++++++ 2 files changed, 40 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index dece4ef..fa290d2 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -321,4 +321,33 @@ PPL::PIP_Problem::Rational_Matrix::ascii_load(std::istream& s) { return Matrix::ascii_load(s); } - +void +PPL::PIP_Problem +::add_space_dimensions_and_embed(const dimension_type m_pip_vars, + const dimension_type m_pip_params) { + // The space dimension of the resulting PIP problem should not + // overflow the maximum allowed space dimension. + dimension_type available = max_space_dimension() - space_dimension(); + bool should_throw = (m_pip_vars > available); + if (!should_throw) { + available -= m_pip_vars; + should_throw = (m_pip_params > available); + } + if (should_throw) + throw std::length_error("PPL::PIP_Problem::" + "add_space_dimensions_and_embed(m_v, m_p):\n" + "adding m_v+m_p new space dimensions exceeds " + "the maximum allowed space dimension."); + // First add PIP variables ... + external_space_dim += m_pip_vars; + // ... then add PIP parameters. + if (m_pip_vars > 0) { + parameters.insert(Variable(external_space_dim), + Variable(external_space_dim - 1 + m_pip_vars)); + external_space_dim += m_pip_vars; + } + // Update problem status. + if (status != UNSATISFIABLE) + status = PARTIALLY_SATISFIABLE; + PPL_ASSERT(OK()); +} diff --git a/src/PIP_Problem.inlines.hh b/src/PIP_Problem.inlines.hh index c064ae9..2d9a726 100644 --- a/src/PIP_Problem.inlines.hh +++ b/src/PIP_Problem.inlines.hh @@ -60,6 +60,11 @@ PIP_Problem::~PIP_Problem() { } inline dimension_type +PIP_Problem::space_dimension() const { + return external_space_dim; +} + +inline dimension_type PIP_Problem::max_space_dimension() { return Constraint::max_space_dimension(); } @@ -74,6 +79,11 @@ PIP_Problem::constraints_end() const { return input_cs.end(); } +inline const Variables_Set& +PIP_Problem::parameter_space_dimensions() const { + return parameters; +} + } // namespace Parma_Polyhedra_Library namespace std {

1 0

[GIT] ppl/ppl(floating_point): Added necessary typedefs for tests. Removed garbage.
by Fabio Bossi 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 052fb58b85dcf4d03b161c24c7ae3d0e9bd4d086 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=052fb58b85dc… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Fri Sep 4 16:47:43 2009 +0200 Added necessary typedefs for tests. Removed garbage. --- .../floatingpointexpr1.cc | 152 +++----------------- 1 files changed, 19 insertions(+), 133 deletions(-) diff --git a/tests/Floating_Point_Expression/floatingpointexpr1.cc b/tests/Floating_Point_Expression/floatingpointexpr1.cc index 5d38f26..9f635c8 100644 --- a/tests/Floating_Point_Expression/floatingpointexpr1.cc +++ b/tests/Floating_Point_Expression/floatingpointexpr1.cc @@ -1,4 +1,4 @@ -/* Testing Linear_Expression. +/* Testing class Floating_Point_Expression ad its derivate classes. Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -22,145 +22,34 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_test.hh" +typedef Linear_Form<fl_r_oc> Interval_Linear_Form; +typedef Division_Floating_Point_Expression<fl_r_oc, IEEE754_Single> div_fpes; +typedef Division_Floating_Point_Expression<fl_r_oc, IEEE754_Double> div_fped; +typedef Difference_Floating_Point_Expression<fl_r_oc, IEEE754_Single> dif_fpes; +typedef Difference_Floating_Point_Expression<fl_r_oc, IEEE754_Double> dif_fped; +typedef Multiplication_Floating_Point_Expression<fl_r_oc, IEEE754_Single> mul_fpes; +typedef Multiplication_Floating_Point_Expression<fl_r_oc, IEEE754_Double> mul_fped; +typedef Sum_Floating_Point_Expression<fl_r_oc, IEEE754_Single> sum_fpes; +typedef Sum_Floating_Point_Expression<fl_r_oc, IEEE754_Double> sum_fped; +typedef Constant_Floating_Point_Expression<fl_r_oc, IEEE754_Single> con_fpes; +typedef Constant_Floating_Point_Expression<fl_r_oc, IEEE754_Double> con_fped; +typedef Variable_Floating_Point_Expression<fl_r_oc, IEEE754_Single> var_fpes; +typedef Variable_Floating_Point_Expression<fl_r_oc, IEEE754_Double> var_fped; +typedef Opposite_Floating_Point_Expression<fl_r_oc, IEEE754_Single> opp_fpes; +typedef Opposite_Floating_Point_Expression<fl_r_oc, IEEE754_Double> opp_fped; + namespace { using namespace Parma_Polyhedra_Library::IO_Operators; -// Test operator-=(Linear_Form<db_r_oc>& f1, const Linear_Form<db_r_oc>& f2): -// in this case the dimension of f2 is strictly greater than -// the dimension of f1. bool test01() { - Variable A(0); - Variable B(1); - - Linear_Form<db_r_oc> f1 = A; - Linear_Form<db_r_oc> f2 = B; - f1 -= f2; - - Linear_Form<db_r_oc> known_result = A - Linear_Form<db_r_oc>(B); - - bool ok = (f1 == known_result); - - nout << "*** known_result ***" << endl - << known_result << endl; - - return ok; + return true; } bool test02() { - Variable A(15); - Variable B(0); - - Linear_Form<db_r_oc> f1 = A; - Linear_Form<db_r_oc> f2 = B; - - Linear_Form<db_r_oc> known_result1 = f1 + f2; - - bool ok1 = (Linear_Form<db_r_oc>(A) + B == known_result1) - && (B + Linear_Form<db_r_oc>(A) == known_result1) - && (A + Linear_Form<db_r_oc>(B) == known_result1) - && (Linear_Form<db_r_oc>(B) + A == known_result1) - && (Linear_Form<db_r_oc>(B) + Linear_Form<db_r_oc>(A) == known_result1); - - nout << "*** known_result1 ***" << endl - << known_result1 << endl; - - Linear_Form<db_r_oc> known_result2 = f1 + f1; - - bool ok2 = (Linear_Form<db_r_oc>(A) + A == known_result2) - && (A + Linear_Form<db_r_oc>(A) == known_result2) - && (A + Linear_Form<db_r_oc>(A) == known_result2) - && (Linear_Form<db_r_oc>(A) + A == known_result2) - && (Linear_Form<db_r_oc>(A) + Linear_Form<db_r_oc>(A) == known_result2); - - nout << "*** known_result2 ***" << endl - << known_result2 << endl; - - return ok1 && ok2; -} - -bool -test03() { - Variable A(15); - Variable B(10); - - Linear_Form<db_r_oc> f1 = A; - Linear_Form<db_r_oc> f2 = B; - - Linear_Form<db_r_oc> known_result1 = f1 - f2; - - bool ok1 = (Linear_Form<db_r_oc>(A) - B == known_result1) - && (A - Linear_Form<db_r_oc>(B) == known_result1) - && (Linear_Form<db_r_oc>(A) - Linear_Form<db_r_oc>(B) == known_result1); - - nout << "*** known_result1 ***" << endl - << known_result1 << endl; - - Linear_Form<db_r_oc> known_result2 = f2 - f1; - - bool ok2 = (Linear_Form<db_r_oc>(B) - A == known_result2) - && (B - Linear_Form<db_r_oc>(A) == known_result2) - && (Linear_Form<db_r_oc>(B) - Linear_Form<db_r_oc>(A) == known_result2); - - nout << "*** known_result2 ***" << endl - << known_result2 << endl; - - Linear_Form<db_r_oc> known_result3 = f1 - f1; - - bool ok3 = (Linear_Form<db_r_oc>(A) - A == known_result3) - && (A - Linear_Form<db_r_oc>(A) == known_result3) - && (Linear_Form<db_r_oc>(A) - Linear_Form<db_r_oc>(A) == known_result3); - - nout << "*** known_result3 ***" << endl - << known_result3 << endl; - - return ok1 && ok2 && ok3; -} - -// Test operator+=(Linear_Form<db_r_oc>& f1, const Linear_Form<db_r_oc>& f2): -// in this case the dimension of f2 is strictly greater than -// the dimension of f1. -bool -test04() { - Variable A(0); - Variable B(1); - - Linear_Form<db_r_oc> f1 = A; - Linear_Form<db_r_oc> f2 = B; - f1 += f2; - - Linear_Form<db_r_oc> known_result = Linear_Form<db_r_oc>(A) + B; - - bool ok = (f1 == known_result); - - nout << "*** known_result ***" << endl - << known_result << endl; - - return ok; -} - -bool -test05() { - Variable A(0); - Variable B(1); - Variable C(16); - Variable D(120); - - Linear_Form<db_r_oc> f = A + 2*B + 16*C + 120*D; - - Linear_Form<db_r_oc> known_result = A; - known_result += db_r_oc(2) * Linear_Form<db_r_oc>(B); - known_result += db_r_oc(16) * Linear_Form<db_r_oc>(C); - known_result += db_r_oc(120) * Linear_Form<db_r_oc>(D); - - bool ok = (f == known_result); - - nout << "*** known_result ***" << endl - << known_result << endl; - - return ok; + return true; } } // namespace @@ -168,7 +57,4 @@ test05() { BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); - DO_TEST(test03); - DO_TEST(test04); - DO_TEST(test05); END_MAIN

1 0