Module: ppl/ppl Branch: master Commit: 8c3f8ae55af3cb8d3a328bf040803cdb9ac56255 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c3f8ae55af3c... Author: Patricia Hill <p.m.hill@leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed. --- src/BD_Shape.defs.hh | 4 ++-- src/Box.defs.hh | 4 ++-- src/Octagonal_Shape.defs.hh | 4 ++-- src/Polyhedron.defs.hh | 4 ++-- tests/Box/frequency1.cc | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 2b3100f..2375211 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -766,11 +766,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the bd_shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the bd_shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 8ed2680..55f5aab 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -697,11 +697,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the box that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the box that is closest to zero; \exception std::invalid_argument diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index 06bdc14..6f59b71 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -854,11 +854,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the octagonal shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the octagonal shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 8d8679c..52f6bb2 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -779,11 +779,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the polyhedron that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the polyhedron that is closest to zero; \exception std::invalid_argument diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc index 9b03553..b64be53 100644 --- a/tests/Box/frequency1.cc +++ b/tests/Box/frequency1.cc @@ -180,8 +180,8 @@ test08() { TBox box(3); box.add_constraint(A == 1); box.add_constraint(2*B == -1); - box.add_constraint(3*C == 2); - box.add_constraint(B <= 2); + box.add_constraint(2*C == 1); + box.add_constraint(B <= 4); Coefficient num; Coefficient den; @@ -189,7 +189,7 @@ test08() { Coefficient vald; bool ok = (box.frequency(Linear_Expression(A - B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 19 && vald == 6); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(box, "*** box ***"); nout << "valn " << valn << ", vald " << vald << endl;