March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): PIP_Tree_Node: fix regression in add_constraint() introduced by commit 1341d3.
by Marco Poletti 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 1b2c6d7c1d7d7f9ec3f03a754ff9f64d29a7190a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b2c6d7c1d7d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 15 23:25:49 2010 +0100 PIP_Tree_Node: fix regression in add_constraint() introduced by commit 1341d3. --- src/PIP_Tree.cc | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 8e470b2..d977181 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1158,20 +1158,22 @@ PIP_Tree_Node // Compute the expression for the parameter constraint. Linear_Expression expr = Linear_Expression(row.get(0)); - // Needed to avoid reallocations in expr when iterating upward. - add_mul_assign(expr, 0, Variable(num_params)); Variables_Set::const_iterator j = parameters.begin(); - // The number of increments of j plus one. - dimension_type j_index = 1; - matrix_const_row_const_iterator i = row.lower_bound(1); - matrix_const_row_const_iterator i_end = row.end(); - // NOTE: iterating in [1..num_params]. - for ( ; i!=i_end; ++i) { - if ((*i).first > num_params) - break; - std::advance(j,(*i).first-j_index); - j_index = (*i).first; - add_mul_assign(expr, (*i).second, Variable(*j)); + if (!parameters.empty()) { + // Needed to avoid reallocations in expr when iterating upward. + add_mul_assign(expr, 0, Variable(*(parameters.rbegin()))); + // The number of increments of j plus one. + dimension_type j_index = 1; + matrix_const_row_const_iterator i = row.lower_bound(1); + matrix_const_row_const_iterator i_end = row.end(); + // NOTE: iterating in [1..num_params]. + for ( ; i!=i_end; ++i) { + if ((*i).first > num_params) + break; + std::advance(j,(*i).first-j_index); + j_index = (*i).first; + add_mul_assign(expr, (*i).second, Variable(*j)); + } } // Add the parameter constraint. constraints_.insert(expr >= 0);

1 0

[GIT] ppl/ppl(master): Java interface for wrap asign added.
by Patricia Hill 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: master Commit: 80c44d73a29d1585fdffc3f62451877d7e564dc0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=80c44d73a29d… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 12:46:29 2010 +0000 Java interface for wrap asign added. --- .../Bounded_Integer_Type_Overflow.java | 39 ++++++++++++++++++ .../Bounded_Integer_Type_Representation.java | 40 ++++++++++++++++++ .../Bounded_Integer_Type_Width.java | 43 ++++++++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 9 ++++ ...l_interface_generator_java_classes_java_code.m4 | 14 ++++++ ...nterface_generator_java_procedure_generators.m4 | 3 +- 6 files changed, 147 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Overflow.java b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Overflow.java new file mode 100644 index 0000000..23d3c8f --- /dev/null +++ b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Overflow.java @@ -0,0 +1,39 @@ +/* Bounded_Integer_Type_Overflow enum declaration. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +package parma_polyhedra_library; + +//! Overflow behavior of bounded integer types. +/*! \ingroup PPL_Java_interface */ +public enum Bounded_Integer_Type_Overflow { + //! On overflow, wrapping takes place. + OVERFLOW_WRAPS, + //! On overflow, the result is undefined. + OVERFLOW_UNDEFINED, + //! Overflow is impossible. + OVERFLOW_IMPOSSIBLE; + + private static native void initIDs(); + static { + initIDs(); + } +} diff --git a/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Representation.java b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Representation.java new file mode 100644 index 0000000..3b033ad --- /dev/null +++ b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Representation.java @@ -0,0 +1,40 @@ +/* Bounded_Integer_Type_Representation enum declaration. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +package parma_polyhedra_library; + +//! Representation of bounded integer types. +/*! \ingroup PPL_Java_interface */ +public enum Bounded_Integer_Type_Representation { + //! Unsigned binary. + UNSIGNED, + /*! \brief + Signed binary where negative values are represented by the two's + complement of the absolute value. + */ + SIGNED_2_COMPLEMENT; + + private static native void initIDs(); + static { + initIDs(); + } +} diff --git a/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Width.java b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Width.java new file mode 100644 index 0000000..cc189c8 --- /dev/null +++ b/interfaces/Java/parma_polyhedra_library/Bounded_Integer_Type_Width.java @@ -0,0 +1,43 @@ +/* Bounded_Integer_Type_Width enum declaration. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +package parma_polyhedra_library; + +//! Widths of bounded integer types. +/*! \ingroup PPL_Java_interface */ +public enum Bounded_Integer_Type_Width { + //! Minimization is requested. + PPL_BITS_8, + //! \hideinitializer 16 bits. + PPL_BITS_16, + //! \hideinitializer 32 bits. + PPL_BITS_32, + //! \hideinitializer 64 bits. + PPL_BITS_64, + //! \hideinitializer 128 bits. + PPL_BITS_128; + + private static native void initIDs(); + static { + initIDs(); + } +} diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 8b647b7..8e54256 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -33,6 +33,9 @@ ppl_interface_generator_java_classes_java.m4 \ ppl_interface_generator_java_classes_java_code.m4 fixed_java_cxx_headers = \ +parma_polyhedra_library.Bounded_Integer_Type_Overflow \ +parma_polyhedra_library.Bounded_Integer_Type_Representation \ +parma_polyhedra_library.Bounded_Integer_Type_Width \ parma_polyhedra_library.By_Reference \ parma_polyhedra_library.Coefficient \ parma_polyhedra_library.Complexity_Class \ @@ -68,6 +71,9 @@ parma_polyhedra_library.Variable \ parma_polyhedra_library.Variables_Set fixed_java_cxx_headers_sources = \ +parma_polyhedra_library_Bounded_Integer_Type_Overflow.h \ +parma_polyhedra_library_Bounded_Integer_Type_Representation.h \ +parma_polyhedra_library_Bounded_Integer_Type_Width.h \ parma_polyhedra_library_By_Reference.h \ parma_polyhedra_library_Coefficient.h \ parma_polyhedra_library_Complexity_Class.h \ @@ -104,6 +110,9 @@ parma_polyhedra_library_Variables_Set.h # NOTE: do _NOT_ add Fake_Class_for_Doxygen.java to this list. fixed_java_sources = \ +$(srcdir)/Bounded_Integer_Type_Overflow.java \ +$(srcdir)/Bounded_Integer_Type_Representation.java \ +$(srcdir)/Bounded_Integer_Type_Width.java \ $(srcdir)/By_Reference.java \ $(srcdir)/Coefficient.java \ $(srcdir)/Complexity_Class.java \ diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 index e4456c0..b22bead 100644 --- a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 +++ b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 @@ -409,6 +409,20 @@ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ ') +m4_define(`ppl_@CLASS@_wrap_assign_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ + public native void wrap_assign(Variables_Set vars, + Bounded_Integer_Type_Width w, + Bounded_Integer_Type_Representation r, + Bounded_Integer_Type_Overflow o, + By_Reference<Constraint_System> pcs, + By_Reference<Integer> complexity_threshold, + By_Reference<Boolean> wrap_individually); + +') + m4_define(`ppl_@CLASS@_@WIDEN@_widening_assign_code', `dnl ___END_OF_FILE___ diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index ebe79c5..5033b8f 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -42,5 +42,6 @@ m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', ppl_free_@CLASS@/1 +all, ppl_@CLASS@_hashcode/2 +all -box, -ppl_@CLASS@_string/1 +all)dnl +ppl_@CLASS@_string/1 +all, +ppl_@CLASS@_wrap_assign/8 +simple)dnl ')

1 0

[GIT] ppl/ppl(termination): Printing of debug information suppressed.
by Roberto Bagnara 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: termination Commit: 9d8adeb605e46333bf0a342f611e87d1ac7480c3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9d8adeb605e4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 16 16:34:59 2010 +0400 Printing of debug information suppressed. --- src/termination.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index e580f84..e415eda 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,7 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "BD_Shape.defs.hh" #include "Octagonal_Shape.defs.hh" -#define PRINT_DEBUG_INFO 1 +#define PRINT_DEBUG_INFO 0 #if PRINT_DEBUG_INFO #include <iostream>

1 0

[GIT] ppl/ppl(termination): Implemented template termination_test_PR_2().
by Roberto Bagnara 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: termination Commit: 2472d5274d7f848ce8c2b3a6d7c4d564e3c4c054 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2472d5274d7f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 16 16:33:35 2010 +0400 Implemented template termination_test_PR_2(). --- src/termination.cc | 144 ++++++++++++++++++++++++-------------- src/termination.templates.hh | 93 ++++++++++++++++++++---- tests/Polyhedron/termination1.cc | 33 +++++---- 3 files changed, 188 insertions(+), 82 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2472d527…

1 0

[GIT] ppl/ppl(termination): Added more termination_test predicates to the Prolog interface.
by Patricia Hill 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: termination Commit: e27545f793d0be73d08e1b6c80cb0daeef423774 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e27545f793d0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 11:21:30 2010 +0000 Added more termination_test predicates to the Prolog interface. --- .../ppl_interface_generator_prolog_cc_code.m4 | 89 +++++++++++++++++++- .../ppl_interface_generator_prolog_hh_code.m4 | 36 +++++++- ...erface_generator_prolog_procedure_generators.m4 | 3 + 3 files changed, 121 insertions(+), 7 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 76abb24..647d722 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1244,18 +1244,41 @@ m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', ') +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, Prolog_term_ref t_pset_after) { + static const char* where + = "ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/1"; + try { + @CPP_CLASS@* pset_before + = term_to_handle<@CPP_CLASS@ >(t_pset_before, where); + @CPP_CLASS@* pset_after + = term_to_handle<@CPP_CLASS@ >(t_pset_after, where); + PPL_CHECK(ph); + if (Parma_Polyhedra_Library + ::termination_test_@TERMINATION_ID@_2(*pset_before, *pset_after)) + return PROLOG_SUCCESS; + } + CATCH_ALL; +} + +') + m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ (Prolog_term_ref t_pset, Prolog_term_ref t_g) { - static const char* where = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2"; + static const char* where + = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2"; try { @CPP_CLASS@* pset = term_to_handle<@CPP_CLASS@ >(t_pset, where); Generator gg(point()); PPL_CHECK(pset); - if (Parma_Polyhedra_Library::one_affine_ranking_function_@TERMINATION_ID@(*pset, gg) - && Prolog_unify(t_g, generator_term(gg))) + if (Parma_Polyhedra_Library + ::one_affine_ranking_function_@TERMINATION_ID@(*pset, gg) + && Prolog_unify(t_g, generator_term(gg))) return PROLOG_SUCCESS; } CATCH_ALL; @@ -1263,6 +1286,32 @@ m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', ') +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_g) { + static const char* where + = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/2"; + try { + @CPP_CLASS@* pset_before + = term_to_handle<@CPP_CLASS@ >(t_pset_before, where); + @CPP_CLASS@* pset_after + = term_to_handle<@CPP_CLASS@ >(t_pset_after, where); + Generator gg(point()); + PPL_CHECK(pset); + if (Parma_Polyhedra_Library + ::one_affine_ranking_function_@TERMINATION_ID@_2(*pset_before, + *pset_after, + gg) + && Prolog_unify(t_g, generator_term(gg))) + return PROLOG_SUCCESS; + } + CATCH_ALL; +} + +') m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ @@ -1291,6 +1340,40 @@ m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', ') +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_ph) { + static const char* where = + "ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/2"; + try { + @CPP_CLASS@* pset_before + = term_to_handle<@CPP_CLASS@ >(t_pset_before, where); + @CPP_CLASS@* pset_after + = term_to_handle<@CPP_CLASS@ >(t_pset_after, where); + PPL_CHECK(pset); + C_Polyhedron* ph = new C_Polyhedron(); + Parma_Polyhedra_Library + ::all_affine_ranking_functions_@TERMINATION_ID@_2(*pset_before, + *pset_after, + *ph); + Prolog_term_ref tmp = Prolog_new_term_ref(); + Prolog_put_address(tmp, ph); + if (Prolog_unify(t_ph, tmp)) { + PPL_REGISTER(ph); + return PROLOG_SUCCESS; + } + else + delete ph; + return PROLOG_SUCCESS; + } + CATCH_ALL; +} + +') + m4_define(`ppl_@CLASS@_@WIDEN@_widening_assign_with_tokens_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_@WIDEN@_widening_assign_with_tokens diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 index 16f3d03..ce519a0 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -517,16 +517,44 @@ m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', ') +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after); + +') + m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@(Prolog_term_ref t_pset, - Prolog_term_ref t_g); + ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ + (Prolog_term_ref t_pset, + Prolog_term_ref t_g); + +') + +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_g); ') m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@(Prolog_term_ref t_pset, - Prolog_term_ref t_ph); + ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ + (Prolog_term_ref t_pset, + Prolog_term_ref t_ph); + +') + +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_ph); ') diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 5ee84aa..29d0d6f 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -90,5 +90,8 @@ m4_define(`m4_procedure_list', ppl_@CLASS@_termination_test_@TERMINATION_ID@/1 +simple, ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2 +simple, ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@/2 +simple, +ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/1 +simple, +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/2 +simple, +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/2 +simple, ) ')

1 0

[GIT] ppl/ppl(termination): New versions of the termination utility functions with two input parameters .
by Roberto Bagnara 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: termination Commit: 1dc0de142813f0fb2120b2e124f658ecf76534ae URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1dc0de142813… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 16 14:58:52 2010 +0400 New versions of the termination utility functions with two input parameters. The PR ones are only stubs for the time being. --- src/termination.cc | 167 +++++++++++++++++ src/termination.defs.hh | 176 +++++++++++++++++ src/termination.templates.hh | 382 ++++++++++++++++---------------------- tests/Polyhedron/termination1.cc | 2 +- 4 files changed, 502 insertions(+), 225 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1dc0de14…

1 0

[GIT] ppl/ppl(master): Test changed so as to be meaningful for all integer types.
by Patricia Hill 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: master Commit: 8c3f8ae55af3cb8d3a328bf040803cdb9ac56255 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c3f8ae55af3… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed. --- src/BD_Shape.defs.hh | 4 ++-- src/Box.defs.hh | 4 ++-- src/Octagonal_Shape.defs.hh | 4 ++-- src/Polyhedron.defs.hh | 4 ++-- tests/Box/frequency1.cc | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 2b3100f..2375211 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -766,11 +766,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the bd_shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the bd_shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 8ed2680..55f5aab 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -697,11 +697,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the box that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the box that is closest to zero; \exception std::invalid_argument diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index 06bdc14..6f59b71 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -854,11 +854,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the octagonal shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the octagonal shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 8d8679c..52f6bb2 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -779,11 +779,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the polyhedron that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the polyhedron that is closest to zero; \exception std::invalid_argument diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc index 9b03553..b64be53 100644 --- a/tests/Box/frequency1.cc +++ b/tests/Box/frequency1.cc @@ -180,8 +180,8 @@ test08() { TBox box(3); box.add_constraint(A == 1); box.add_constraint(2*B == -1); - box.add_constraint(3*C == 2); - box.add_constraint(B <= 2); + box.add_constraint(2*C == 1); + box.add_constraint(B <= 4); Coefficient num; Coefficient den; @@ -189,7 +189,7 @@ test08() { Coefficient vald; bool ok = (box.frequency(Linear_Expression(A - B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 19 && vald == 6); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(box, "*** box ***"); nout << "valn " << valn << ", vald " << vald << endl;

2 1

[GIT] ppl/ppl(termination): Add BD_Shape<int8_t> to the instantiations enabled by default.
by Roberto Bagnara 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: termination Commit: 0169d5ede31039927d30d598315af7c6dad60464 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0169d5ede310… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 16 06:47:42 2010 +0400 Add BD_Shape<int8_t> to the instantiations enabled by default. BD_Shape<int8_t> allows to efficiently encode monotonicity constraints. --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9913e1a..5c177f4 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre13], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre14], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61) @@ -1174,7 +1174,7 @@ fi # Different instantiations are separated by a '@' character. di=" Polyhedron @ Grid" di="${di} @ Rational_Box" -di="${di} @ BD_Shape<mpz_class> @ BD_Shape<mpq_class>" +di="${di} @ BD_Shape<int8_t> @ BD_Shape<mpz_class> @ BD_Shape<mpq_class>" di="${di} @ Octagonal_Shape<mpz_class> @ Octagonal_Shape<mpq_class>" di="${di} @ Constraints_Product<C_Polyhedron, Grid>" di="${di} @ Pointset_Powerset<C_Polyhedron>"

1 0

[GIT] ppl/ppl(products): Test changed so as to be meaningful for all integer types.
by Patricia Hill 15 Mar '10

15 Mar '10

Module: ppl/ppl Branch: products Commit: 367f75cf57a1576f54c0bf553c714e838d8c1773 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=367f75cf57a1… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed. --- src/BD_Shape.defs.hh | 4 ++-- src/Box.defs.hh | 4 ++-- src/Octagonal_Shape.defs.hh | 4 ++-- src/Polyhedron.defs.hh | 4 ++-- tests/Box/frequency1.cc | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 2b3100f..2375211 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -766,11 +766,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the bd_shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the bd_shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Box.defs.hh b/src/Box.defs.hh index 8ed2680..55f5aab 100644 --- a/src/Box.defs.hh +++ b/src/Box.defs.hh @@ -697,11 +697,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the box that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the box that is closest to zero; \exception std::invalid_argument diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index 06bdc14..6f59b71 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -854,11 +854,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the octagonal shape that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the octagonal shape that is closest to zero; \exception std::invalid_argument diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 8d8679c..52f6bb2 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -779,11 +779,11 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of a value of \p expr at a point in the polyhedron that is closest to zero; \param val_d - The denominator of a value of \p expr at a point in the grid + The denominator of a value of \p expr at a point in the polyhedron that is closest to zero; \exception std::invalid_argument diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc index 9b03553..b64be53 100644 --- a/tests/Box/frequency1.cc +++ b/tests/Box/frequency1.cc @@ -180,8 +180,8 @@ test08() { TBox box(3); box.add_constraint(A == 1); box.add_constraint(2*B == -1); - box.add_constraint(3*C == 2); - box.add_constraint(B <= 2); + box.add_constraint(2*C == 1); + box.add_constraint(B <= 4); Coefficient num; Coefficient den; @@ -189,7 +189,7 @@ test08() { Coefficient vald; bool ok = (box.frequency(Linear_Expression(A - B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 19 && vald == 6); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(box, "*** box ***"); nout << "valn " << valn << ", vald " << vald << endl;

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 15 Mar '10

15 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c68101c16e7f… Merge: 8760df47483200e17daf43df3c7ca4ec7aad9185 6060bda39a0fb7b5d8d114d436b81a5a5b1eb74e Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 15 15:53:22 2010 +0400 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8760df474832… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 11:18:15 2010 +0000 Conflicts resolved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7ad2fe744dc6… Merge: bbb1ff43e555dabda36b8d5838092ebade985c54 65156364caa2da7235862998930736ca27c83236 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 10 13:18:29 2010 +0400 Merge branch 'master' into products Conflicts: src/Partially_Reduced_Product.templates.hh tests/Partially_Reduced_Product/directproduct2.cc tests/Partially_Reduced_Product/directproduct3.cc tests/Partially_Reduced_Product/directproduct4.cc tests/Partially_Reduced_Product/directproduct5.cc tests/Partially_Reduced_Product/directproduct6.cc tests/Partially_Reduced_Product/partiallyreducedproduct1.cc tests/Partially_Reduced_Product/partiallyreducedproduct2.cc tests/Partially_Reduced_Product/partiallyreducedproduct3.cc tests/Partially_Reduced_Product/partiallyreducedproduct4.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bbb1ff43e555… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Jul 9 14:30:29 2009 +0100 Corrected test as already corrected in the master branch. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a648638a1c5f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:44:02 2009 +0100 Further improvements to frequency() code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c5965cbb6eed… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 08:14:06 2009 +0100 Code for frequency() improved. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b01615895b5c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 24 07:11:57 2009 +0100 A new product called Shape_Preserving_Product added. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68dd5db1d102… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:56:45 2009 +0100 The method frequency() added to the Affine_Space domain. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ef46ef0cbc6… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 23 20:55:47 2009 +0100 Bug in frequency() for Octagonal shapes fixed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46be509da515… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 15:32:07 2009 +0100 Added the method frequency() to the Box domain. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f21ee4e62c55… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 22 11:01:10 2009 +0100 Added the method frequency() to the Octagonal shape domain. Improved the code for the same method for BD shapes. Corrected some typos in comments in these files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e13382fd6d7a… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 21 09:32:39 2009 +0100 Added method frequency() to the Polyhedron and BD Shape domains. This corresponds to the method frequency() already added to the Grid domain. For these domains it checks if the expression has a constant value and if so, returns true and gives the value (with frequency 0). Otherwise it returns false. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97e641dd651b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:36:26 2009 +0100 Revert "Added a warning about non-integrality for wrap_assign()." This reverts commit 6b9f28ad503f1d43da7a876c4bee7eae9eba185a. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6b9f28ad503f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:28:58 2009 +0100 Added a warning about non-integrality for wrap_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=047b85ccd0dd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed May 20 08:25:26 2009 +0100 Some tests are expected to fail with 8-bit integers. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=49daa080642e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue May 19 17:15:53 2009 +0100 Removed redundant test files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b981fa2a283c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue May 19 17:07:14 2009 +0100 Revised the tests so as to follow the organization for other domains. Apart from the operation tests, there are specific tests for each reduction operator. Selected tests (in the Makefile) can be checked with the given component order and with the component domains reversed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=49a4bf80ee99… Merge: 7d94d1213ad812f7d2a1cec93763247bdab22d34 badd595a0c22e91f4f1653ff8c7d53a3bf15ec50 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 18 13:47:31 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d94d1213ad8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 17 09:04:08 2009 +0100 After the affine (pre)image operations, unset the reduced flag. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d519208391e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 21:20:06 2009 +0100 Added two tests based on the examples 5(a), 5(b) in SenS07. Added print_constraints(const Affine_Space&) to ppl_test. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4f5a7d280e52… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 07:41:22 2009 +0100 Added new method frequency() for Grids. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c7f4b16d84c8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu May 14 07:41:22 2009 +0100 Added new method frequency() for Grids. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=60d5f1fce4d1… Merge: da0ca32ee95f30d2bcd9111eea74d9b820ad1a14 c8cbb00f29ac4c0d48daf14a9a9d3b93e559e207 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed May 13 11:06:06 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=da0ca32ee95f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sun May 3 17:22:18 2009 +0100 Renamed reduction Shrink_Using_Congruences_Reduction to Congruences_Reduction. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d1cde86de062… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat May 2 11:00:24 2009 +0100 Reduction methods (Constraints and Shrink_Using_Congruences) improved. Tests specific to the Constraints_Reduction added. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5feeaabb6a4e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri May 1 10:16:38 2009 +0100 Unwanted changes to test01() undone. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d9d2424b6b4… Merge: 71893349245baa11c7fa1dd9b0a793606b4bce4c 827e54079b1ec6528dd5d185c8d8d0694c891587 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 29 14:44:49 2009 +0200 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=71893349245b… Author: Patricia M. Hill <hill(a)comp.leeds.ac.uk> Date: Mon Jan 5 13:54:39 2009 +0000 Added a reduction method Shrink_Using_Congruences_Reduction<> and the product Shrink_Using_Congruences_Product<> that assumes this reduction. Several "FIXME"s dealt with. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=00d817596a9b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Dec 13 10:28:13 2008 +0000 This commit was generated by cvs to git conversion to create branch 'products'.

1 0