September 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(floating_point): Finished to test Polyhedron::affine_image.
by Roberto Amadini 25 Sep '09

25 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 2463769f8877878fcfef823e76f4469354c760b7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2463769f8877… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Fri Sep 25 10:58:46 2009 +0200 Finished to test Polyhedron::affine_image. --- tests/Floating_Point_Expression/polyhedron1.cc | 116 +++++++++--------------- 1 files changed, 45 insertions(+), 71 deletions(-) diff --git a/tests/Floating_Point_Expression/polyhedron1.cc b/tests/Floating_Point_Expression/polyhedron1.cc index b44cbd1..e98fbc9 100644 --- a/tests/Floating_Point_Expression/polyhedron1.cc +++ b/tests/Floating_Point_Expression/polyhedron1.cc @@ -178,42 +178,28 @@ test05() { return ok; } -/* -bool -test06() { - Variable A(0); - Variable B(1); - - C_Polyhedron ph1(2, EMPTY); - - print_constraints(ph1, "*** ph1 ***"); - - ph1.affine_image(A, 2*A + B + 1); - - C_Polyhedron known_result(2, EMPTY); - - bool ok = (ph1 == known_result); - - print_constraints(ph1, "*** after ph1.affine_image(A, 2*A + B + 1) ***"); - - return ok; -} +// tests ph.affine_image(A, (-A - 1) / (-1), store) bool -test07() { +test06() { Variable A(0); Variable B(1); - + FP_Interval_Abstract_Store store(2); + FP_Interval tmp(-1); + store.set_interval(A, tmp); + store.set_interval(B, tmp); + FP_Linear_Form l(-A); + l += tmp; + l /= tmp; Generator_System gs; gs.insert(point()); gs.insert(point(A)); gs.insert(point(B)); gs.insert(point(A + B)); C_Polyhedron ph(gs); - - print_generators(ph, "*** ph ***"); - - ph.affine_image(A, -A - 1, -1); + ph.affine_image(A, l, store); + print_constraints(ph, + "*** ph.affine_image(A, (-A - 1) / (-1), store) ***"); Generator_System known_gs; known_gs.insert(point(A)); @@ -224,71 +210,59 @@ test07() { bool ok = (ph == known_result); - print_generators(ph, "*** after ph.affine_image(A, -A - 1, -1) ***"); + print_constraints(ph, "*** known_result ***"); return ok; } +// tests affine_image on NNC_Polyhedron. bool -test08() { +test07() { Variable A(0); Variable B(1); + FP_Interval_Abstract_Store store(2); + FP_Interval tmp(2); + store.set_interval(A, tmp); + store.set_interval(B, tmp); + FP_Linear_Form l(A); - C_Polyhedron ph(2); - ph.generators(); - ph.add_constraint(A >= 0); - ph.add_constraint(B >= 0); - C_Polyhedron copy_ph(ph); - - print_constraints(ph, "*** ph ***"); - - ph.affine_image(A, A + 1); - copy_ph.affine_image(A, -A - 1, -1); + NNC_Polyhedron p1(2); + p1.add_constraint(B == 0); + p1.add_constraint(-A > 0); - bool ok = (ph == copy_ph); + NNC_Polyhedron p2(2); + p2.add_constraint(B == 0); + p2.add_constraint(A >= 0); - print_generators(ph, "*** after ph.affine_image(A, A + 1) ***"); - print_generators(copy_ph, - "*** after copy_ph.affine_image(A, -A - 1, -1) ***"); + p1.affine_image(B, l, store); + print_constraints(p1, "*** p1.affine_image(B, A) ***"); + NNC_Polyhedron known_result1(2); + known_result1.add_constraint(A - B == 0); + known_result1.add_constraint(A < 0); + print_constraints(p1, "*** known_result1 ***"); + bool ok1 = (p1 == known_result1); - return ok; + l += tmp; + p2.affine_image(B, l, store); + print_constraints(p2, "*** p2.affine_image(B, A + 2) ***"); + NNC_Polyhedron known_result2(2); + known_result2.add_constraint(A - B == -2); + known_result2.add_constraint(A >= 0); + print_constraints(p2, "*** known_result2 ***"); + bool ok2 = (p2 == known_result2); + + return ok1 && ok2; } -bool -test09() { - Variable A(0); - Variable B(1); - - C_Polyhedron ph(2); - ph.generators(); - ph.add_constraint(A >= 0); - ph.add_constraint(B >= 0); - C_Polyhedron copy_ph(ph); - - print_constraints(ph, "*** ph ***"); - - ph.affine_image(B, A + 1); - copy_ph.affine_image(B, -A - 1, -1); - - bool ok = (ph == copy_ph); - - print_generators(ph, "*** after ph.affine_image(B, A + 1) ***"); - print_generators(copy_ph, - "*** after copy_ph.affine_image(B, -A - 1, -1) ***"); - - return ok; -} -*/ } // namespace +//FIXME: unreached lines 533, 542. BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); DO_TEST(test03); DO_TEST(test04); - DO_TEST(test05); /* + DO_TEST(test05); DO_TEST(test06); DO_TEST(test07); - DO_TEST(test08); - DO_TEST(test09); */ END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Fixed test04: do not perform floating point operations outside of the interval
by Fabio Bossi 25 Sep '09

25 Sep '09

Module: ppl/ppl Branch: floating_point Commit: c62926896a8b92ba2532a371169eb396cd804dc1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c62926896a8b… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Fri Sep 25 10:28:33 2009 +0200 Fixed test04: do not perform floating point operations outside of the interval domain unless the result can be exactly represented. --- tests/Floating_Point_Expression/polyhedron1.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/Floating_Point_Expression/polyhedron1.cc b/tests/Floating_Point_Expression/polyhedron1.cc index 98a111d..b44cbd1 100644 --- a/tests/Floating_Point_Expression/polyhedron1.cc +++ b/tests/Floating_Point_Expression/polyhedron1.cc @@ -122,7 +122,8 @@ test04() { Variable A(0); Variable B(1); FP_Interval_Abstract_Store store(2); - FP_Interval tmp(-1 / 3.0); + FP_Interval tmp(-1); + tmp /= FP_Interval(3); store.set_interval(A, tmp); store.set_interval(B, tmp); C_Polyhedron ph(2, EMPTY);

1 0

[GIT] ppl/ppl(floating_point): Added a couple of simple tests.
by Fabio Bossi 25 Sep '09

25 Sep '09

Module: ppl/ppl Branch: floating_point Commit: cb5178462d70a091d46358f2c49ff8987c6fc843 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb5178462d70… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Fri Sep 25 09:47:14 2009 +0200 Added a couple of simple tests. Makefile fixed. --- tests/Floating_Point_Expression/Makefile.am | 13 ++++--- tests/Floating_Point_Expression/polyhedron2.cc | 40 +++++++++++++++++++++-- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/tests/Floating_Point_Expression/Makefile.am b/tests/Floating_Point_Expression/Makefile.am index 6698b36..b165040 100644 --- a/tests/Floating_Point_Expression/Makefile.am +++ b/tests/Floating_Point_Expression/Makefile.am @@ -51,12 +51,13 @@ $(top_builddir)/src/libppl.la \ @extra_libraries@ ORIGINAL_TESTS = \ -polyhedron1 -#bdshape1 \ -#floatingpointexpr1 \ -#linearform1 \ -#octagonalshape1 \ -#octagonalshape2 +bdshape1 \ +floatingpointexpr1 \ +linearform1 \ +octagonalshape1 \ +octagonalshape2 \ +polyhedron1 \ +polyhedron2 DERIVED_TESTS = diff --git a/tests/Floating_Point_Expression/polyhedron2.cc b/tests/Floating_Point_Expression/polyhedron2.cc index 7ab1b68..3b57c57 100644 --- a/tests/Floating_Point_Expression/polyhedron2.cc +++ b/tests/Floating_Point_Expression/polyhedron2.cc @@ -51,15 +51,46 @@ test01() { bool test02() { - C_Polyhedron pol(1); + C_Polyhedron result(1); FP_Interval_Abstract_Store store(1); store.set_interval(Variable(0), FP_Interval(1.5)); FP_Interval interval(57); FP_Linear_Form lf1(Variable(0)); FP_Linear_Form lf2(interval); - pol.refine_with_linear_form_inequality(lf1, lf2, store); - print_constraints(pol, "RESULT"); - return true; + result.refine_with_linear_form_inequality(lf1, lf2, store); + print_constraints(result, "RESULT"); + C_Polyhedron known_result(1); + known_result.refine_with_constraint(Variable(0) <= 57); + print_constraints(known_result, "KNOWN RESULT"); + return result == known_result; +} + +bool +test03() { + Variable A(0); + Variable B(1); + FP_Interval_Abstract_Store store(2); + store.set_interval(A, FP_Interval(1)); + store.set_interval(B, FP_Interval(2)); + + C_Polyhedron result(2); + result.refine_with_linear_form_inequality(-FP_Linear_Form(A), + FP_Linear_Form(FP_Interval(0)), store); + result.refine_with_linear_form_inequality(FP_Linear_Form(A), + FP_Linear_Form(FP_Interval(2)), store); + result.refine_with_linear_form_inequality(-FP_Linear_Form(A), + FP_Linear_Form(FP_Interval(1)), store); + result.refine_with_linear_form_inequality(-FP_Linear_Form(B), + FP_Linear_Form(FP_Interval(-1)), store); + print_constraints(result, "RESULT"); + + C_Polyhedron known_result(2); + known_result.add_constraint(A >= 0); + known_result.add_constraint(A <= 2); + known_result.add_constraint(B >= 1); + print_constraints(known_result, "KNOWN RESULT"); + + return result == known_result; } } // namespace @@ -67,4 +98,5 @@ test02() { BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); + DO_TEST(test03); END_MAIN

1 0

[GIT] ppl/ppl(pip): New commits
by Roberto Bagnara 24 Sep '09

24 Sep '09

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ef984d10243c… Merge: 8ca4f6890910a146f573d7a45d135aa6a07b6ece 513d2127e55faa6f5e7d29938b7315203a712df2 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 20:49:48 2009 +0200 Merge branch 'master' into pip URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=513d2127e55f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 16:34:32 2009 +0200 Fixed operator>>(std::istream&, Interval<Boundary, Info>&). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ccd16569a7d2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 16:32:31 2009 +0200 Spurious print statement removed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e61defee29d0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 16:23:44 2009 +0200 New constructor explicit Interval::Interval(const char* s). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e677160d160… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Sep 18 20:24:35 2009 +0200 Make sure the latest changes to NDEBUG effective. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba44339f4373… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 17 16:12:17 2009 +0200 Fixed several rounding modes in Octagonal_Shape methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=255dd5501e74… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Sep 17 15:49:53 2009 +0200 Fixed and simplified DIRTY_TEMP for use with -fno-elide-constructors. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb4d41cada4e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Sep 14 21:21:25 2009 +0200 Added missing comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=04affbe1f914… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Sep 11 22:28:09 2009 +0200 Do not include <stdint.h>. The header files <stdint.h> and/or <inttypes.h> are included by ppl-config.h. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2e103e539bb6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Sep 11 22:27:40 2009 +0200 Make sure uintptr_t is defined, if at all possible. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6a1b3b278146… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Sep 10 15:24:16 2009 +0200 Suggest using -fno-elide-constructors when configuring for coverage. 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.

1 0

[GIT] ppl/ppl(pip): Correctly deal with pipproblem1.
by Roberto Bagnara 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: pip Commit: 8ca4f6890910a146f573d7a45d135aa6a07b6ece URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ca4f6890910… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 20:48:16 2009 +0200 Correctly deal with pipproblem1. --- tests/PIP_Problem/.gitignore | 1 + tests/PIP_Problem/Makefile.am | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/PIP_Problem/.gitignore b/tests/PIP_Problem/.gitignore new file mode 100644 index 0000000..b331d16 --- /dev/null +++ b/tests/PIP_Problem/.gitignore @@ -0,0 +1 @@ +pipproblem1 diff --git a/tests/PIP_Problem/Makefile.am b/tests/PIP_Problem/Makefile.am index 3ebe480..da24a57 100644 --- a/tests/PIP_Problem/Makefile.am +++ b/tests/PIP_Problem/Makefile.am @@ -50,7 +50,7 @@ $(top_builddir)/src/libppl.la \ @extra_libraries@ TESTS = \ -pipproblem +pipproblem1 XFAIL_TESTS = @@ -60,16 +60,16 @@ BUGS = # Sources for the tests # -pipproblem_SOURCES = pipproblem.cc +pipproblem1_SOURCES = pipproblem1.cc check_PROGRAMS = \ $(TESTS) \ $(WATCHDOG_TESTS) \ $(BUGS) -#EXTRA_DIST = +#EXTRA_DIST = -#MOSTLYCLEANFILES = +#MOSTLYCLEANFILES = $(top_builddir)/utils/libppl_utils.a: $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/utils libppl_utils.a

1 0

[GIT] ppl/ppl(pip): Renamed to follow the PPL convention on test file naming.
by Roberto Bagnara 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: pip Commit: 218d5ae8dfc21595dabfb8a0b7841b70a9a618fd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=218d5ae8dfc2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 20:46:42 2009 +0200 Renamed to follow the PPL convention on test file naming. --- .../PIP_Problem/{pipproblem.cc => pipproblem1.cc} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem.cc b/tests/PIP_Problem/pipproblem1.cc similarity index 100% rename from tests/PIP_Problem/pipproblem.cc rename to tests/PIP_Problem/pipproblem1.cc

1 0

[GIT] ppl/ppl(pip): Added test02().
by Roberto Bagnara 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: pip Commit: 8d8dbbaf6e3c2d03ce17d4a247008cd0ef427176 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d8dbbaf6e3c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Sep 24 20:46:04 2009 +0200 Added test02(). --- tests/PIP_Problem/pipproblem.cc | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem.cc b/tests/PIP_Problem/pipproblem.cc index 6050cd0..5d0f563 100644 --- a/tests/PIP_Problem/pipproblem.cc +++ b/tests/PIP_Problem/pipproblem.cc @@ -91,8 +91,35 @@ test01() { return ok; } +bool +test02() { + Variable i(0); + Variable j(1); + Variable n(2); + Variable m(3); + Variables_Set params(n, m); + + Constraint_System cs; + cs.insert(3*j >= -2*i+8); + cs.insert(j <= 4*i - 4); + cs.insert(j <= m); + cs.insert(j >= 0); + cs.insert(i <= n); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + display_solution(solution, Variables_Set(i, j)); + } + + return ok; +} + } // namespace BEGIN_MAIN DO_TEST(test01); + DO_TEST(test02); END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Fixed test05.
by Fabio Bossi 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 3add81ea30924ceebad5099a5e6bc81e15ea5d57 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3add81ea3092… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Thu Sep 24 18:20:28 2009 +0200 Fixed test05. Added a new test file. --- tests/Floating_Point_Expression/polyhedron1.cc | 8 +-- tests/Floating_Point_Expression/polyhedron2.cc | 70 ++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/tests/Floating_Point_Expression/polyhedron1.cc b/tests/Floating_Point_Expression/polyhedron1.cc index 4ab4144..98a111d 100644 --- a/tests/Floating_Point_Expression/polyhedron1.cc +++ b/tests/Floating_Point_Expression/polyhedron1.cc @@ -149,8 +149,7 @@ test05() { Variable A(0); Variable B(1); FP_Interval_Abstract_Store store(2); - FP_Interval tmp(-2.5); //FIXME: Perturbation of inhomogeneous term in order - tmp.join_assign(6.5); //to handle rounding errors. + FP_Interval tmp(2); store.set_interval(A, tmp); store.set_interval(B, tmp); C_Polyhedron ph(2); @@ -161,15 +160,12 @@ test05() { FP_Linear_Form l(A); l += tmp; l -= B; - tmp = -1 / 3.0; - l *= tmp; + l /= FP_Interval(-3); ph.affine_image(B, l, store); print_constraints(ph, "*** ph.affine_image(B, (A - B + 2) / (-3), store) ***"); - ph.affine_image(B, l, store); - C_Polyhedron known_result(2, EMPTY); known_result.add_generator(point(2*A)); known_result.add_generator(point(2*A - B)); diff --git a/tests/Floating_Point_Expression/polyhedron2.cc b/tests/Floating_Point_Expression/polyhedron2.cc new file mode 100644 index 0000000..7ab1b68 --- /dev/null +++ b/tests/Floating_Point_Expression/polyhedron2.cc @@ -0,0 +1,70 @@ +/* Test Polyhedron::refine_fp_interval_abstract_store and + Polyhedron::refine_with_linear_form_inequality. + 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 { + +bool +test01() { + C_Polyhedron pol(1); + FP_Interval_Abstract_Store store(1); + store.set_interval(Variable(0), FP_Interval(0)); + try { + FP_Linear_Form l1(Variable(3)); + FP_Linear_Form l2; + pol.refine_with_linear_form_inequality(l1, l2, store); + } + catch (std::invalid_argument) { + try { + FP_Linear_Form l1; + FP_Linear_Form l2(Variable(3)); + pol.refine_with_linear_form_inequality(l1, l2, store); + } + catch (std::invalid_argument) { + return true; + } + } + + return false; +} + +bool +test02() { + C_Polyhedron pol(1); + FP_Interval_Abstract_Store store(1); + store.set_interval(Variable(0), FP_Interval(1.5)); + FP_Interval interval(57); + FP_Linear_Form lf1(Variable(0)); + FP_Linear_Form lf2(interval); + pol.refine_with_linear_form_inequality(lf1, lf2, store); + print_constraints(pol, "RESULT"); + return true; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); +END_MAIN

1 0

[GIT] ppl/ppl(floating_point): Added two tests.
by Roberto Amadini 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 03bfe62f2d733680f0151d2ba6a2aba297e3b7e6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=03bfe62f2d73… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Thu Sep 24 17:26:01 2009 +0200 Added two tests. --- tests/Floating_Point_Expression/polyhedron1.cc | 34 +++++++++++++++-------- 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tests/Floating_Point_Expression/polyhedron1.cc b/tests/Floating_Point_Expression/polyhedron1.cc index 601c82b..4ab4144 100644 --- a/tests/Floating_Point_Expression/polyhedron1.cc +++ b/tests/Floating_Point_Expression/polyhedron1.cc @@ -117,7 +117,6 @@ test03() { } // tests ph.affine_image(A, (B + 2) / (-3), store) -// FIXME: not passes at the moment. bool test04() { Variable A(0); @@ -139,39 +138,50 @@ test04() { known_result.add_generator(point(-2*A, 3)); print_constraints(known_result, "*** known_result ***"); - bool ok = (ph == known_result); + bool ok = (ph.contains(known_result)); return ok; } -/* + +// tests ph.affine_image(B, (A - B + 2) / (-3), store) bool test05() { Variable A(0); Variable B(1); - + FP_Interval_Abstract_Store store(2); + FP_Interval tmp(-2.5); //FIXME: Perturbation of inhomogeneous term in order + tmp.join_assign(6.5); //to handle rounding errors. + store.set_interval(A, tmp); + store.set_interval(B, tmp); C_Polyhedron ph(2); ph.add_constraint(A >= 2); ph.add_constraint(A <= 3); ph.add_constraint(B >= 1); ph.add_constraint(2*A >= B); + FP_Linear_Form l(A); + l += tmp; + l -= B; + tmp = -1 / 3.0; + l *= tmp; - print_constraints(ph, "*** ph ***"); + ph.affine_image(B, l, store); + print_constraints(ph, + "*** ph.affine_image(B, (A - B + 2) / (-3), store) ***"); - ph.affine_image(B, A-B+2, -3); + ph.affine_image(B, l, store); C_Polyhedron known_result(2, EMPTY); known_result.add_generator(point(2*A)); known_result.add_generator(point(2*A - B)); known_result.add_generator(point(9*A + B, 3)); known_result.add_generator(point(9*A - 4*B, 3)); + print_constraints(known_result, "*** known_result ***"); - bool ok = (ph == known_result); - - print_generators(ph, "*** ph after ph.affine_image(B, A-B+2, -3) ***"); + bool ok = (ph.contains(known_result)); return ok; } - +/* bool test06() { Variable A(0); @@ -277,9 +287,9 @@ test09() { BEGIN_MAIN DO_TEST(test01); DO_TEST(test02); - DO_TEST(test03); /* + DO_TEST(test03); DO_TEST(test04); - DO_TEST(test05); + DO_TEST(test05); /* DO_TEST(test06); DO_TEST(test07); DO_TEST(test08);

1 0

[GIT] ppl/ppl(floating_point): Removed two unused parameters;
by Fabio Biselli 24 Sep '09

24 Sep '09

Module: ppl/ppl Branch: floating_point Commit: 85cc7688520ab32b8a03b38ae4a0fc1472be678b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=85cc7688520a… Author: Fabio Biselli <fabio.biselli(a)studenti.unipr.it> Date: Thu Sep 24 18:57:05 2009 +0200 Removed two unused parameters; Fixed two function calls. --- src/BD_Shape.defs.hh | 6 ++---- src/BD_Shape.templates.hh | 27 +++++++++++++-------------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index c8f6e23..4845844 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -2129,8 +2129,7 @@ private: the general case: \f$l \equal ax + c\f$ */ template <typename Interval_Info> - void left_inhomogeneous_refine(const dimension_type& left_t, - const dimension_type& right_t, + void left_inhomogeneous_refine(const dimension_type& right_t, const dimension_type& right_w_id, const Linear_Form< Interval<T, Interval_Info> >& left, const Linear_Form< Interval<T, Interval_Info> >& right); @@ -2140,8 +2139,7 @@ private: the general case: \f$ax +b \equal cy + d\f$ */ template <typename Interval_Info> - void left_one_var_refine(const dimension_type& left_t, - const dimension_type& left_w_id, + void left_one_var_refine(const dimension_type& left_w_id, const dimension_type& right_t, const dimension_type& right_w_id, const Linear_Form< Interval<T, Interval_Info> >& left, diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index da90151..22bf44e 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -4334,12 +4334,12 @@ void BD_Shape<T>::refine_with_linear_form_inequality( // shorten it at the expense of a bit of efficiency. if (left_t == 0) { - left_inhomogeneous_refine(left_t, right_t, right_w_id, left, right); + left_inhomogeneous_refine(right_t, right_w_id, left, right); PPL_ASSERT(OK()); return; } else if(left_t == 1){ - left_one_var_refine(left_t, left_w_id, right_t, right_w_id, left, right); + left_one_var_refine(left_w_id, right_t, right_w_id, left, right); PPL_ASSERT(OK()); return; } @@ -4352,8 +4352,7 @@ void BD_Shape<T>::refine_with_linear_form_inequality( template <typename T> template <typename Interval_Info> void -BD_Shape<T>::left_inhomogeneous_refine(const dimension_type& left_t, - const dimension_type& right_t, +BD_Shape<T>::left_inhomogeneous_refine(const dimension_type& right_t, const dimension_type& right_w_id, const Linear_Form< Interval<T, Interval_Info> >& left, const Linear_Form< Interval<T, Interval_Info> >& right) { @@ -4399,12 +4398,11 @@ template <typename T> template <typename Interval_Info> void BD_Shape<T> -::left_one_var_refine(const dimension_type& left_t, - const dimension_type& left_w_id, +::left_one_var_refine(const dimension_type& left_w_id, const dimension_type& right_t, const dimension_type& right_w_id, - const Linear_Form< Interval<T, Interval_Info> >& left, - const Linear_Form< Interval<T, Interval_Info> >& right) { + const Linear_Form< Interval<T, Interval_Info> >& left, + const Linear_Form< Interval<T, Interval_Info> >& right) { typedef Interval<T, Interval_Info> FP_Interval_Type; @@ -4523,8 +4521,8 @@ void BD_Shape<T> ::left_two_var_refine(const dimension_type& left_w_id, const dimension_type& right_w_id, - const Linear_Form< Interval<T, Interval_Info> >& left, - const Linear_Form< Interval<T, Interval_Info> >& right) { + const Linear_Form< Interval<T, Interval_Info> >& left, + const Linear_Form< Interval<T, Interval_Info> >& right) { typedef Interval<T, Interval_Info> FP_Interval_Type; @@ -4588,11 +4586,12 @@ BD_Shape<T> Variable second(second_v); dimension_type n_first_var = first_v +1 ; dimension_type n_second_var = second_v + 1; + const dimension_type space_dim = space_dimension(); linear_form_upper_bound(right_minus_left - first + second, - upper_bound); + upper_bound, space_dim); add_dbm_constraint(n_first_var, n_second_var, upper_bound); linear_form_upper_bound(right_minus_left + first - second, - upper_bound); + upper_bound, space_dim); add_dbm_constraint(n_second_var, n_first_var, upper_bound); } } @@ -4635,8 +4634,8 @@ template <typename Interval_Info> void BD_Shape<T>:: linear_form_upper_bound(const Linear_Form< Interval<T, Interval_Info> >& lf, - N& result, - const dimension_type& space_dim) const { + N& result, + const dimension_type& space_dim) const { // Check that T is a floating point type. PPL_COMPILE_TIME_CHECK(!std::numeric_limits<T>::is_exact,

1 0