Module: ppl/ppl Branch: master Commit: 67572f7617f66e19237d74edd0bc4b64eab1f481 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=67572f7617f66...

Author: Abramo Bagnara abramo.bagnara@gmail.com Date: Tue Jul 14 00:09:12 2009 +0200

Fixed WEIGHT_ADD use.

---

src/conversion.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/conversion.cc b/src/conversion.cc index a2ce2ee..e122de9 100644 --- a/src/conversion.cc +++ b/src/conversion.cc @@ -406,7 +406,7 @@ PPL::Polyhedron::conversion(Linear_System& source, Scalar_Products::assign(scalar_prod[index_non_zero], source_k, dest[index_non_zero]); - WEIGHT_ADD(source_num_columns); + WEIGHT_ADD_MUL(1, source_num_columns); if (scalar_prod[index_non_zero] != 0) // The generator does not saturate the constraint. break; @@ -417,7 +417,7 @@ PPL::Polyhedron::conversion(Linear_System& source, } for (dimension_type i = index_non_zero + 1; i < dest_num_rows; ++i) { Scalar_Products::assign(scalar_prod[i], source_k, dest[i]); - WEIGHT_ADD(source_num_columns); + WEIGHT_ADD_MUL(1, source_num_columns); // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client // is thrown now. @@ -538,7 +538,7 @@ PPL::Polyhedron::conversion(Linear_System& source, dest_i.strong_normalize(); scalar_prod[i] = 0; // `dest' has already been set as non-sorted. - WEIGHT_ADD_MUL(4, dest_num_columns); + WEIGHT_ADD_MUL(1, dest_num_columns); } // Check if the client has requested abandoning all expensive // computations. If so, the exception specified by the client @@ -712,7 +712,7 @@ PPL::Polyhedron::conversion(Linear_System& source, break; } assert(bound >= num_lines_or_equalities); - WEIGHT_ADD(bound - num_lines_or_equalities); + WEIGHT_ADD_MUL(1, bound - num_lines_or_equalities); if (!redundant) { // Adding the new ray to `dest' and the corresponding // saturation row to `sat'. @@ -758,7 +758,7 @@ PPL::Polyhedron::conversion(Linear_System& source, scalar_prod[dest_num_rows] = Coefficient_zero(); // Increment the number of generators. ++dest_num_rows; - WEIGHT_ADD_MUL(4, dest_num_columns); + WEIGHT_ADD_MUL(1, dest_num_columns); } // if (!redundant) } }