- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Added is and as methods.
by Abramo Bagnara 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 743a6e470392137a963641956f7c273b84b04f05 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=743a6e470392… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Wed Jul 28 00:47:30 2010 +0200 Added is and as methods. --- src/Concrete_Expression.defs.hh | 18 ++++++++++++++++++ src/linearize.hh | 8 ++++---- tests/Concrete_Expression/C_Expr.defs.hh | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 88fbca8..3bafbbd 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -123,6 +123,24 @@ public: //! Returns the kind of \* this. Concrete_Expression_Kind kind() const; + + template <template <typename T> class Derived> + bool is() const { + return Concrete_Expression<Target>::kind() == Derived<Target>::KIND; + } + + template <template <typename T> class Derived> + Derived<Target>* as() { + PPL_ASSERT(is<Derived>()); + return static_cast<Derived<Target>*>(this); + } + + template <template <typename T> class Derived> + const Derived<Target>* as() const { + PPL_ASSERT(is<Derived>()); + return static_cast<const Derived<Target>*>(this); + } + }; template <typename Target> diff --git a/src/linearize.hh b/src/linearize.hh index ee8abc1..5fee0da 100644 --- a/src/linearize.hh +++ b/src/linearize.hh @@ -630,7 +630,7 @@ linearize(const Concrete_Expression<Target>& expr, case Floating_Point_Constant<Target>::KIND: { const Floating_Point_Constant<Target>* fpc_expr = - static_cast<const Floating_Point_Constant<Target>* >(&expr); + expr.template as<Floating_Point_Constant>(); result = FP_Linear_Form(FP_Interval_Type(fpc_expr->get_value_as_string())); return true; break; @@ -638,7 +638,7 @@ linearize(const Concrete_Expression<Target>& expr, case Unary_Operator<Target>::KIND: { const Unary_Operator<Target>* uop_expr = - static_cast<const Unary_Operator<Target>* >(&expr); + expr.template as<Unary_Operator>(); switch (uop_expr->unary_operator()) { case Unary_Operator<Target>::UPLUS: return linearize(*(uop_expr->argument()), int_store, lf_store, result); @@ -661,7 +661,7 @@ linearize(const Concrete_Expression<Target>& expr, case Binary_Operator<Target>::KIND: { const Binary_Operator<Target>* bop_expr = - static_cast<const Binary_Operator<Target>* >(&expr); + expr.template as<Binary_Operator>(); switch (bop_expr->binary_operator()) { case Binary_Operator<Target>::ADD: return add_linearize(*bop_expr, int_store, lf_store, result); @@ -692,7 +692,7 @@ linearize(const Concrete_Expression<Target>& expr, case Approximable_Reference<Target>::KIND: { const Approximable_Reference<Target>* ref_expr = - static_cast<const Approximable_Reference<Target>* >(&expr); + expr.template as<Approximable_Reference>(); /* Variable references are the only that we are currently able to analyze */ dimension_type variable_index = ref_expr->associated_dimension(); diff --git a/tests/Concrete_Expression/C_Expr.defs.hh b/tests/Concrete_Expression/C_Expr.defs.hh index 96bc1cd..0391a9c 100644 --- a/tests/Concrete_Expression/C_Expr.defs.hh +++ b/tests/Concrete_Expression/C_Expr.defs.hh @@ -49,6 +49,7 @@ public: //! Returns the kind of \* this. Concrete_Expression_Kind kind() const; + private: //! The expression's kind. C_Expr_Kind expr_kind;

1 0

[GIT] ppl/ppl(master): Added missing inclusion.
by Roberto Bagnara 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: master Commit: 6e11577095f565d2016f1b72656b31df64066a53 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6e11577095f5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Jul 27 21:39:45 2010 +0200 Added missing inclusion. --- src/termination.templates.hh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 8582e22..2a92f75 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,6 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Generator.defs.hh" #include "Constraint_System.defs.hh" #include "C_Polyhedron.defs.hh" +#include "NNC_Polyhedron.defs.hh" #include <stdexcept>

1 0

[GIT] ppl/ppl(floating_point): Added a few tests.
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 1957eb995c4d4f3fa283cfabbd73f0ac2a632e6e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1957eb995c4d… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 18:13:15 2010 +0200 Added a few tests. --- tests/Concrete_Expression/linearize.cc | 123 ++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/tests/Concrete_Expression/linearize.cc b/tests/Concrete_Expression/linearize.cc index d382749..3f1e172 100644 --- a/tests/Concrete_Expression/linearize.cc +++ b/tests/Concrete_Expression/linearize.cc @@ -83,10 +83,133 @@ test03() { return ok; } +// Tests linearization of A + B. +bool +test04() { + FP_Interval tmp(0); + FP_Interval_Abstract_Store store(2); + store.set_interval(Variable(0), tmp); + store.set_interval(Variable(1), tmp); + Approximable_Reference<C_Expr> var0(0); + Approximable_Reference<C_Expr> var1(1); + Binary_Operator<C_Expr> sum(Binary_Operator<C_Expr>::ADD, &var0, &var1); + FP_Linear_Form result; + linearize(sum, store, FP_Linear_Form_Abstract_Store(), result); + + Variable A(0); + Variable B(1); + FP_Linear_Form known_result = FP_Linear_Form(A); + FP_Linear_Form rel_err1; + known_result.relative_error(ANALYZED_FP_FORMAT, rel_err1); + known_result += rel_err1; + FP_Linear_Form lb = FP_Linear_Form(B); + known_result += lb; + FP_Linear_Form rel_err2; + lb.relative_error(ANALYZED_FP_FORMAT, rel_err2); + known_result += rel_err2; + known_result += compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT); + + bool ok = result == known_result; + + return ok; +} + +// Tests the linearization of A - B. +bool +test05() { + FP_Interval tmp(0); + FP_Interval_Abstract_Store store(2); + store.set_interval(Variable(0), tmp); + store.set_interval(Variable(1), tmp); + Approximable_Reference<C_Expr> var0(0); + Approximable_Reference<C_Expr> var1(1); + Binary_Operator<C_Expr> dif(Binary_Operator<C_Expr>::SUB, &var0, &var1); + FP_Linear_Form result; + linearize(dif, store, FP_Linear_Form_Abstract_Store(), result); + + Variable A(0); + Variable B(1); + FP_Linear_Form known_result = FP_Linear_Form(A); + FP_Linear_Form rel_err1; + known_result.relative_error(ANALYZED_FP_FORMAT, rel_err1); + known_result += rel_err1; + FP_Linear_Form lb = FP_Linear_Form(B); + lb.negate(); + known_result += lb; + FP_Linear_Form rel_err2; + lb.relative_error(ANALYZED_FP_FORMAT, rel_err2); + known_result += rel_err2; + known_result += compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT); + + bool ok = result == known_result; + + return ok; +} + +// Tests linearization of A * B where A in [0, 1] and B in [2, 2]. +bool +test06() { + FP_Interval tmp(0); + tmp.join_assign(1); + FP_Interval_Abstract_Store store(2); + store.set_interval(Variable(0), tmp); + store.set_interval(Variable(1), FP_Interval(2)); + Approximable_Reference<C_Expr> var0(0); + Approximable_Reference<C_Expr> var1(1); + Binary_Operator<C_Expr> mul(Binary_Operator<C_Expr>::MUL, &var0, &var1); + FP_Linear_Form result; + linearize(mul, store, FP_Linear_Form_Abstract_Store(), result); + + Variable A(0); + FP_Interval coeff = FP_Interval(2); + FP_Linear_Form known_result = FP_Linear_Form(A); + FP_Linear_Form rel_err; + known_result.relative_error(ANALYZED_FP_FORMAT, rel_err); + known_result *= coeff; + known_result += coeff * rel_err; + known_result += compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT); + + bool ok = (result == known_result); + + return ok; +} + +// Tests the linearization of A / B where A = [0, 1] and B = [2, 2]. +bool +test07() { + FP_Interval tmp(0); + tmp.join_assign(1); + FP_Interval_Abstract_Store store(2); + store.set_interval(Variable(0), tmp); + store.set_interval(Variable(1), FP_Interval(2)); + Approximable_Reference<C_Expr> var0(0); + Approximable_Reference<C_Expr> var1(1); + Binary_Operator<C_Expr> div(Binary_Operator<C_Expr>::DIV, &var0, &var1); + FP_Linear_Form result; + linearize(div, store, FP_Linear_Form_Abstract_Store(), result); + + Variable A(0); + FP_Interval coeff = FP_Interval(1 / 2.0); + FP_Linear_Form known_result = FP_Linear_Form(A); + FP_Linear_Form rel_err; + known_result.relative_error(ANALYZED_FP_FORMAT, rel_err); + known_result *= coeff; + known_result += rel_err * coeff; + known_result += compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT); + + bool ok = (result == known_result); + + return ok; +} + } // namespace BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); DO_TEST(test03); + DO_TEST(test04); + DO_TEST(test05); + DO_TEST(test06); + DO_TEST(test07); END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Fixed a typo.
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: ee0a91950dcdced4bc81b76daf294f4838c7c97a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee0a91950dcd… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 16:19:45 2010 +0200 Fixed a typo. --- src/Linear_Form.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index 97f915b..fcb57c7 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -418,7 +418,7 @@ Linear_Form<C>::relative_error( } C error_propagator; - // FIXME: this cast may be dangerous, + // FIXME: this cast may be dangerous. analyzer_format lb = -pow(f_base, -static_cast<analyzer_format>(f_mantissa_bits)); error_propagator.build(i_constraint(GREATER_OR_EQUAL, lb),

1 0

[GIT] ppl/ppl(floating_point): Added two FIXME notes.
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 5bdcb742713de7e2f0303d7a311b03393768560b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5bdcb742713d… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 16:18:55 2010 +0200 Added two FIXME notes. --- src/Float.templates.hh | 1 + src/Linear_Form.templates.hh | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/Float.templates.hh b/src/Float.templates.hh index e5bf852..a784723 100644 --- a/src/Float.templates.hh +++ b/src/Float.templates.hh @@ -109,6 +109,7 @@ const FP_Interval_Type& compute_absolute_error( PPL_ASSERT(to_compute != NULL); + // FIXME: the inner cast may be dangerous. analyzer_format omega = std::max( static_cast<analyzer_format>(pow(f_base, static_cast<analyzer_format>(1) - diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index e508759..97f915b 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -418,6 +418,7 @@ Linear_Form<C>::relative_error( } C error_propagator; + // FIXME: this cast may be dangerous, analyzer_format lb = -pow(f_base, -static_cast<analyzer_format>(f_mantissa_bits)); error_propagator.build(i_constraint(GREATER_OR_EQUAL, lb),

1 0

[GIT] ppl/ppl(floating_point): Added two simple tests.
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: c20b83014b3cfd30f4bbcce6882f62324083028f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c20b83014b3c… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 16:13:24 2010 +0200 Added two simple tests. --- tests/Concrete_Expression/linearize.cc | 43 ++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/tests/Concrete_Expression/linearize.cc b/tests/Concrete_Expression/linearize.cc index 14897c1..d382749 100644 --- a/tests/Concrete_Expression/linearize.cc +++ b/tests/Concrete_Expression/linearize.cc @@ -42,8 +42,51 @@ test01() { return false; } +// Tests multiplication by zero. +bool +test02() { + FP_Interval_Abstract_Store store(2); + store.set_interval(Variable(0), FP_Interval(0)); + store.set_interval(Variable(1), FP_Interval(10)); + Floating_Point_Constant<C_Expr> con("5.5", 4); + Approximable_Reference<C_Expr> var0(0); + Approximable_Reference<C_Expr> var1(1); + Binary_Operator<C_Expr> dif(Binary_Operator<C_Expr>::SUB, &var1, &con); + Binary_Operator<C_Expr> mul(Binary_Operator<C_Expr>::MUL, &dif, &var0); + FP_Linear_Form result; + linearize(mul, store, FP_Linear_Form_Abstract_Store(), result); + + FP_Linear_Form known_result(compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT)); + + nout << "*** known_result ***" << endl + << known_result << endl; + bool ok = (result == known_result); + + return ok; +} + +// Tests linearization of variables in a given linear form abstract store. +bool +test03() { + FP_Linear_Form_Abstract_Store store; + Variable A(0); + FP_Linear_Form known_result = FP_Linear_Form(A); + store[0] = known_result; + Approximable_Reference<C_Expr> var(0); + FP_Linear_Form result; + linearize(var, FP_Interval_Abstract_Store(0), store, result); + + nout << "*** known_result ***" << endl + << known_result << endl; + bool ok = (result == known_result); + + return ok; +} + } // namespace BEGIN_MAIN DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Fixed several mistakes in linearize and started
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: bd7beafc7d3db06788a182b90550ff1129923e63 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd7beafc7d3d… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 15:08:52 2010 +0200 Fixed several mistakes in linearize and started to test it. --- src/linearize.hh | 36 +++++++++++++------------- tests/Concrete_Expression/C_Expr.inlines.hh | 5 +++ tests/Concrete_Expression/linearize.cc | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/linearize.hh b/src/linearize.hh index 37143c0..ee8abc1 100644 --- a/src/linearize.hh +++ b/src/linearize.hh @@ -629,22 +629,22 @@ linearize(const Concrete_Expression<Target>& expr, break; case Floating_Point_Constant<Target>::KIND: { - Floating_Point_Constant<Target> fpc_expr = - static_cast<Floating_Point_Constant<Target> >(expr); - result = FP_Linear_Form(FP_Interval(fpc_expr.get_value_as_string())); + const Floating_Point_Constant<Target>* fpc_expr = + static_cast<const Floating_Point_Constant<Target>* >(&expr); + result = FP_Linear_Form(FP_Interval_Type(fpc_expr->get_value_as_string())); return true; break; } case Unary_Operator<Target>::KIND: { - Unary_Operator<Target> uop_expr = - static_cast<Unary_Operator<Target> >(expr); - switch (uop_expr.unary_operator()) { + const Unary_Operator<Target>* uop_expr = + static_cast<const Unary_Operator<Target>* >(&expr); + switch (uop_expr->unary_operator()) { case Unary_Operator<Target>::UPLUS: - return linearize(uop_expr.argument(), int_store, lf_store, result); + return linearize(*(uop_expr->argument()), int_store, lf_store, result); break; case Unary_Operator<Target>::UMINUS: - if (!linearize(uop_expr.argument(), int_store, lf_store, result)) + if (!linearize(*(uop_expr->argument()), int_store, lf_store, result)) return false; result.negate(); @@ -660,20 +660,20 @@ linearize(const Concrete_Expression<Target>& expr, } case Binary_Operator<Target>::KIND: { - Binary_Operator<Target> bop_expr = - static_cast<Binary_Operator<Target> >(expr); - switch (bop_expr.binary_operator()) { + const Binary_Operator<Target>* bop_expr = + static_cast<const Binary_Operator<Target>* >(&expr); + switch (bop_expr->binary_operator()) { case Binary_Operator<Target>::ADD: - return add_linearize(bop_expr, int_store, lf_store, result); + return add_linearize(*bop_expr, int_store, lf_store, result); break; case Binary_Operator<Target>::SUB: - return sub_linearize(bop_expr, int_store, lf_store, result); + return sub_linearize(*bop_expr, int_store, lf_store, result); break; case Binary_Operator<Target>::MUL: - return mul_linearize(bop_expr, int_store, lf_store, result); + return mul_linearize(*bop_expr, int_store, lf_store, result); break; case Binary_Operator<Target>::DIV: - return div_linearize(bop_expr, int_store, lf_store, result); + return div_linearize(*bop_expr, int_store, lf_store, result); break; case Binary_Operator<Target>::REM: case Binary_Operator<Target>::BAND: @@ -691,11 +691,11 @@ linearize(const Concrete_Expression<Target>& expr, } case Approximable_Reference<Target>::KIND: { - Approximable_Reference<Target> ref_expr = - static_cast<Approximable_Reference<Target> >(expr); + const Approximable_Reference<Target>* ref_expr = + static_cast<const Approximable_Reference<Target>* >(&expr); /* Variable references are the only that we are currently able to analyze */ - dimension_type variable_index = ref_expr.associated_dimension(); + dimension_type variable_index = ref_expr->associated_dimension(); if (variable_index == not_a_dimension()) return false; else { diff --git a/tests/Concrete_Expression/C_Expr.inlines.hh b/tests/Concrete_Expression/C_Expr.inlines.hh index 5bc06b5..5c34a55 100644 --- a/tests/Concrete_Expression/C_Expr.inlines.hh +++ b/tests/Concrete_Expression/C_Expr.inlines.hh @@ -31,6 +31,11 @@ Concrete_Expression(const C_Expr_Kind KIND) : expr_kind(KIND) { } +inline Concrete_Expression_Kind +Concrete_Expression<C_Expr>::kind() const { + return expr_kind; +} + inline Concrete_Expression_Type Concrete_Expression<C_Expr>::type() const { return Concrete_Expression_Type::floating_point(ANALYZED_FP_FORMAT); diff --git a/tests/Concrete_Expression/linearize.cc b/tests/Concrete_Expression/linearize.cc index f8ea4c1..14897c1 100644 --- a/tests/Concrete_Expression/linearize.cc +++ b/tests/Concrete_Expression/linearize.cc @@ -32,7 +32,7 @@ bool test01() { Floating_Point_Constant<C_Expr> num("3", 2); Floating_Point_Constant<C_Expr> den("0", 2); - Binary_Operator<C_Expr> div(Binary_Operator<C_Expr>::DIV, num, den); + Binary_Operator<C_Expr> div(Binary_Operator<C_Expr>::DIV, &num, &den); FP_Linear_Form result; if (!linearize(div, FP_Interval_Abstract_Store(), FP_Linear_Form_Abstract_Store(), result)) {

1 0

[GIT] ppl/ppl(floating_point): Fixed typos.
by Abramo Bagnara 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 873f2240682ccfdcd9daef5b8d7dc9899fb5dd32 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=873f2240682c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Jul 27 14:13:03 2010 +0200 Fixed typos. --- tests/Concrete_Expression/C_Expr.inlines.hh | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/Concrete_Expression/C_Expr.inlines.hh b/tests/Concrete_Expression/C_Expr.inlines.hh index 232d38c..5bc06b5 100644 --- a/tests/Concrete_Expression/C_Expr.inlines.hh +++ b/tests/Concrete_Expression/C_Expr.inlines.hh @@ -41,7 +41,7 @@ Binary_Operator<C_Expr> ::Binary_Operator(Concrete_Expression_BOP binary_operator, const Concrete_Expression<C_Expr>* left_hand_side, const Concrete_Expression<C_Expr>* right_hand_side) - : Concrete_Expressione<C_Expr>(BOP), + : Concrete_Expression<C_Expr>(BOP), bop(binary_operator), lhs(left_hand_side), rhs(right_hand_side) { @@ -75,7 +75,7 @@ inline Unary_Operator<C_Expr> ::Unary_Operator(Concrete_Expression_UOP unary_operator, const Concrete_Expression<C_Expr>* argument) - : Concrete_Expressione<C_Expr>(UOP), + : Concrete_Expression<C_Expr>(UOP), uop(unary_operator), arg(argument) { } @@ -103,7 +103,7 @@ inline Cast_Operator<C_Expr>:: Cast_Operator(Concrete_Expression_Type c_type, const Concrete_Expression<C_Expr>* ar) - : Concrete_Expressione<C_Expr>(CAST), + : Concrete_Expression<C_Expr>(CAST), cast_type(c_type), arg(ar) { } @@ -130,7 +130,7 @@ inline Floating_Point_Constant<C_Expr>:: Floating_Point_Constant(const char* value_string, const unsigned int string_size) - : Concrete_Expressione<C_Expr>(FP_CON), + : Concrete_Expression<C_Expr>(FP_CON), value(new char[string_size]) { strcpy(value, value_string); } @@ -153,7 +153,8 @@ Floating_Point_Constant<C_Expr>::get_value_as_string() const { inline Approximable_Reference<C_Expr>:: Approximable_Reference(dimension_type var_index) -: var_dimension(var_index) { + : Concrete_Expression<C_Expr>(APPROX_REF), + var_dimension(var_index) { } inline

1 0

[GIT] ppl/ppl(floating_point): Improved inheritance relations.
by Abramo Bagnara 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 90eaae7fe8a19eccdd7bac2763131a20ecaf616f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=90eaae7fe8a1… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Jul 27 14:07:38 2010 +0200 Improved inheritance relations. --- src/Concrete_Expression.defs.hh | 14 ++++---- tests/Concrete_Expression/C_Expr.defs.hh | 40 +++++++++---------------- tests/Concrete_Expression/C_Expr.inlines.hh | 42 +++++--------------------- 3 files changed, 29 insertions(+), 67 deletions(-) diff --git a/src/Concrete_Expression.defs.hh b/src/Concrete_Expression.defs.hh index 217e239..88fbca8 100644 --- a/src/Concrete_Expression.defs.hh +++ b/src/Concrete_Expression.defs.hh @@ -116,7 +116,7 @@ private: }; template <typename Target> -class Concrete_Expression_Base { +class Concrete_Expression_Common { public: //! Returns the type of \* this. Concrete_Expression_Type type() const; @@ -126,7 +126,7 @@ public: }; template <typename Target> -class Binary_Operator_Base : public Concrete_Expression<Target> { +class Binary_Operator_Common { public: //! Returns a constant identifying the operator of \p *this. Concrete_Expression_BOP binary_operator() const; @@ -139,7 +139,7 @@ public: }; template <typename Target> -class Unary_Operator_Base : public Concrete_Expression<Target> { +class Unary_Operator_Common { public: //! Returns a constant identifying the operator of \p *this. Concrete_Expression_UOP unary_operator() const; @@ -149,17 +149,17 @@ public: }; template <typename Target> -class Cast_Operator_Base : public Concrete_Expression<Target> { +class Cast_Operator_Common { //! Returns the casted expression. const Concrete_Expression<Target>* argument() const; }; template <typename Target> -class Integer_Constant_Base : public Concrete_Expression<Target> { +class Integer_Constant_Common { }; template <typename Target> -class Floating_Point_Constant_Base : public Concrete_Expression<Target> { +class Floating_Point_Constant_Common { /*! \brief Returns a string for the floating point constant as written in the analyzed program. @@ -168,7 +168,7 @@ class Floating_Point_Constant_Base : public Concrete_Expression<Target> { }; template <typename Target> -class Approximable_Reference_Base : public Concrete_Expression<Target> { +class Approximable_Reference_Common { public: /*! \brief If \p *this is a variable reference, returns the variable's diff --git a/tests/Concrete_Expression/C_Expr.defs.hh b/tests/Concrete_Expression/C_Expr.defs.hh index 1e2336e..96bc1cd 100644 --- a/tests/Concrete_Expression/C_Expr.defs.hh +++ b/tests/Concrete_Expression/C_Expr.defs.hh @@ -39,7 +39,7 @@ enum C_Expr_Kind { }; template <> -class Concrete_Expression<C_Expr> : public Concrete_Expression_Base<C_Expr> { +class Concrete_Expression<C_Expr> : public Concrete_Expression_Common<C_Expr> { public: //! Builds a concrete expression of the given kind. Concrete_Expression<C_Expr>(C_Expr_Kind KIND); @@ -48,14 +48,15 @@ public: Concrete_Expression_Type type() const; //! Returns the kind of \* this. - virtual Concrete_Expression_Kind kind() const = 0; + Concrete_Expression_Kind kind() const; private: //! The expression's kind. C_Expr_Kind expr_kind; }; template <> -class Binary_Operator<C_Expr> : public Binary_Operator_Base<C_Expr> { +class Binary_Operator<C_Expr> : public Concrete_Expression<C_Expr>, + public Binary_Operator_Common<C_Expr> { public: //! Constructor from operator, lhs and rhs. Binary_Operator<C_Expr>(Concrete_Expression_BOP binary_operator, @@ -68,9 +69,6 @@ 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 binary operator of \p *this. Concrete_Expression_BOP binary_operator() const; @@ -111,7 +109,8 @@ private: }; template <> -class Unary_Operator<C_Expr> : public Unary_Operator_Base<C_Expr> { +class Unary_Operator<C_Expr> : public Concrete_Expression<C_Expr>, + public Unary_Operator_Common<C_Expr> { public: //! Constructor from operator and argument. Unary_Operator<C_Expr>(Concrete_Expression_UOP unary_operator, @@ -123,9 +122,6 @@ 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 unary operator of \p *this. Concrete_Expression_UOP unary_operator() const; @@ -154,7 +150,8 @@ private: template <> class Cast_Operator<C_Expr> - : public Cast_Operator_Base<C_Expr> { + : public Concrete_Expression<C_Expr>, + public Cast_Operator_Common<C_Expr> { public: //! Constructor from cast type and argument. Cast_Operator<C_Expr>(Concrete_Expression_Type c_type, @@ -166,9 +163,6 @@ 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 casted expression. const Concrete_Expression<C_Expr>* argument() const; @@ -185,7 +179,8 @@ private: template <> class Integer_Constant<C_Expr> - : public Integer_Constant_Base<C_Expr> { + : public Concrete_Expression<C_Expr>, + public Integer_Constant_Common<C_Expr> { public: //! Do-nothing destructor. ~Integer_Constant<C_Expr>(); @@ -193,16 +188,14 @@ public: //! Returns the type of \p *this. Concrete_Expression_Type type() const; - //! Returns the kind of \p *this. - Concrete_Expression_Kind kind() const; - //! Constant identifying integer constant nodes. enum { KIND = INT_CON }; }; template <> class Floating_Point_Constant<C_Expr> - : public Floating_Point_Constant_Base<C_Expr> { + : public Concrete_Expression<C_Expr>, + public Floating_Point_Constant_Common<C_Expr> { public: //! Constructor from value. Floating_Point_Constant<C_Expr>(const char* value_string, @@ -214,9 +207,6 @@ public: //! Returns the type of \p *this. Concrete_Expression_Type type() const; - //! Returns the kind of \p *this. - Concrete_Expression_Kind kind() const; - /*! \brief Returns a string for the floating point constant as written in the analyzed program. @@ -234,7 +224,8 @@ private: // We currently only consider references to floating point variables. template <> class Approximable_Reference<C_Expr> - : public Approximable_Reference_Base<C_Expr> { + : public Concrete_Expression<C_Expr>, + public Approximable_Reference_Common<C_Expr> { public: //! Builds a reference to the variable having the given index. Approximable_Reference<C_Expr>(dimension_type var_index); @@ -245,9 +236,6 @@ public: //! Returns the type of \p *this. Concrete_Expression_Type type() const; - //! Returns the kind of \p *this. - Concrete_Expression_Kind kind() const; - /*! \brief If \p *this is a variable reference, returns the variable's index. Returns <CODE>not_a_dimension()</CODE> otherwise. diff --git a/tests/Concrete_Expression/C_Expr.inlines.hh b/tests/Concrete_Expression/C_Expr.inlines.hh index 819de51..232d38c 100644 --- a/tests/Concrete_Expression/C_Expr.inlines.hh +++ b/tests/Concrete_Expression/C_Expr.inlines.hh @@ -41,7 +41,8 @@ Binary_Operator<C_Expr> ::Binary_Operator(Concrete_Expression_BOP binary_operator, const Concrete_Expression<C_Expr>* left_hand_side, const Concrete_Expression<C_Expr>* right_hand_side) - : bop(binary_operator), + : Concrete_Expressione<C_Expr>(BOP), + bop(binary_operator), lhs(left_hand_side), rhs(right_hand_side) { } @@ -55,11 +56,6 @@ Binary_Operator<C_Expr>::type() const { return Concrete_Expression_Type::floating_point(ANALYZED_FP_FORMAT); } -inline Concrete_Expression_Kind -Binary_Operator<C_Expr>::kind() const { - return KIND; -} - inline Concrete_Expression_BOP Binary_Operator<C_Expr>::binary_operator() const { return bop; @@ -79,7 +75,8 @@ inline Unary_Operator<C_Expr> ::Unary_Operator(Concrete_Expression_UOP unary_operator, const Concrete_Expression<C_Expr>* argument) - : uop(unary_operator), + : Concrete_Expressione<C_Expr>(UOP), + uop(unary_operator), arg(argument) { } @@ -92,11 +89,6 @@ Unary_Operator<C_Expr>::type() const { return Concrete_Expression_Type::floating_point(ANALYZED_FP_FORMAT); } -inline Concrete_Expression_Kind -Unary_Operator<C_Expr>::kind() const { - return KIND; -} - inline Concrete_Expression_BOP Unary_Operator<C_Expr>::unary_operator() const { return uop; @@ -111,7 +103,8 @@ inline Cast_Operator<C_Expr>:: Cast_Operator(Concrete_Expression_Type c_type, const Concrete_Expression<C_Expr>* ar) - : cast_type(c_type), + : Concrete_Expressione<C_Expr>(CAST), + cast_type(c_type), arg(ar) { } @@ -124,11 +117,6 @@ Cast_Operator<C_Expr>::type() const { return cast_type; } -inline Concrete_Expression_Kind -Cast_Operator<C_Expr>::kind() const { - return KIND; -} - inline const Concrete_Expression<C_Expr>* Cast_Operator<C_Expr>::argument() const { return arg; @@ -138,16 +126,12 @@ inline Integer_Constant<C_Expr>::~Integer_Constant<C_Expr>() { } -inline Concrete_Expression_Kind -Integer_Constant<C_Expr>::kind() const { - return KIND; -} - inline Floating_Point_Constant<C_Expr>:: Floating_Point_Constant(const char* value_string, const unsigned int string_size) - : value(new char[string_size]) { + : Concrete_Expressione<C_Expr>(FP_CON), + value(new char[string_size]) { strcpy(value, value_string); } @@ -161,11 +145,6 @@ Floating_Point_Constant<C_Expr>::type() const { return Concrete_Expression_Type::floating_point(ANALYZED_FP_FORMAT); } -inline Concrete_Expression_Kind -Floating_Point_Constant<C_Expr>::kind() const { - return KIND; -} - inline const char* Floating_Point_Constant<C_Expr>::get_value_as_string() const { return value; @@ -186,11 +165,6 @@ Approximable_Reference<C_Expr>::type() const { return Concrete_Expression_Type::floating_point(ANALYZED_FP_FORMAT); } -inline Concrete_Expression_Kind -Approximable_Reference<C_Expr>::kind() const { - return KIND; -} - inline dimension_type Approximable_Reference<C_Expr>::associated_dimension() const { return var_dimension;

1 0

[GIT] ppl/ppl(floating_point): Added test file for the new linearization algorithm.
by Fabio Bossi 27 Jul '10

27 Jul '10

Module: ppl/ppl Branch: floating_point Commit: 0701ca66ee0a9d2b462bfe8174d8e4d2cf98ed0f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0701ca66ee0a… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Tue Jul 27 13:59:48 2010 +0200 Added test file for the new linearization algorithm. --- tests/Concrete_Expression/Makefile.am | 5 ++- tests/Concrete_Expression/float.cc | 4 +- tests/Concrete_Expression/linearize.cc | 49 ++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/tests/Concrete_Expression/Makefile.am b/tests/Concrete_Expression/Makefile.am index 9c105e0..ead3d19 100644 --- a/tests/Concrete_Expression/Makefile.am +++ b/tests/Concrete_Expression/Makefile.am @@ -53,7 +53,8 @@ $(top_builddir)/src/libppl.la \ ORIGINAL_TESTS = \ C_Expr \ float \ -linearform1 +linearform1 \ +linearize #bdshape1 \ #bdshape2 \ #digitalfilters1 \ @@ -145,6 +146,8 @@ floatingpointexpr1_SOURCES = floatingpointexpr1.cc linearform1_SOURCES = linearform1.cc +linearize_SOURCES = linearize.cc + octagonalshape1_SOURCES = octagonalshape1.cc octagonalshape2_SOURCES = octagonalshape2.cc diff --git a/tests/Concrete_Expression/float.cc b/tests/Concrete_Expression/float.cc index 28f8d78..7506993 100644 --- a/tests/Concrete_Expression/float.cc +++ b/tests/Concrete_Expression/float.cc @@ -28,10 +28,10 @@ using namespace Parma_Polyhedra_Library::IO_Operators; bool test01() { - std::cout << compute_absolute_error<FP_Interval>(IEEE754_HALF) << + std::cout << compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT) << std::endl; - std::cout << compute_absolute_error<FP_Interval>(IEEE754_HALF) << + std::cout << compute_absolute_error<FP_Interval>(ANALYZED_FP_FORMAT) << std::endl; return 1; diff --git a/tests/Concrete_Expression/linearize.cc b/tests/Concrete_Expression/linearize.cc new file mode 100644 index 0000000..f8ea4c1 --- /dev/null +++ b/tests/Concrete_Expression/linearize.cc @@ -0,0 +1,49 @@ +/* Testing linearization algorithm ad its related 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 moDif_FP_Expressiony 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" + +namespace { + +using namespace Parma_Polyhedra_Library::IO_Operators; + +// Tests division by zero. +bool +test01() { + Floating_Point_Constant<C_Expr> num("3", 2); + Floating_Point_Constant<C_Expr> den("0", 2); + Binary_Operator<C_Expr> div(Binary_Operator<C_Expr>::DIV, num, den); + FP_Linear_Form result; + if (!linearize(div, FP_Interval_Abstract_Store(), + FP_Linear_Form_Abstract_Store(), result)) { + nout << "*** Linearization failed due to division by zero. ***" << endl; + return true; + } + return false; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); +END_MAIN

1 0