Module: ppl/ppl Branch: compliance Commit: 00014551b6abf9de80d4ef436628c70c3bd74f7a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=00014551b6abf...
Author: Patrik Pomelli patrik.pomelli@bugseng.com Date: Mon Jun 16 09:02:53 2014 +0200
Readded newlines erased by mistake.
Signed-off-by: Roberto Bagnara roberto.bagnara@bugseng.com
---
src/MIP_Problem.cc | 1 + src/Polyhedron_nonpublic.cc | 2 ++ src/Polyhedron_public.cc | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 1313c9a..54ad205 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1666,6 +1666,7 @@ PPL::MIP_Problem::erase_artificials(const dimension_type begin_artificials, for (dimension_type i = tableau_n_rows; i-- > 0; ) { tableau[i].reset(new_last_column); } + // ... then properly set the element in the (new) last column, // encoding the kind of optimization; ... { diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index ad1b652..5a9812e 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1499,6 +1499,7 @@ PPL::Polyhedron::BHZ09_C_poly_hull_assign_if_exact(const Polyhedron& y) { ++num_x_gs_red_in_y; } } + Bit_Row y_gs_red_in_x; dimension_type num_y_gs_red_in_x = 0; for (dimension_type i = y_gs_num_rows; i-- > 0; ) { @@ -1554,6 +1555,7 @@ PPL::Polyhedron::BHZ09_C_poly_hull_assign_if_exact(const Polyhedron& y) { if (!y_gs_red_in_x[j]) add_generator(y_gs[j]); } + PPL_ASSERT_HEAVY(OK()); return true; } diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index f844f81..60d44f6 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -499,6 +499,7 @@ PPL::Polyhedron::is_bounded() const { if (gen_sys[i].is_line_or_ray()) return false; } + // The system of generators is composed only by // points and closure points: the polyhedron is bounded. return true; @@ -704,6 +705,7 @@ PPL::Polyhedron::constrains(const Variable var) const { if (gen_sys[i].is_line()) ++num_lines; } + if (num_lines == space_dim) return false; }