February 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Merge branch 'master' into pip
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: a5d400f674a9d725c93d01e19a91276fd459e386 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a5d400f674a9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 18:50:11 2011 +0100 Merge branch 'master' into pip ---

1 0

[GIT] ppl/ppl(pip): For readability, separate the input operation from input stream status check.
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: 29201d2a5893bbe17744777de36e9a106ed8ea95 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=29201d2a5893… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 18:48:11 2011 +0100 For readability, separate the input operation from input stream status check. --- demos/ppl_pips/ppl_pips.cc | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index faec685..51cdbac 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -437,19 +437,25 @@ protected: if (!expect(in, '[')) return false; std::string s; - if (getline(in, s, ']').bad()) + getline(in, s, ']'); + if (in.fail()) return false; std::istringstream iss(s); PPL::dimension_type start_index = row_index * row_size; PPL::dimension_type k = start_index; - for (PPL::dimension_type i = 0; i < cst_col; ++i) - if (!(iss >> tab[k++])) + for (PPL::dimension_type i = 0; i < cst_col; ++i, ++k) { + iss >> tab[k]; + if (iss.fail()) return false; - if (!(iss >> tab[start_index + row_size - 1])) + } + iss >> tab[start_index + row_size - 1]; + if (iss.fail()) return false; - for (PPL::dimension_type i = cst_col + 1; i < row_size; ++i) - if (!(iss >> tab[k++])) + for (PPL::dimension_type i = cst_col + 1; i < row_size; ++i, ++k) { + iss >> tab[k]; + if (iss.fail()) return false; + } return true; }

1 0

[GIT] ppl/ppl(pip): Corrected expected results.
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: bb08fb49f561adff12634ec0468d0138f0913533 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb08fb49f561… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 18:46:41 2011 +0100 Corrected expected results. --- demos/ppl_pips/expected_int16 | 16 ++++++++-------- demos/ppl_pips/expected_int16_a | 16 ++++++++-------- demos/ppl_pips/expected_int32 | 20 ++++++++++---------- demos/ppl_pips/expected_int32_a | 20 ++++++++++---------- demos/ppl_pips/expected_int64 | 22 +++++++++++----------- demos/ppl_pips/expected_int64_a | 22 +++++++++++----------- demos/ppl_pips/expected_int8 | 8 ++++---- demos/ppl_pips/expected_int8_a | 8 ++++---- demos/ppl_pips/expected_mpz | 8 ++++---- demos/ppl_pips/expected_mpz_a | 8 ++++---- 10 files changed, 74 insertions(+), 74 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=bb08fb49…

1 0

[GIT] ppl/ppl(pip): Fixed stream state on checked input.
by Abramo Bagnara 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: d0f6bd037c90676130e9547e5ed909cf6ba8eee9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d0f6bd037c90… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 10 16:47:22 2011 +0100 Fixed stream state on checked input. --- src/checked.cc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 34c84c2..e428109 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -337,6 +337,11 @@ input_mpq(mpq_class& to, std::istream& is) { number_struct num_struct; number_struct den_struct; Result r = parse_number(is, num_struct, den_struct); + if (r == V_CVT_STR_UNK) { + is.setstate(is.failbit); + return r; + } + is.clear(is.rdstate() & ~is.failbit); if (r != V_EQ) return r; if (den_struct.base && den_struct.mantissa.empty())

1 0

[GIT] ppl/ppl(master): Fixed stream state on checked input.
by Abramo Bagnara 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: master Commit: d0f6bd037c90676130e9547e5ed909cf6ba8eee9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d0f6bd037c90… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 10 16:47:22 2011 +0100 Fixed stream state on checked input. --- src/checked.cc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 34c84c2..e428109 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -337,6 +337,11 @@ input_mpq(mpq_class& to, std::istream& is) { number_struct num_struct; number_struct den_struct; Result r = parse_number(is, num_struct, den_struct); + if (r == V_CVT_STR_UNK) { + is.setstate(is.failbit); + return r; + } + is.clear(is.rdstate() & ~is.failbit); if (r != V_EQ) return r; if (den_struct.base && den_struct.mantissa.empty())

1 0

[GIT] ppl/ppl(pip): Merge branch 'master' into pip
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: b86cb60dbf7774131f5739879beff3015decbce5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b86cb60dbf77… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 10:49:20 2011 +0100 Merge branch 'master' into pip ---

1 0

[GIT] ppl/ppl(pip): Fixed function ppl_Pointset_Powerset_*_get_disjunct in OCaml interface.
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: c23ded5ce0023a753fdd5da2dbbd99d1a084566c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c23ded5ce002… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 5 21:01:13 2011 +0100 Fixed function ppl_Pointset_Powerset_*_get_disjunct in OCaml interface. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index fe0f213..4a829e7 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -984,9 +984,10 @@ ppl_@CLASS@_get_disjunct(value caml_it) try { CAMLparam1(caml_it); CAMLlocal1(caml_return_value); @CPP_CLASS@::iterator& cpp_it = *p_@CLASS@_iterator_val(caml_it); - @DISJUNCT_TOPOLOGY@@A_DISJUNCT@ disjunct = cpp_it->pointset(); + const @DISJUNCT_TOPOLOGY@@A_DISJUNCT@& disjunct = cpp_it->pointset(); caml_return_value = unregistered_value_p_@DISJUNCT@(disjunct); - actual_p_@DISJUNCT@_val(caml_return_value) = mark(&disjunct); + actual_p_@DISJUNCT@_val(caml_return_value) + = const_cast<@DISJUNCT_TOPOLOGY@@A_DISJUNCT@*>(mark(&disjunct)); CAMLreturn(caml_return_value); } CATCH_ALL

1 0

[GIT] ppl/ppl(pip): Polyhedron: fix an invalid reference bug in generalized_affine_image().
by Marco Poletti 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: bf1edca5e0ddb03674a35218dccce6bc421469e2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf1edca5e0dd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 16:09:47 2011 +0100 Polyhedron: fix an invalid reference bug in generalized_affine_image(). --- src/Polyhedron_public.cc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index 6a5105e..0e2f010 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -2927,15 +2927,14 @@ generalized_affine_image(const Variable var, const dimension_type eps_index = space_dim + 1; for (dimension_type i = gen_sys.num_rows(); i-- > 0; ) if (gen_sys[i].is_point()) { - Generator& g = gen_sys[i]; - // Add a `var'-displaced copy of `g' to the generator system. - gen_sys.add_row(g); + // Add a `var'-displaced copy of `gen_sys[i]' to the generator system. + gen_sys.add_row(gen_sys[i]); if (relsym == GREATER_THAN) ++gen_sys[gen_sys.num_rows()-1][var_space_dim]; else --gen_sys[gen_sys.num_rows()-1][var_space_dim]; - // Transform `g' into a closure point. - g[eps_index] = 0; + // Transform `gen_sys[i]' into a closure point. + gen_sys[i][eps_index] = 0; } clear_constraints_up_to_date(); clear_generators_minimized();

1 0

[GIT] ppl/ppl(pip): Grid: avoid using an invalid reference in the constructor from a Box.
by Marco Poletti 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: a01fecf4cde756aaefe88b8f309f9bdf3e07b670 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a01fecf4cde7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 09:58:54 2011 +0100 Grid: avoid using an invalid reference in the constructor from a Box. --- src/Grid.templates.hh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index d202f83..51b01a3 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -63,8 +63,10 @@ Grid::Grid(const Box<Interval>& box, PPL_DIRTY_TEMP_COEFFICIENT(u_n); PPL_DIRTY_TEMP_COEFFICIENT(u_d); gen_sys.insert(grid_point(0*Variable(space_dim-1))); - Grid_Generator& point = gen_sys[0]; for (dimension_type k = space_dim; k-- > 0; ) { + // This is declared here because it may be invalidated by the call to + // gen_sys.insert() at the end of the loop. + Grid_Generator& point = gen_sys[0]; bool closed = false; // TODO: Consider producing the system(s) in minimized form. if (box.get_lower_bound(k, closed, l_n, l_d)) {

1 0

[GIT] ppl/ppl(pip): Corrected the expected result for test02 to match integral simplifications .
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: 3c8f16e240439811d501629660cedb8f99f0009a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3c8f16e24043… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 10:47:59 2011 +0100 Corrected the expected result for test02 to match integral simplifications. --- tests/PIP_Problem/pipproblem1.cc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index b69a5d3..98ea9b0 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -90,9 +90,9 @@ test02() { return false; const Constraint& c = *cs.begin(); if (!(c.is_inequality() - && c.coefficient(n) == 7 + && c.coefficient(n) == 1 && c.coefficient(m) == 0 - && c.inhomogeneous_term() == -10)) + && c.inhomogeneous_term() == -2)) return false; } if (root->child_node(true) == 0 || root->child_node(false) != 0) @@ -110,8 +110,8 @@ test02() { const Constraint& c = *cs.begin(); if (!(c.is_inequality() && c.coefficient(n) == 0 - && c.coefficient(m) == 7 - && c.inhomogeneous_term() == -12)) + && c.coefficient(m) == 1 + && c.inhomogeneous_term() == -2)) return false; // Dummy print of (non-root) tree node to increase code coverage. using namespace IO_Operators;

1 0