Module: ppl/ppl Branch: floating_point Commit: 37c753c529b2b104fff0dc63ff83119ce1b52b9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37c753c529b2b...

Author: Roberto Amadini r.amadini@virgilio.it Date: Wed Sep 9 16:19:06 2009 +0200

Fixed bug in Linear_Form. Copied linearform1.cc in tests/Floating_Point_Expression and improved its tests.

---

src/Linear_Form.templates.hh | 1 - tests/Floating_Point_Expression/Makefile.am | 3 +- tests/Floating_Point_Expression/linearform1.cc | 251 ++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 2 deletions(-)

diff --git a/src/Linear_Form.templates.hh b/src/Linear_Form.templates.hh index e7c12f9..335207f 100644 --- a/src/Linear_Form.templates.hh +++ b/src/Linear_Form.templates.hh @@ -109,7 +109,6 @@ operator+(const Linear_Form<C>& f1, const Linear_Form<C>& f2) { r[i] = f1[i]; r[i] += f2[i]; } - return r; }

diff --git a/tests/Floating_Point_Expression/Makefile.am b/tests/Floating_Point_Expression/Makefile.am old mode 100644 new mode 100755 index 3fb4233..da6a023 --- a/tests/Floating_Point_Expression/Makefile.am +++ b/tests/Floating_Point_Expression/Makefile.am @@ -49,7 +49,7 @@ $(top_builddir)/tests/libppl_tests.a \ $(top_builddir)/src/libppl.la \ @extra_libraries@

-TESTS = \ +TESTS = linearform1 \ floatingpointexpr1

XFAIL_TESTS = @@ -60,6 +60,7 @@ BUGS = # Sources for the tests #

+linearform1_SOURCES = linearform1.cc floatingpointexpr1_SOURCES = floatingpointexpr1.cc

check_PROGRAMS = \ diff --git a/tests/Floating_Point_Expression/linearform1.cc b/tests/Floating_Point_Expression/linearform1.cc new file mode 100644 index 0000000..bee32ba --- /dev/null +++ b/tests/Floating_Point_Expression/linearform1.cc @@ -0,0 +1,251 @@ +/* Testing Linear_Expression. + Copyright (C) 2001-2009 Roberto Bagnara bagnara@cs.unipr.it + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#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> f; + Linear_Form<db_r_oc> f1 = A; + Linear_Form<db_r_oc> f2 = B; + + f1 += f.coefficient(A); + 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; +} + +// Tests operator==(const Linear_Form<C>& x, const Linear_Form<C>& y) +bool +test07() { + Variable A(0); + Variable B(1); + Variable C(2); + Linear_Form<db_r_oc> f1 = A; + Linear_Form<db_r_oc> f2; + bool known_result = false; + + bool result1 = (f1 == f2); + + f2 += db_r_oc(1.0); + bool result2 = (f1 == f2); + + bool result3 = (f2 == f1); + + f1 += db_r_oc(1.0); + bool result4 = (f2 == f1); + + nout << "*** known_result ***" << endl + << known_result << endl; + + return (known_result == (result1 || result2 || result3 || result4)); +} + + +// Tests overflows of space dimension. +// FIXME: works in progress! +bool +test08() { + Linear_Form<fl_r_oc> f; + Variable A(f.max_space_dimension()); + + bool ok1 = false; + try { + f = Linear_Form<fl_r_oc>(A); + } + catch(std::length_error e) { + nout << "Overflow in Linear_Form(const Variable v)." << endl; + ok1 = true; + } + + return ok1; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); + DO_TEST(test04); + DO_TEST(test05); + DO_TEST(test06); + DO_TEST(test07); + DO_TEST(test08); +END_MAIN