[PPL-devel] [GIT] ppl/ppl(floating_point): Fixed test05.

[Fabio Bossi]

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

Author: Fabio Bossi <bossi at cs.unipr.it>
Date:   Mon Sep 28 15:24:11 2009 +0200

Fixed test05.

---

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

diff --git a/tests/Floating_Point_Expression/polyhedron2.cc b/tests/Floating_Point_Expression/polyhedron2.cc
index 2a285a2..b6298ea 100644
--- a/tests/Floating_Point_Expression/polyhedron2.cc
+++ b/tests/Floating_Point_Expression/polyhedron2.cc
@@ -187,28 +187,29 @@ test05() {
   NNC_Polyhedron ph(2);
   ph.generalized_refine_with_linear_form_inequality(
     lb, la, GREATER_OR_EQUAL, store);
+  ph.generalized_refine_with_linear_form_inequality(
+  FP_Linear_Form(A), FP_Linear_Form(FP_Interval(-1)), GREATER_OR_EQUAL, store);
+  ph.generalized_refine_with_linear_form_inequality(
+  FP_Linear_Form(A), FP_Linear_Form(FP_Interval(1)), LESS_OR_EQUAL, store);
+  ph.generalized_refine_with_linear_form_inequality(
+  FP_Linear_Form(B), FP_Linear_Form(FP_Interval(-1)), GREATER_OR_EQUAL, store);
+  ph.generalized_refine_with_linear_form_inequality(
+  FP_Linear_Form(B), FP_Linear_Form(FP_Interval(1)), LESS_OR_EQUAL, store);
   print_constraints(ph, "*** ph ***");
 
   NNC_Polyhedron known_result1(2);
   known_result1.add_constraint(2*A <= 4*B + 3);
+  known_result1.add_constraint(A >= -1);
+  known_result1.add_constraint(A <= 1);
+  known_result1.add_constraint(B >= -1);
+  known_result1.add_constraint(B <= 1);
   print_constraints(known_result1, "*** known_result1 ***");
 
   bool ok1 = ph.contains(known_result1);
 
-  ph.refine_fp_interval_abstract_store(store);
-  nout << "*** FP_Interval_Abstract_Store ***" << endl;
-
-  nout << "A = " << store.get_interval(A) << endl;
-  bool ok2 = tmp0.contains(store.get_interval(A));
-
-  nout << "B = " << store.get_interval(B) << endl;
-  bool ok3 = tmp0.contains(store.get_interval(B));
-
-  return ok1 && ok2 && ok3;
+  return ok1;
 }
 
-
-
 } // namespace
 
 BEGIN_MAIN