[PPL-devel] [GIT] ppl/ppl(floating_point): Modified test04 and test05.

[Roberto Amadini]

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

Author: Roberto Amadini <r.amadini at virgilio.it>
Date:   Mon Sep 28 15:07:52 2009 +0200

Modified test04 and test05.

---

 tests/Floating_Point_Expression/polyhedron2.cc |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/Floating_Point_Expression/polyhedron2.cc b/tests/Floating_Point_Expression/polyhedron2.cc
index fa75dad..2a285a2 100644
--- a/tests/Floating_Point_Expression/polyhedron2.cc
+++ b/tests/Floating_Point_Expression/polyhedron2.cc
@@ -133,11 +133,9 @@ test04() {
   ph.generalized_refine_with_linear_form_inequality(
     lk, -la, GREATER_OR_EQUAL, store);
   ph.generalized_refine_with_linear_form_inequality(
-    lk, lb, LESS_OR_EQUAL, store);
-  tmp = 3;
-  lk *= tmp;
-  tmp = 1;
-  lk += tmp;
+    lb, -lk, LESS_OR_EQUAL, store);
+  tmp = 0;
+  lk = FP_Linear_Form(tmp);
   ph.generalized_refine_with_linear_form_inequality(
     -lb, lk, LESS_THAN, store);
   print_constraints(ph, "*** ph ***");
@@ -157,7 +155,6 @@ test04() {
   nout << "A = " << store.get_interval(A) << endl;
   bool ok2 = tmp0.contains(store.get_interval(A));
 
-  //FIXME: Sound, but not much precise.
   nout << "B = " << store.get_interval(B) << endl;
   bool ok3 = tmp0.contains(store.get_interval(B));
 
@@ -189,11 +186,11 @@ test05() {
 
   NNC_Polyhedron ph(2);
   ph.generalized_refine_with_linear_form_inequality(
-    lb, la, GREATER_THAN, store);
+    lb, la, GREATER_OR_EQUAL, store);
   print_constraints(ph, "*** ph ***");
 
   NNC_Polyhedron known_result1(2);
-  known_result1.add_constraint(2*A <= 4*B + 1);
+  known_result1.add_constraint(2*A <= 4*B + 3);
   print_constraints(known_result1, "*** known_result1 ***");
 
   bool ok1 = ph.contains(known_result1);