Module: ppl/ppl Branch: master Commit: e8ea60a5e953796c5b04660e652467f0f6f09f0d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8ea60a5e9537... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Mon May 18 11:18:40 2009 +0200 New tests for Polyhedron::wrap_assign(). --- tests/Polyhedron/Makefile.am | 7 ++- tests/Polyhedron/wrap1.cc | 10 ++-- tests/Polyhedron/wrap2.cc | 98 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 7 deletions(-) diff --git a/tests/Polyhedron/Makefile.am b/tests/Polyhedron/Makefile.am index b4162e1..9a2acb0 100644 --- a/tests/Polyhedron/Makefile.am +++ b/tests/Polyhedron/Makefile.am @@ -132,7 +132,7 @@ topclosure1 \ unconstrain1 \ universe1 universe2 \ variablesset1 \ -wrap1 \ +wrap1 wrap2 \ writeconsys1 \ writegensys1 \ writepolyhedron1 writepolyhedron2 \ @@ -204,7 +204,7 @@ nnc_smm1 \ nnc_timeelapse1 \ nnc_unconstrain1 \ nnc_universe1 \ -nnc_wrap1 \ +nnc_wrap1 nnc_wrap2 \ nnc_writepolyhedron1 # @@ -406,6 +406,7 @@ universe2_SOURCES = universe2.cc variablesset1_SOURCES = variablesset1.cc wrap1_SOURCES = wrap1.cc +wrap2_SOURCES = wrap2.cc writeconsys1_SOURCES = writeconsys1.cc @@ -629,6 +630,8 @@ nnc_universe1_CXXFLAGS = $(DERIVED_CXXFLAGS) nnc_wrap1_SOURCES = wrap1.cc nnc_wrap1_CXXFLAGS = $(DERIVED_CXXFLAGS) +nnc_wrap2_SOURCES = wrap2.cc +nnc_wrap2_CXXFLAGS = $(DERIVED_CXXFLAGS) nnc_writepolyhedron1_SOURCES = writepolyhedron1.cc nnc_writepolyhedron1_CXXFLAGS = $(DERIVED_CXXFLAGS) diff --git a/tests/Polyhedron/wrap1.cc b/tests/Polyhedron/wrap1.cc index bc65191..e8077a7 100644 --- a/tests/Polyhedron/wrap1.cc +++ b/tests/Polyhedron/wrap1.cc @@ -572,8 +572,8 @@ test20() { Variable y(1); C_Polyhedron ph(2); - ph.add_constraint(x >= 255); - ph.add_constraint(x <= 257); + ph.add_constraint(2*x >= 1); + ph.add_constraint(3*x <= 2); ph.add_constraint(y >= 255); ph.add_constraint(y <= 257); @@ -587,8 +587,8 @@ test20() { ph.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS, &cs, 16, false); C_Polyhedron known_result(2); - known_result.add_constraint(x >= 0); - known_result.add_constraint(x <= 1); + known_result.add_constraint(2*x >= 0); + known_result.add_constraint(3*x <= 2); known_result.add_constraint(y >= 0); known_result.add_constraint(y <= 1); @@ -621,5 +621,5 @@ BEGIN_MAIN DO_TEST(test17); DO_TEST(test18); DO_TEST_F8(test19); - DO_TEST(test20); + DO_TEST_F8(test20); END_MAIN diff --git a/tests/Polyhedron/wrap2.cc b/tests/Polyhedron/wrap2.cc new file mode 100644 index 0000000..363c28f --- /dev/null +++ b/tests/Polyhedron/wrap2.cc @@ -0,0 +1,98 @@ +/* Test Polyhedron::wrap_assign(). + 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 { + +bool +test01() { + Variable x(0); + Variable y(1); + + C_Polyhedron ph(2); + ph.add_constraint(x >= 255); + ph.add_constraint(x <= 257); + ph.add_constraint(y >= 255); + ph.add_constraint(y <= 257); + + print_constraints(ph, "*** ph ***"); + + Variables_Set vars(x, y); + + Constraint_System cs; + cs.insert(x + y <= 100); + + ph.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS, &cs, 16, false); + + C_Polyhedron known_result(2); + known_result.add_constraint(x >= 0); + known_result.add_constraint(x <= 1); + known_result.add_constraint(y >= 0); + known_result.add_constraint(y <= 1); + + bool ok = (ph == known_result); + + print_constraints(ph, "*** ph.wrap_assign(...) ***"); + + return ok; +} + +bool +test02() { + Variable x(0); + Variable y(1); + + C_Polyhedron ph(2); + ph.add_constraint(x >= 255); + ph.add_constraint(x <= 257); + ph.add_constraint(y >= 255); + ph.add_constraint(y <= 257); + + print_constraints(ph, "*** ph ***"); + + Variables_Set vars(x, y); + + Constraint_System cs; + cs.insert(x + y <= 100); + + ph.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS, &cs, 16, true); + + C_Polyhedron known_result(2); + known_result.add_constraint(x >= 0); + known_result.add_constraint(y >= 0); + known_result.add_constraint(y <= 1); + known_result.add_constraint(x+y <= 100); + + bool ok = (ph == known_result); + + print_constraints(ph, "*** ph.wrap_assign(...) ***"); + + return ok; +} + +} // namespace + +BEGIN_MAIN + DO_TEST_F8(test01); + DO_TEST_F8(test02); +END_MAIN