Module: ppl/ppl Branch: compliance Commit: 8d637a0f6e96e49524dd665b2cde2ad1dddce12d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d637a0f6e96e...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sat Jun 14 06:02:43 2014 +0200

Removed trailing whitespace.

---

src/BD_Shape.cc | 2 +- src/Bit_Row.cc | 2 +- src/Congruence.cc | 10 +++++----- src/Constraint.cc | 2 +- src/Generator_System.cc | 3 +-- src/Grid_Generator.cc | 2 +- src/Init.cc | 2 +- src/Octagonal_Shape.cc | 5 ++--- src/Polyhedron_nonpublic.cc | 6 +++--- src/Polyhedron_public.cc | 12 ++++++------ tests/Concrete_Expression/digitalfilters1.cc | 6 +++--- tests/Polyhedron/linearsystem1.cc | 2 +- 12 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/BD_Shape.cc b/src/BD_Shape.cc index 8b591db..13cf2e6 100644 --- a/src/BD_Shape.cc +++ b/src/BD_Shape.cc @@ -71,7 +71,7 @@ PPL::BD_Shape_Helpers::extract_bounded_difference(const Constraint& c, return false;

c_coeff = c1; - + return true; }

diff --git a/src/Bit_Row.cc b/src/Bit_Row.cc index 6954599..821c5cb 100644 --- a/src/Bit_Row.cc +++ b/src/Bit_Row.cc @@ -127,7 +127,7 @@ PPL::Bit_Row::prev(unsigned long position) const {

while (true) { if (limb != 0) - return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + return static_cast<unsigned long>(li) * PPL_BITS_PER_GMP_LIMB + Implementation::last_one(limb); if (li == 0) break; diff --git a/src/Congruence.cc b/src/Congruence.cc index 2d55993..40fef8a 100644 --- a/src/Congruence.cc +++ b/src/Congruence.cc @@ -79,13 +79,13 @@ PPL::Congruence::normalize() { void PPL::Congruence::strong_normalize() { normalize(); - + Coefficient gcd = expr.gcd(0, expr.space_dimension() + 1); if (gcd == 0) gcd = modulus_; else gcd_assign(gcd, modulus_, gcd); - + if (gcd != 0 && gcd != 1) { expr /= gcd; modulus_ /= gcd; @@ -98,7 +98,7 @@ PPL::Congruence::scale(Coefficient_traits::const_reference factor) { if (factor == 1) // Nothing to do. return; - + expr *= factor; modulus_ *= factor; } @@ -195,7 +195,7 @@ bool PPL::Congruence::is_tautological() const { if (is_equality()) return (inhomogeneous_term() == 0) && expr.all_homogeneous_terms_are_zero(); - + return (inhomogeneous_term() % modulus() == 0) && expr.all_homogeneous_terms_are_zero(); }

@@ -203,7 +203,7 @@ bool PPL::Congruence::is_inconsistent() const { if (is_equality()) return (inhomogeneous_term() != 0) && expr.all_homogeneous_terms_are_zero(); - + return (inhomogeneous_term() % modulus() != 0) && expr.all_homogeneous_terms_are_zero(); }

diff --git a/src/Constraint.cc b/src/Constraint.cc index 7d72c5f..dfcf303 100644 --- a/src/Constraint.cc +++ b/src/Constraint.cc @@ -288,7 +288,7 @@ PPL::Constraint::ascii_dump(std::ostream& s) const { expr.ascii_dump(s);

s << " "; - + switch (type()) { case Constraint::EQUALITY: s << "="; diff --git a/src/Generator_System.cc b/src/Generator_System.cc index 926396d..f14afff 100644 --- a/src/Generator_System.cc +++ b/src/Generator_System.cc @@ -761,7 +761,7 @@ PPL::Generator_System::remove_invalid_lines_and_rays() { // NOTE: the following swaps will mix generators without even trying // to preserve sortedness: as a matter of fact, it will almost always // be the case that the input generator system is NOT sorted. - + // Note that num_rows() is *not* constant, because it is decreased by // remove_row(). for (dimension_type i = 0; i < num_rows(); ) { @@ -811,4 +811,3 @@ PPL::IO_Operators::operator<<(std::ostream& s, const Generator_System& gs) { s << ", "; } } - diff --git a/src/Grid_Generator.cc b/src/Grid_Generator.cc index d66dedd..102ea57 100644 --- a/src/Grid_Generator.cc +++ b/src/Grid_Generator.cc @@ -149,7 +149,7 @@ PPL::Grid_Generator::swap_space_dimensions(Variable v1, Variable v2) { bool PPL::Grid_Generator::remove_space_dimensions(const Variables_Set& vars) { PPL_ASSERT(vars.space_dimension() <= space_dimension()); - + expr.remove_space_dimensions(vars);

PPL_ASSERT(OK()); diff --git a/src/Init.cc b/src/Init.cc index 470b3e3..d22b778 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -131,7 +131,7 @@ ppl_test_rounding() {

} // namespace

-#endif // PPL_CAN_CONTROL_FPU +#endif // PPL_CAN_CONTROL_FPU // && defined(PPL_ARM_CAN_CONTROL_FPU) && PPL_ARM_CAN_CONTROL_FPU

PPL::Init::Init() { diff --git a/src/Octagonal_Shape.cc b/src/Octagonal_Shape.cc index 4ebabbf..c84c04e 100644 --- a/src/Octagonal_Shape.cc +++ b/src/Octagonal_Shape.cc @@ -90,7 +90,7 @@ PPL::Octagonal_Shape_Helper if (c0 != c1 && c0 != -c1) // Constraint `c' is not an octagonal difference. return false; - + c_first_var *= 2; c_second_var *= 2; if (sgn(c0) < 0) @@ -98,7 +98,6 @@ PPL::Octagonal_Shape_Helper if (sgn(c1) > 0) ++c_second_var; c_coeff = c0; - + return true; } - diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index 7d18799..ad1b652 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1211,7 +1211,7 @@ PPL::Polyhedron::strongly_minimize_constraints() const { // `cs[i]' is not a strict inequality: consider next constraint. ++i; } - + PPL_ASSERT(cs.num_pending_rows() == 0);

if (changed) { @@ -1288,7 +1288,7 @@ PPL::Polyhedron::strongly_minimize_generators() const { if (con_sys[i].is_strict_inequality()) sat_all_but_strict_ineq.set(i); } - + // Will record whether or not we changed the generator system. bool changed = false;

@@ -1968,7 +1968,7 @@ PPL::Polyhedron::BFT00_poly_hull_assign_if_exact(const Polyhedron& y) { ++num_y_gs_red_in_x; } } - + // Step 2: if no redundant generator has been identified, // then the union is not convex. CHECKME: why? if (num_x_gs_red_in_y == 0 && num_y_gs_red_in_x == 0) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index c60c281..f844f81 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -392,7 +392,7 @@ PPL::Polyhedron::is_universe() const { break; } } - + if (has_pending_generators()) { // The non-pending part of `gen_sys' was minimized: // a success-first test is possible in this case. @@ -574,7 +574,7 @@ PPL::Polyhedron::contains_integer_point() const { if (gen_sys[i].is_point() && gen_sys[i].divisor() == 1) return true; } - + const Constraint_System& cs = constraints(); #if 0 // TEMPORARILY DISABLED. MIP_Problem mip(space_dim, @@ -721,7 +721,7 @@ PPL::Polyhedron::constrains(const Variable var) const { if (sign != 0) { if (gen_sys_i.expression().all_zeroes(1, var_id) && gen_sys_i.expression().all_zeroes(var_id + 1, space_dim + 1)) { - + if (gen_sys_i.is_line()) return true; if (sign > 0) @@ -2076,7 +2076,7 @@ PPL::Polyhedron::simplify_using_context_assign(const Polyhedron& y) { ++num_redundant_by_y; } } - + Constraint_System result_cs;

if (num_redundant_by_y < x_cs_num_rows) { @@ -3095,7 +3095,7 @@ PPL::Polyhedron::generalized_affine_image(const Linear_Expression& lhs, i = lhs.begin(), i_end = lhs.end(); i != i_end; ++i) { new_lines.insert(line(i.variable())); } - + const dimension_type num_common_dims = std::min(lhs.space_dimension(), rhs.space_dimension()); if (lhs.have_a_common_variable(rhs, Variable(0), Variable(num_common_dims))) { @@ -3230,7 +3230,7 @@ PPL::Polyhedron::generalized_affine_preimage(const Linear_Expression& lhs, i = lhs.begin(), i_end = lhs.end(); i != i_end; ++i) { new_lines.insert(line(i.variable())); } - + const dimension_type num_common_dims = std::min(lhs.space_dimension(), rhs.space_dimension()); if (lhs.have_a_common_variable(rhs, Variable(0), Variable(num_common_dims))) { diff --git a/tests/Concrete_Expression/digitalfilters1.cc b/tests/Concrete_Expression/digitalfilters1.cc index 1b6de3c..3a6a82e 100644 --- a/tests/Concrete_Expression/digitalfilters1.cc +++ b/tests/Concrete_Expression/digitalfilters1.cc @@ -545,7 +545,7 @@ test05() { tmp.lower() = 0; tmp.upper() = 16; oracle.int_store.affine_form_image(D, FP_Linear_Form(tmp)); - bd.affine_form_image(D, FP_Linear_Form(tmp)); + bd.affine_form_image(D, FP_Linear_Form(tmp)); oracle.int_store.intersection_assign(FP_Interval_Abstract_Store(bd));

// S = Y; @@ -754,7 +754,7 @@ test06() { tmp.lower() = 0; tmp.upper() = 16; oracle.int_store.affine_form_image(D, FP_Linear_Form(tmp)); - oc.affine_form_image(D, FP_Linear_Form(tmp)); + oc.affine_form_image(D, FP_Linear_Form(tmp)); oracle.int_store.intersection_assign(FP_Interval_Abstract_Store(oc));

// S = Y; @@ -963,7 +963,7 @@ test07() { tmp.lower() = 0; tmp.upper() = 16; oracle.int_store.affine_form_image(D, FP_Linear_Form(tmp)); - ph.affine_form_image(D, FP_Linear_Form(tmp)); + ph.affine_form_image(D, FP_Linear_Form(tmp)); oracle.int_store.intersection_assign(FP_Interval_Abstract_Store(ph));

// S = Y; diff --git a/tests/Polyhedron/linearsystem1.cc b/tests/Polyhedron/linearsystem1.cc index 5177756..3bf9b65 100644 --- a/tests/Polyhedron/linearsystem1.cc +++ b/tests/Polyhedron/linearsystem1.cc @@ -67,7 +67,7 @@ test01() { // such a coefficient. // To avoid the problem, we simply increment the coefficient. ++c; - + if (col == 0) e += c; else