September 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Style improvements.
by Fabio Bossi 04 Sep '09

04 Sep '09

Module: ppl/ppl Branch: floating_point Commit: d152f786262208e5c66f886cc969641f3b602ef4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d152f7862622… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Fri Sep 4 09:40:19 2009 +0200 Style improvements. --- ...fference_Floating_Point_Expression.templates.hh | 2 +- ...Division_Floating_Point_Expression.templates.hh | 2 +- src/Floating_Point_Expression.templates.hh | 6 +++--- ...lication_Floating_Point_Expression.templates.hh | 4 ++-- src/Sum_Floating_Point_Expression.templates.hh | 2 +- src/Variable_Floating_Point_Expression.inlines.hh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Difference_Floating_Point_Expression.templates.hh b/src/Difference_Floating_Point_Expression.templates.hh index 6892ee7..4d7588c 100644 --- a/src/Difference_Floating_Point_Expression.templates.hh +++ b/src/Difference_Floating_Point_Expression.templates.hh @@ -33,7 +33,7 @@ typename Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); + FP_Interval_Type abs_error(-this->absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand - linearized_second_operand + diff --git a/src/Division_Floating_Point_Expression.templates.hh b/src/Division_Floating_Point_Expression.templates.hh index 8d35a79..49be890 100644 --- a/src/Division_Floating_Point_Expression.templates.hh +++ b/src/Division_Floating_Point_Expression.templates.hh @@ -40,7 +40,7 @@ typename Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> throw Linearization_Failed(); FP_Linear_Form linearized_first_operand = first_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); + FP_Interval_Type abs_error(-this->absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand / intervalized_second_operand diff --git a/src/Floating_Point_Expression.templates.hh b/src/Floating_Point_Expression.templates.hh index 32059e8..9321527 100644 --- a/src/Floating_Point_Expression.templates.hh +++ b/src/Floating_Point_Expression.templates.hh @@ -43,9 +43,9 @@ Floating_Point_Expression<FP_Interval_Type, FP_Format> 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 = FP_Linear_Form(current_multiplier * - error_propagator); - FP_Linear_Form result = FP_Linear_Form(current_result_term); + FP_Linear_Form current_result_term(current_multiplier * + error_propagator); + FP_Linear_Form result = current_result_term; // Handle the other terms. dimension_type dimension = lf.space_dimension(); diff --git a/src/Multiplication_Floating_Point_Expression.templates.hh b/src/Multiplication_Floating_Point_Expression.templates.hh index ca522e5..fcd8d9b 100644 --- a/src/Multiplication_Floating_Point_Expression.templates.hh +++ b/src/Multiplication_Floating_Point_Expression.templates.hh @@ -33,7 +33,7 @@ typename Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { /* FIXME: we currently adopt the Interval-Size Local strategy in order to - decide which of the two linear forms should be intervalized, as described + decide which of the two linear forms must be intervalized, as described in section 6.2.4 of Antoine Mine's thesis. We should also consider more refined strategies. */ @@ -73,7 +73,7 @@ typename Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> // Here we do the actual computation. FP_Linear_Form result; - FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); + FP_Interval_Type abs_error(-this->absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(this->absolute_error); if (intervalize_first) { diff --git a/src/Sum_Floating_Point_Expression.templates.hh b/src/Sum_Floating_Point_Expression.templates.hh index dfc43c0..9844a9b 100644 --- a/src/Sum_Floating_Point_Expression.templates.hh +++ b/src/Sum_Floating_Point_Expression.templates.hh @@ -32,7 +32,7 @@ typename Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); + FP_Interval_Type abs_error(-this->absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand + linearized_second_operand + diff --git a/src/Variable_Floating_Point_Expression.inlines.hh b/src/Variable_Floating_Point_Expression.inlines.hh index b88af52..fa4eda3 100644 --- a/src/Variable_Floating_Point_Expression.inlines.hh +++ b/src/Variable_Floating_Point_Expression.inlines.hh @@ -50,7 +50,7 @@ inline typename Variable_Floating_Point_Expression<FP_Interval_Type, FP_Format>::FP_Linear_Form Variable_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { - FP_Linear_Form result = FP_Linear_Form(Variable(variable_index)); + FP_Linear_Form result(Variable(variable_index)); return result; }

1 0

[GIT] ppl/ppl(floating_point): Deleted a superfluous test.
by Roberto Amadini 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 4229e9d6cca6d6443122485fc7139af107290c19 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4229e9d6cca6… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Thu Sep 3 18:26:57 2009 +0200 Deleted a superfluous test. --- .../floatingpointexpr1.cc | 27 +------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/tests/Floating_Point_Expression/floatingpointexpr1.cc b/tests/Floating_Point_Expression/floatingpointexpr1.cc index 33395d1..5d38f26 100644 --- a/tests/Floating_Point_Expression/floatingpointexpr1.cc +++ b/tests/Floating_Point_Expression/floatingpointexpr1.cc @@ -141,35 +141,10 @@ test04() { return ok; } -// Test operator+=(Linear_Form<db_r_oc>& f, Variable v): -// in this case the dimension of v is strictly greater than -// the dimension of f. bool test05() { Variable A(0); Variable B(1); - - Linear_Form<db_r_oc> f = A; - db_r_oc x(2.0); - x /= 3.0; - f *= x; - - Linear_Form<db_r_oc> known_result = f + B; - - f += B; - - bool ok = (f == known_result); - - nout << "*** known_result ***" << endl - << known_result << endl; - - return ok; -} - -bool -test06() { - Variable A(0); - Variable B(1); Variable C(16); Variable D(120); @@ -195,5 +170,5 @@ BEGIN_MAIN DO_TEST(test02); DO_TEST(test03); DO_TEST(test04); - DO_TEST(test06); + DO_TEST(test05); END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Added some documentation.
by Fabio Biselli 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: c11c86e606ceeaa69ebb0448972ca08d0943519f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c11c86e606ce… Author: Fabio Biselli <fabio.biselli(a)studenti.unipr.it> Date: Thu Sep 3 19:40:57 2009 +0200 Added some documentation. --- doc/devref.doxyconf-html.in | 24 ++++++++++ src/Constant_Floating_Point_Expression.defs.hh | 45 ++++++++++++++++++ src/Difference_Floating_Point_Expression.defs.hh | 49 ++++++++++++++++++- src/Division_Floating_Point_Expression.defs.hh | 49 ++++++++++++++++++- src/Floating_Point_Expression.defs.hh | 40 ++++++++++++++-- ...ultiplication_Floating_Point_Expression.defs.hh | 49 ++++++++++++++++++- src/Opposite_Floating_Point_Expression.defs.hh | 48 +++++++++++++++++++ src/Sum_Floating_Point_Expression.defs.hh | 49 ++++++++++++++++++- src/Variable_Floating_Point_Expression.defs.hh | 48 +++++++++++++++++++- 9 files changed, 383 insertions(+), 18 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c11c86e6…

1 0

[GIT] ppl/ppl(floating_point): Use 0 instead of NULL.
by Fabio Bossi 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: f7230caad9fd947ee7f4206df54fbeca75a4273f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f7230caad9fd… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 3 17:42:50 2009 +0200 Use 0 instead of NULL. --- ...Difference_Floating_Point_Expression.inlines.hh | 4 ++-- src/Division_Floating_Point_Expression.inlines.hh | 4 ++-- ...iplication_Floating_Point_Expression.inlines.hh | 4 ++-- src/Opposite_Floating_Point_Expression.inlines.hh | 2 +- src/Sum_Floating_Point_Expression.inlines.hh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Difference_Floating_Point_Expression.inlines.hh b/src/Difference_Floating_Point_Expression.inlines.hh index 898c005..2a4a6ac 100644 --- a/src/Difference_Floating_Point_Expression.inlines.hh +++ b/src/Difference_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y){ - assert(x != NULL); - assert(y != NULL); + assert(x != 0); + assert(y != 0); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Division_Floating_Point_Expression.inlines.hh b/src/Division_Floating_Point_Expression.inlines.hh index 0d0c96b..45ce27e 100644 --- a/src/Division_Floating_Point_Expression.inlines.hh +++ b/src/Division_Floating_Point_Expression.inlines.hh @@ -34,8 +34,8 @@ Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const num, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const den) : first_operand(num), second_operand(den) { - assert(num != NULL); - assert(den != NULL); + assert(num != 0); + assert(den != 0); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Multiplication_Floating_Point_Expression.inlines.hh b/src/Multiplication_Floating_Point_Expression.inlines.hh index d3c35ce..a909e28 100644 --- a/src/Multiplication_Floating_Point_Expression.inlines.hh +++ b/src/Multiplication_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y) { - assert(x != NULL); - assert(y != NULL); + assert(x != 0); + assert(y != 0); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Opposite_Floating_Point_Expression.inlines.hh b/src/Opposite_Floating_Point_Expression.inlines.hh index f559a24..92e3c1c 100644 --- a/src/Opposite_Floating_Point_Expression.inlines.hh +++ b/src/Opposite_Floating_Point_Expression.inlines.hh @@ -34,7 +34,7 @@ Opposite_Floating_Point_Expression( Floating_Point_Expression<FP_Interval_Type, FP_Format>* const op) : operand(op) { - assert(op != NULL); + assert(op != 0); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Sum_Floating_Point_Expression.inlines.hh b/src/Sum_Floating_Point_Expression.inlines.hh index 39cfbd7..355bd4b 100644 --- a/src/Sum_Floating_Point_Expression.inlines.hh +++ b/src/Sum_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y) { - assert(x != NULL); - assert(y != NULL); + assert(x != 0); + assert(y != 0); } template <typename FP_Interval_Type, typename FP_Format>

1 0

[GIT] ppl/ppl(floating_point): Fixed an error in relative_error.
by Fabio Bossi 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 637a518f0c3d6c2dd39676e3274a63e1e4f480c8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=637a518f0c3d… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 3 17:40:33 2009 +0200 Fixed an error in relative_error. --- src/Floating_Point_Expression.templates.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Floating_Point_Expression.templates.hh b/src/Floating_Point_Expression.templates.hh index 6f23294..32059e8 100644 --- a/src/Floating_Point_Expression.templates.hh +++ b/src/Floating_Point_Expression.templates.hh @@ -41,8 +41,8 @@ Floating_Point_Expression<FP_Interval_Type, FP_Format> // Handle the inhomogeneous term. FP_Interval_Type current_term = lf.inhomogeneous_term(); - boundary_type current_multiplier = std::max(abs(current_term.lower()), - abs(current_term.upper())); + FP_Interval_Type current_multiplier(std::max(abs(current_term.lower()), + abs(current_term.upper()))); FP_Linear_Form current_result_term = FP_Linear_Form(current_multiplier * error_propagator); FP_Linear_Form result = FP_Linear_Form(current_result_term); @@ -51,8 +51,8 @@ Floating_Point_Expression<FP_Interval_Type, FP_Format> dimension_type dimension = lf.space_dimension(); for (dimension_type i = 0; i < dimension; ++i) { current_term = lf.coefficient(Variable(i)); - current_multiplier = std::max(abs(current_term.lower()), - abs(current_term.upper())); + current_multiplier = FP_Interval_Type(std::max(abs(current_term.lower()), + abs(current_term.upper()))); current_result_term = FP_Linear_Form(Variable(i)) * current_multiplier * error_propagator; result += current_result_term;

1 0

[GIT] ppl/ppl(floating_point): Fixed erroneous declarations of namespace std inside namespace
by Fabio Bossi 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 8e2a4611be5209d929e81a084112aa923f423754 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8e2a4611be52… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 3 16:50:54 2009 +0200 Fixed erroneous declarations of namespace std inside namespace Parma_Polyhedra_Library. --- src/Difference_Floating_Point_Expression.defs.hh | 4 ++-- src/Division_Floating_Point_Expression.defs.hh | 4 ++-- ...ultiplication_Floating_Point_Expression.defs.hh | 4 ++-- src/Sum_Floating_Point_Expression.defs.hh | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Difference_Floating_Point_Expression.defs.hh b/src/Difference_Floating_Point_Expression.defs.hh index 51f1cdb..db19f66 100644 --- a/src/Difference_Floating_Point_Expression.defs.hh +++ b/src/Difference_Floating_Point_Expression.defs.hh @@ -29,8 +29,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Difference_Floating_Point_Expression.types.hh" #include <map> -namespace Parma_Polyhedra_Library { - namespace std { //! Specializes <CODE>std::swap</CODE>. @@ -45,6 +43,8 @@ void swap(Parma_Polyhedra_Library } // namespace std +namespace Parma_Polyhedra_Library { + template <typename FP_Interval_Type, typename FP_Format> class Difference_Floating_Point_Expression : public Floating_Point_Expression<FP_Interval_Type, FP_Format> { diff --git a/src/Division_Floating_Point_Expression.defs.hh b/src/Division_Floating_Point_Expression.defs.hh index 6cc0596..e20465f 100644 --- a/src/Division_Floating_Point_Expression.defs.hh +++ b/src/Division_Floating_Point_Expression.defs.hh @@ -29,8 +29,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Division_Floating_Point_Expression.types.hh" #include <map> -namespace Parma_Polyhedra_Library { - namespace std { //! Specializes <CODE>std::swap</CODE>. @@ -43,6 +41,8 @@ void swap(Parma_Polyhedra_Library } // namespace std +namespace Parma_Polyhedra_Library { + template <typename FP_Interval_Type, typename FP_Format> class Division_Floating_Point_Expression : public Floating_Point_Expression<FP_Interval_Type, FP_Format> { diff --git a/src/Multiplication_Floating_Point_Expression.defs.hh b/src/Multiplication_Floating_Point_Expression.defs.hh index 9b180f9..e32e992 100644 --- a/src/Multiplication_Floating_Point_Expression.defs.hh +++ b/src/Multiplication_Floating_Point_Expression.defs.hh @@ -29,8 +29,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Multiplication_Floating_Point_Expression.types.hh" #include <map> -namespace Parma_Polyhedra_Library { - namespace std { //! Specializes <CODE>std::swap</CODE>. @@ -45,6 +43,8 @@ void swap(Parma_Polyhedra_Library } // namespace std +namespace Parma_Polyhedra_Library { + template <typename FP_Interval_Type, typename FP_Format> class Multiplication_Floating_Point_Expression : public Floating_Point_Expression<FP_Interval_Type, FP_Format> { diff --git a/src/Sum_Floating_Point_Expression.defs.hh b/src/Sum_Floating_Point_Expression.defs.hh index 44a3752..d1193dc 100644 --- a/src/Sum_Floating_Point_Expression.defs.hh +++ b/src/Sum_Floating_Point_Expression.defs.hh @@ -29,8 +29,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Sum_Floating_Point_Expression.types.hh" #include <map> -namespace Parma_Polyhedra_Library { - namespace std { //! Specializes <CODE>std::swap</CODE>. @@ -43,6 +41,7 @@ void swap(Parma_Polyhedra_Library } // namespace std +namespace Parma_Polyhedra_Library { template <typename FP_Interval_Type, typename FP_Format> class Sum_Floating_Point_Expression

1 0

[GIT] ppl/ppl(floating_point): Fixed many errors.
by Fabio Bossi 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: cfdb5138cdb74c37f42dbe0d9ba2832580a3026a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cfdb5138cdb7… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 3 16:37:23 2009 +0200 Fixed many errors. --- ...Difference_Floating_Point_Expression.inlines.hh | 4 ++-- ...fference_Floating_Point_Expression.templates.hh | 6 ++---- ...Division_Floating_Point_Expression.templates.hh | 8 +++----- src/Floating_Point_Expression.templates.hh | 1 - ...iplication_Floating_Point_Expression.inlines.hh | 4 ++-- ...lication_Floating_Point_Expression.templates.hh | 8 +++----- src/Sum_Floating_Point_Expression.inlines.hh | 4 ++-- src/Sum_Floating_Point_Expression.templates.hh | 6 ++---- 8 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/Difference_Floating_Point_Expression.inlines.hh b/src/Difference_Floating_Point_Expression.inlines.hh index 596b21e..898c005 100644 --- a/src/Difference_Floating_Point_Expression.inlines.hh +++ b/src/Difference_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y){ - assert(num != NULL); - assert(den != NULL); + assert(x != NULL); + assert(y != NULL); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Difference_Floating_Point_Expression.templates.hh b/src/Difference_Floating_Point_Expression.templates.hh index 3508767..6892ee7 100644 --- a/src/Difference_Floating_Point_Expression.templates.hh +++ b/src/Difference_Floating_Point_Expression.templates.hh @@ -24,8 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Difference_Floating_Point_Expression_templates_hh #define PPL_Difference_Floating_Point_Expression_templates_hh 1 -#include "Difference_Floating_Point_Expression.defs.hh" - namespace Parma_Polyhedra_Library { template <typename FP_Interval_Type, typename FP_Format> @@ -35,9 +33,9 @@ typename Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); // FIXME: this may be incorrect for some policies. - abs_error.join_assign(absolute_error); + abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand - linearized_second_operand + relative_error(linearized_first_operand) + relative_error(linearized_second_operand) + diff --git a/src/Division_Floating_Point_Expression.templates.hh b/src/Division_Floating_Point_Expression.templates.hh index 08eb2c9..8d35a79 100644 --- a/src/Division_Floating_Point_Expression.templates.hh +++ b/src/Division_Floating_Point_Expression.templates.hh @@ -24,8 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Division_Floating_Point_Expression_templates_hh #define PPL_Division_Floating_Point_Expression_templates_hh 1 -#include "Division_Floating_Point_Expression.defs.hh" - namespace Parma_Polyhedra_Library { template <typename FP_Interval_Type, typename FP_Format> @@ -42,12 +40,12 @@ typename Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> throw Linearization_Failed(); FP_Linear_Form linearized_first_operand = first_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); // FIXME: this may be incorrect for some policies. - abs_error.join_assign(absolute_error); + abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand / intervalized_second_operand + relative_error(linearized_first_operand) / intervalized_second_operand - + abs_eror; + + abs_error; return result; } diff --git a/src/Floating_Point_Expression.templates.hh b/src/Floating_Point_Expression.templates.hh index 8972849..6f23294 100644 --- a/src/Floating_Point_Expression.templates.hh +++ b/src/Floating_Point_Expression.templates.hh @@ -24,7 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Floating_Point_Expression_templates_hh #define PPL_Floating_Point_Expression_templates_hh 1 -#include "Floating_Point_Expression.defs.hh" #include <cmath> namespace Parma_Polyhedra_Library { diff --git a/src/Multiplication_Floating_Point_Expression.inlines.hh b/src/Multiplication_Floating_Point_Expression.inlines.hh index f0206bd..d3c35ce 100644 --- a/src/Multiplication_Floating_Point_Expression.inlines.hh +++ b/src/Multiplication_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y) { - assert(num != NULL); - assert(den != NULL); + assert(x != NULL); + assert(y != NULL); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Multiplication_Floating_Point_Expression.templates.hh b/src/Multiplication_Floating_Point_Expression.templates.hh index 317ede2..ca522e5 100644 --- a/src/Multiplication_Floating_Point_Expression.templates.hh +++ b/src/Multiplication_Floating_Point_Expression.templates.hh @@ -24,8 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Multiplication_Floating_Point_Expression_templates_hh #define PPL_Multiplication_Floating_Point_Expression_templates_hh 1 -#include "Multiplication_Floating_Point_Expression.defs.hh" - namespace Parma_Polyhedra_Library { template <typename FP_Interval_Type, typename FP_Format> @@ -47,7 +45,7 @@ typename Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Interval_Type intervalized_first_operand = intervalize( linearized_first_operand); - FP_Linear_Form linearized_second_operant = second_operand->linearize(store); + FP_Linear_Form linearized_second_operand = second_operand->linearize(store); FP_Interval_Type intervalized_second_operand = intervalize( linearized_second_operand); boundary_type first_interval_size, second_interval_size; @@ -75,9 +73,9 @@ typename Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> // Here we do the actual computation. FP_Linear_Form result; - FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); // FIXME: this may be incorrect for some policies. - abs_error.join_assign(absolute_error); + abs_error.join_assign(this->absolute_error); if (intervalize_first) { result = intervalized_first_operand * linearized_second_operand + intervalized_first_operand * relative_error(linearized_second_operand) + diff --git a/src/Sum_Floating_Point_Expression.inlines.hh b/src/Sum_Floating_Point_Expression.inlines.hh index aa73ba9..39cfbd7 100644 --- a/src/Sum_Floating_Point_Expression.inlines.hh +++ b/src/Sum_Floating_Point_Expression.inlines.hh @@ -35,8 +35,8 @@ Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> Floating_Point_Expression<FP_Interval_Type, FP_Format>* const x, Floating_Point_Expression<FP_Interval_Type, FP_Format>* const y) : first_operand(x), second_operand(y) { - assert(num != NULL); - assert(den != NULL); + assert(x != NULL); + assert(y != NULL); } template <typename FP_Interval_Type, typename FP_Format> diff --git a/src/Sum_Floating_Point_Expression.templates.hh b/src/Sum_Floating_Point_Expression.templates.hh index afc30d3..dfc43c0 100644 --- a/src/Sum_Floating_Point_Expression.templates.hh +++ b/src/Sum_Floating_Point_Expression.templates.hh @@ -24,8 +24,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #ifndef PPL_Sum_Floating_Point_Expression_templates_hh #define PPL_Sum_Floating_Point_Expression_templates_hh 1 -#include "Sum_Floating_Point_Expression.defs.hh" - namespace Parma_Polyhedra_Library { template <typename FP_Interval_Type, typename FP_Format> @@ -34,9 +32,9 @@ typename Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-this->absolute_error); // FIXME: this may be incorrect for some policies. - abs_error.join_assign(absolute_error); + abs_error.join_assign(this->absolute_error); FP_Linear_Form result = linearized_first_operand + linearized_second_operand + relative_error(linearized_first_operand) + relative_error(linearized_second_operand) +

1 0

[GIT] ppl/ppl(pip): Drafted implementation for ascii_dump and ascii_load methods.
by Enea Zaffanella 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: pip Commit: 242e7c1500630ad592fde6ab817ff77519007e63 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=242e7c150063… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 3 16:10:55 2009 +0200 Drafted implementation for ascii_dump and ascii_load methods. --- src/PIP_Problem.cc | 154 +++++++++++++++++++++++++++++++++++++++++++++++ src/PIP_Problem.defs.hh | 3 + 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 2a1089d..5a561a9 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -77,3 +77,157 @@ PPL::PIP_Problem::OK() const { //FIXME return true; } + +void +PPL::PIP_Problem::ascii_dump(std::ostream& s) const { + using namespace IO_Operators; + s << "\nexternal_space_dim: " << external_space_dim << " \n"; + s << "\ninternal_space_dim: " << internal_space_dim << " \n"; + + const dimension_type input_cs_size = input_cs.size(); + + s << "\ninput_cs( " << input_cs_size << " )\n"; + for (dimension_type i = 0; i < input_cs_size; ++i) + input_cs[i].ascii_dump(s); + + s << "\nfirst_pending_constraint: " << first_pending_constraint + << std::endl; + + s << "\ninitialized: " << (initialized ? "YES" : "NO") << "\n"; + + s << "\nstatus: "; + switch (status) { + case UNSATISFIABLE: + s << "UNSATISFIABLE"; + break; + case SATISFIABLE: + s << "SATISFIABLE"; + break; + case OPTIMIZED: + s << "OPTIMIZED"; + break; + case PARTIALLY_SATISFIABLE: + s << "PARTIALLY_SATISFIABLE"; + break; + } + s << "\n"; + + s << "\nparameters"; + parameters.ascii_dump(s); + + s << "\nsimplex_tableau\n"; + tableau.s.ascii_dump(s); + + s << "\nparameter_tableau\n"; + tableau.t.ascii_dump(s); +} + +PPL_OUTPUT_DEFINITIONS(PIP_Problem) + +bool +PPL::PIP_Problem::ascii_load(std::istream& s) { + std::string str; + if (!(s >> str) || str != "external_space_dim:") + return false; + + if (!(s >> external_space_dim)) + return false; + + if (!(s >> str) || str != "internal_space_dim:") + return false; + + if (!(s >> internal_space_dim)) + return false; + + if (!(s >> str) || str != "input_cs(") + return false; + + dimension_type input_cs_size; + + if (!(s >> input_cs_size)) + return false; + + if (!(s >> str) || str != ")") + return false; + + Constraint c(Constraint::zero_dim_positivity()); + for (dimension_type i = 0; i < input_cs_size; ++i) { + if (!c.ascii_load(s)) + return false; + input_cs.push_back(c); + } + + if (!(s >> str) || str != "first_pending_constraint:") + return false; + + if (!(s >> first_pending_constraint)) + return false; + + if (!(s >> str) || str != "initialized:") + return false; + if (!(s >> str)) + return false; + if (str == "YES") + initialized = true; + else if (str == "NO") + initialized = false; + else + return false; + + if (!(s >> str) || str != "status:") + return false; + + if (!(s >> str)) + return false; + + if (str == "UNSATISFIABLE") + status = UNSATISFIABLE; + else if (str == "SATISFIABLE") + status = SATISFIABLE; + else if (str == "OPTIMIZED") + status = OPTIMIZED; + else if (str == "PARTIALLY_SATISFIABLE") + status = PARTIALLY_SATISFIABLE; + else + return false; + + if (!(s >> str) || str != "parameters") + return false; + + if (!parameters.ascii_load(s)) + return false; + + if (!(s >> str) || str != "simplex_tableau") + return false; + if (!tableau.s.ascii_load(s)) + return false; + + if (!(s >> str) || str != "parameter_tableau") + return false; + if (!tableau.t.ascii_load(s)) + return false; + + PPL_ASSERT(OK()); + return true; +} + +void +PPL::PIP_Problem::Rational_Matrix::ascii_dump(std::ostream& s) const { + s << "denominator " << denominator << "\n"; + Matrix::ascii_dump(s); +} + +bool +PPL::PIP_Problem::Rational_Matrix::ascii_load(std::istream& s) { + std::string str; + if (!(s >> str) || str != "denominator") + return false; + Coefficient den; + if (!(s >> den)) + return false; + denominator = den; + + return Matrix::ascii_load(s); +} + + diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index 5a0ce38..818f785 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -326,6 +326,9 @@ private: //! Returns the value of the denominator. const Coefficient &get_denominator() const; + void ascii_dump(std::ostream& s) const; + bool ascii_load(std::istream& s); + protected: Coefficient denominator; };

1 0

[GIT] ppl/ppl(floating_point): Fixed a few typos.
by Fabio Bossi 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 10f41f9fa996403db40dc630acebf6cfce7705c0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10f41f9fa996… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 3 16:06:26 2009 +0200 Fixed a few typos. --- ...fference_Floating_Point_Expression.templates.hh | 2 +- ...Division_Floating_Point_Expression.templates.hh | 2 +- ...lication_Floating_Point_Expression.templates.hh | 2 +- src/Sum_Floating_Point_Expression.templates.hh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Difference_Floating_Point_Expression.templates.hh b/src/Difference_Floating_Point_Expression.templates.hh index 43c0bf6..3508767 100644 --- a/src/Difference_Floating_Point_Expression.templates.hh +++ b/src/Difference_Floating_Point_Expression.templates.hh @@ -35,7 +35,7 @@ typename Difference_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(absolute_error); FP_Linear_Form result = linearized_first_operand - linearized_second_operand + diff --git a/src/Division_Floating_Point_Expression.templates.hh b/src/Division_Floating_Point_Expression.templates.hh index ff2b8b0..08eb2c9 100644 --- a/src/Division_Floating_Point_Expression.templates.hh +++ b/src/Division_Floating_Point_Expression.templates.hh @@ -42,7 +42,7 @@ typename Division_Floating_Point_Expression<FP_Interval_Type, FP_Format> throw Linearization_Failed(); FP_Linear_Form linearized_first_operand = first_operand->linearize(store); - FP_Interval abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(absolute_error); FP_Linear_Form result = linearized_first_operand / intervalized_second_operand diff --git a/src/Multiplication_Floating_Point_Expression.templates.hh b/src/Multiplication_Floating_Point_Expression.templates.hh index 36cd274..317ede2 100644 --- a/src/Multiplication_Floating_Point_Expression.templates.hh +++ b/src/Multiplication_Floating_Point_Expression.templates.hh @@ -75,7 +75,7 @@ typename Multiplication_Floating_Point_Expression<FP_Interval_Type, FP_Format> // Here we do the actual computation. FP_Linear_Form result; - FP_Interval abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(absolute_error); if (intervalize_first) { diff --git a/src/Sum_Floating_Point_Expression.templates.hh b/src/Sum_Floating_Point_Expression.templates.hh index 5b53b44..afc30d3 100644 --- a/src/Sum_Floating_Point_Expression.templates.hh +++ b/src/Sum_Floating_Point_Expression.templates.hh @@ -34,7 +34,7 @@ typename Sum_Floating_Point_Expression<FP_Interval_Type, FP_Format> ::linearize(const FP_Interval_Abstract_Store& store) const { FP_Linear_Form linearized_first_operand = first_operand->linearize(store); FP_Linear_Form linearized_second_operand = second_operand->linearize(store); - FP_Interval abs_error = FP_Interval_Type(-absolute_error); + FP_Interval_Type abs_error = FP_Interval_Type(-absolute_error); // FIXME: this may be incorrect for some policies. abs_error.join_assign(absolute_error); FP_Linear_Form result = linearized_first_operand + linearized_second_operand +

1 0

[GIT] ppl/ppl(floating_point): Added a test directory ( and a dummy test file).
by Enea Zaffanella 03 Sep '09

03 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 452881a1cd2c0186c5ce2e222b19c40830ee60a5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=452881a1cd2c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 3 15:36:22 2009 +0200 Added a test directory (and a dummy test file). --- configure.ac | 1 + tests/Floating_Point_Expression/Makefile.am | 84 ++++++++ .../floatingpointexpr1.cc | 199 ++++++++++++++++++++ tests/Makefile.am | 1 + 4 files changed, 285 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index ba08ec1..09f25ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1520,6 +1520,7 @@ AC_CONFIG_FILES(Makefile tests/Makefile tests/BD_Shape/Makefile tests/Box/Makefile + tests/Floating_Point_Expression/Makefile tests/Grid/Makefile tests/MIP_Problem/Makefile tests/Octagonal_Shape/Makefile diff --git a/tests/Floating_Point_Expression/Makefile.am b/tests/Floating_Point_Expression/Makefile.am new file mode 100644 index 0000000..3fb4233 --- /dev/null +++ b/tests/Floating_Point_Expression/Makefile.am @@ -0,0 +1,84 @@ +# Automake source file for the Parma Polyhedra Library. +# Copyright (C) 2001-2009 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/ . + +if VALGRIND_TESTS_ENABLED + +CHECKER = \ +$(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ +--num-callers=100 --leak-resolution=high \ +--suppressions=$(top_srcdir)/tests/valgrind_suppressions + +else !VALGRIND_TESTS_ENABLED + +CHECKER = + +endif !VALGRIND_TESTS_ENABLED + +TESTS_ENVIRONMENT = $(CHECKER) + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src \ +-I$(top_builddir)/src \ +-I$(top_srcdir)/utils \ +-I$(top_srcdir)/tests \ +@extra_includes@ \ +@debug_flag@ + +LDADD = \ +$(top_builddir)/utils/libppl_utils.a \ +$(top_builddir)/tests/libppl_tests.a \ +$(top_builddir)/src/libppl.la \ +@extra_libraries@ + +TESTS = \ +floatingpointexpr1 + +XFAIL_TESTS = + +BUGS = + +# +# Sources for the tests +# + +floatingpointexpr1_SOURCES = floatingpointexpr1.cc + +check_PROGRAMS = \ +$(TESTS) \ +$(WATCHDOG_TESTS) \ +$(BUGS) + +EXTRA_DIST = + +MOSTLYCLEANFILES = + +$(top_builddir)/utils/libppl_utils.a: + $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/utils libppl_utils.a + +$(top_builddir)/tests/libppl_tests.a: + $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/tests libppl_tests.a + +$(top_builddir)/src/libppl.la: + $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/src libppl.la + +$(top_builddir)/Watchdog/src/libpwl.la: + $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/Watchdog/src libpwl.la diff --git a/tests/Floating_Point_Expression/floatingpointexpr1.cc b/tests/Floating_Point_Expression/floatingpointexpr1.cc new file mode 100644 index 0000000..33395d1 --- /dev/null +++ b/tests/Floating_Point_Expression/floatingpointexpr1.cc @@ -0,0 +1,199 @@ +/* Testing Linear_Expression. + Copyright (C) 2001-2009 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" + +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; +} + +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; +} + +// Test operator+=(Linear_Form<db_r_oc>& f, Variable v): +// in this case the dimension of v is strictly greater than +// the dimension of f. +bool +test05() { + Variable A(0); + Variable B(1); + + Linear_Form<db_r_oc> f = A; + db_r_oc x(2.0); + x /= 3.0; + f *= x; + + Linear_Form<db_r_oc> known_result = f + B; + + f += B; + + bool ok = (f == known_result); + + nout << "*** known_result ***" << endl + << known_result << endl; + + return ok; +} + +bool +test06() { + 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; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); + DO_TEST(test04); + DO_TEST(test06); +END_MAIN diff --git a/tests/Makefile.am b/tests/Makefile.am index 40f075a..1124df0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,6 +22,7 @@ SUBDIRS = \ . \ +Floating_Point_Expression \ Powerset \ Partially_Reduced_Product \ Box \

1 0