- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added missing parentheses.
by Patricia Hill 21 Mar '12

21 Mar '12

Module: ppl/ppl Branch: master Commit: ada46f601687254f1e91a2b098b7377ba0436c4d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ada46f601687… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 21 16:59:21 2012 +0000 Added missing parentheses. Detected by eclair service exprprns. --- src/OR_Matrix.inlines.hh | 2 +- src/checked_int.inlines.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OR_Matrix.inlines.hh b/src/OR_Matrix.inlines.hh index 28b2620..91917e8 100644 --- a/src/OR_Matrix.inlines.hh +++ b/src/OR_Matrix.inlines.hh @@ -245,7 +245,7 @@ inline typename OR_Matrix<T>::template any_row_iterator& OR_Matrix<T>::any_row_iterator::operator+=(const difference_type m) { difference_type e_dt = static_cast<difference_type>(e); difference_type i_dt = static_cast<difference_type>(i); - difference_type increment = m + ((m * m) / 2) + (m * e_dt); + difference_type increment = (m + ((m * m) / 2)) + (m * e_dt); if (e_dt % 2 == 0 && m % 2 != 0) ++increment; e_dt += m; diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index 0a8175b..9e6a34d 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -1392,7 +1392,7 @@ smod_2exp_unsigned_int(Type& to, const Type x, unsigned int exp, to = x; else { Type v = (exp == sizeof_to_bits(sizeof(Type)) ? x : (x & ((Type(1) << exp) - 1))); - if (v >= Type(1) << (exp - 1)) + if (v >= (Type(1) << (exp - 1))) return set_neg_overflow_int<To_Policy>(to, dir); else to = v;

1 0

[GIT] ppl/ppl(master): Fixed a couple of typos.
by Enea Zaffanella 21 Mar '12

21 Mar '12

Module: ppl/ppl Branch: master Commit: ce51fb2114461753e076542cb655442db575697c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ce51fb211446… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 21 15:13:28 2012 +0100 Fixed a couple of typos. --- .../ppl_interface_generator_prolog_dox_code.m4 | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_dox_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_dox_code.m4 index e82ba5c..994e48e 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_dox_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_dox_code.m4 @@ -495,11 +495,12 @@ m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_constpoly_doc', <CODE>ppl_@CLASS@_has_@UPPERLOWER@_bound(+Handle, +Var, ?Coeff_1, ?Coeff_2, ?Boolean)</CODE> Succeeds if and only if \c Var is @UPPERLOWER@ bounded in m4_this_ppl_one_object \p P referenced by \c Handle. It is assumed - that \p P is not empty, otherwise the behavior is undefined. + that \p P is not empty and its space dimension is greater than or equal + to that of \c Var|COMMA| otherwise the behavior is undefined. \c Coeff_1 is unified with the numerator of the @UPPERLOWER@ bound and \c Coeff_2 with the denominator of the @UPPERLOWER@ bound. - If the @UPPERLOWER@ is included in \p P, then \c Boolean is unified + If the @UPPERLOWER@ is included in \p P|COMMA| then \c Boolean is unified with the atom \c true and|COMMA| otherwise|COMMA| unified with the atom \c false.

1 0

[GIT] ppl/ppl(master): Improved documentation for Box<ITV>::has_{upper, lower}_bound().
by Enea Zaffanella 21 Mar '12

21 Mar '12

Module: ppl/ppl Branch: master Commit: 28c00aa026e4c4d55e7f61ccf46c4500265e85ec URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=28c00aa026e4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 21 14:30:11 2012 +0100 Improved documentation for Box<ITV>::has_{upper,lower}_bound(). Weakened precondition regarding box emptiness: the box can be empty, but it can not be marked empty. Added a test to the Prolog interface. --- .../ppl_interface_generator_prolog_dox_code.m4 | 15 ++ ...face_generator_prolog_generated_test_pl_code.m4 | 21 +++ src/Box.defs.hh | 16 ++ src/Box.inlines.hh | 10 +- src/Box.templates.hh | 157 +++++++++++--------- 5 files changed, 146 insertions(+), 73 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=28c00aa0…

1 0

[GIT] ppl/ppl(master): Modified interface for Box<ITV>::has_{upper, lower}_bound.
by Enea Zaffanella 21 Mar '12

21 Mar '12

Module: ppl/ppl Branch: master Commit: 8c640b9acf6657f971377a9f80fce5e55aabbb9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c640b9acf66… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 21 10:56:18 2012 +0100 Modified interface for Box<ITV>::has_{upper,lower}_bound. The changes are meant to make it more similar to, e.g., maximize(). Hence, we no pass in a Variable rather than a bare dimension_type and the boolean reference argument `closed' is the last one. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 9 ++-- interfaces/C/ppl_interface_generator_c_h_code.m4 | 8 ++-- ...ppl_interface_generator_java_classes_cc_code.m4 | 6 +- ...l_interface_generator_java_classes_java_code.m4 | 4 +- .../ppl_interface_generator_java_test_java_code.m4 | 2 +- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 12 +++--- .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 2 +- .../ppl_interface_generator_ocaml_mli_code.m4 | 2 +- .../ppl_interface_generator_prolog_cc_code.m4 | 8 ++-- .../ppl_interface_generator_prolog_hh_code.m4 | 7 +-- src/Box.defs.hh | 48 ++++++++++---------- src/Box.inlines.hh | 10 +++-- src/Box.templates.hh | 39 +++++++++------- src/Grid.templates.hh | 9 ++-- src/Polyhedron.templates.hh | 26 ++++++----- 15 files changed, 100 insertions(+), 92 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=8c640b9a…

1 0

[GIT] ppl/ppl(master): Added parentheses and improved formatting.
by Patricia Hill 20 Mar '12

20 Mar '12

Module: ppl/ppl Branch: master Commit: 8f8ede593ef9b97682b100bb0ec6535caf414dcd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8f8ede593ef9… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 20 13:18:03 2012 +0000 Added parentheses and improved formatting. Missing parentheses detected by ECLAIR service exprprns. --- src/Boundary.defs.hh | 48 ++++++++++++++++++------------------ src/CO_Tree.cc | 16 ++++++----- src/Float.templates.hh | 2 +- src/OR_Matrix.inlines.hh | 8 +++--- src/PIP_Tree.cc | 4 +- src/Pointset_Powerset.templates.hh | 8 +++--- src/Sparse_Row.cc | 2 +- 7 files changed, 45 insertions(+), 43 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=8f8ede59…

1 0

[GIT] ppl/ppl(master): This file is not part of the Parma Polyhedra Library .
by Roberto Bagnara 19 Mar '12

19 Mar '12

Module: ppl/ppl Branch: master Commit: 1ec10039245e916983a4cd8082b6ba0d878760c5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ec10039245e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 19 19:33:55 2012 +0100 This file is not part of the Parma Polyhedra Library. --- demos/ppl_lpsol/glpk_set_d_eps.c | 26 ++------------------------ 1 files changed, 2 insertions(+), 24 deletions(-) diff --git a/demos/ppl_lpsol/glpk_set_d_eps.c b/demos/ppl_lpsol/glpk_set_d_eps.c index 638c8b7..397b48d 100644 --- a/demos/ppl_lpsol/glpk_set_d_eps.c +++ b/demos/ppl_lpsol/glpk_set_d_eps.c @@ -1,30 +1,8 @@ /* Utilities extracted from GLPK's 4.44 (see below for copyright and licensing information). - The rest of this comment block applies to everything outside - the "Begin GLPK code" and "End GLPK code" marks. - - Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> - Copyright (C) 2010-2012 BUGSENG srl (http://bugseng.com) - -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://bugseng.com/products/ppl/ . */ + The code that comes from GLPK's 4.44 is delimited by "Begin GLPK code" + and "End GLPK code" marks. */ #include <gmp.h> #include <assert.h>

1 0

[GIT] ppl/ppl(master): Added Box method has_{upper. lower}_bound to OCaml and Prolog lang interfaces.
by Enea Zaffanella 19 Mar '12

19 Mar '12

Module: ppl/ppl Branch: master Commit: 047c37cda2bb8b73e4529647e4bbddd3c0ef8e89 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=047c37cda2bb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 19 17:47:44 2012 +0100 Added Box method has_{upper.lower}_bound to OCaml and Prolog lang interfaces. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 24 ++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 9 ++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 8 +++++ .../ppl_interface_generator_prolog_cc_code.m4 | 29 ++++++++++++++++++++ .../ppl_interface_generator_prolog_hh_code.m4 | 9 ++++++ 5 files changed, 79 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index 067ec1e..1b282b9 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -720,6 +720,30 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`dnl +extern "C" +CAMLprim value +ppl_@CLASS@_has_@UPPERLOWER@_bound(value ph, value var) try { + CAMLparam2(ph, var); + CAMLlocal1(caml_return_value); + PPL_DIRTY_TEMP_COEFFICIENT(num); + PPL_DIRTY_TEMP_COEFFICIENT(den); + bool is_closed = false; + @CPP_CLASS@& pph = *p_@CLASS@_val(ph); + dimension_type dd = value_to_ppl_dimension(var); + bool ppl_return_value = pph.has_@UPPERLOWER@_bound(dd, is_closed, num, den); + caml_return_value = caml_alloc(4, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, Val_bool(is_closed)); + Store_field(caml_return_value, 2, build_ocaml_coefficient(num)); + Store_field(caml_return_value, 3, build_ocaml_coefficient(den)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl extern "C" diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 index 5620b37..6058f7a 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -359,6 +359,15 @@ external ppl_@CLASS@_@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign_with_toke ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`dnl +external ppl_@CLASS@_has_@UPPERLOWER@_bound: + @!CLASS@ -> int + -> bool * bool * Z.t * Z.t + = "ppl_@CLASS@_has_@UPPERLOWER@_bound" + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl external ppl_@CLASS@_@MAXMIN@: diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index fc461db..d12e6f5 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -321,6 +321,14 @@ val ppl_@CLASS@_@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign: ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`dnl +val ppl_@CLASS@_has_@UPPERLOWER@_bound: + @!CLASS@ -> int + -> bool * bool * Z.t * Z.t + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl val ppl_@CLASS@_@MAXMIN@: diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index fd540f3..0c372fd 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -802,6 +802,35 @@ m4_define(`ppl_@CLASS@_bounds_from_@ABOVEBELOW@_code', ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_has_@UPPERLOWER@_bound(Prolog_term_ref t_ph, + Prolog_term_ref t_v, + Prolog_term_ref t_closed, + Prolog_term_ref t_n, Prolog_term_ref t_d) { + static const char* where = "ppl_@CLASS@_has_@UPPERLOWER@_bound/5"; + try { + const @CPP_CLASS@* ph = term_to_handle<@CPP_CLASS@ >(t_ph, where); + PPL_CHECK(ph); + const Variable v = term_to_Variable(t_v, where); + bool closed; + PPL_DIRTY_TEMP_COEFFICIENT(n); + PPL_DIRTY_TEMP_COEFFICIENT(d); + if (ph->has_@UPPERLOWER@_bound(v, closed, n, d)) { + Prolog_term_ref t = Prolog_new_term_ref(); + Prolog_atom a = (closed ? a_true : a_false); + Prolog_put_atom(t, a); + if (Prolog_unify_Coefficient(t_n, n) + && Prolog_unify_Coefficient(t_d, d) + && Prolog_unify(t_closed, t)) + return PROLOG_SUCCESS; + } + } + CATCH_ALL; +} + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_@MAXMIN@(Prolog_term_ref t_ph, Prolog_term_ref t_le_expr, diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 index b1a11c3..dc18944 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -215,6 +215,15 @@ m4_define(`ppl_@CLASS@_bounds_from_@ABOVEBELOW@_code', ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_has_@UPPERLOWER@_bound(Prolog_term_ref t_ph, + Prolog_term_ref t_v, + Prolog_term_ref t_closed, + Prolog_term_ref t_n, Prolog_term_ref t_d); + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_@MAXMIN@(Prolog_term_ref t_ph, Prolog_term_ref t_le_expr,

1 0

[GIT] ppl/ppl(master): Added Box methods has_{upper, lower}_bound to C language interface.
by Enea Zaffanella 19 Mar '12

19 Mar '12

Module: ppl/ppl Branch: master Commit: 2ee57e6c104122a98ba0e3a2faeba0ec4b5b72a6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ee57e6c1041… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 19 08:39:20 2012 +0100 Added Box methods has_{upper,lower}_bound to C language interface. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 21 ++++++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 12 +++++++++++ interfaces/ppl_interface_generator_common_dat.m4 | 8 +++++++ ...erface_generator_common_procedure_generators.m4 | 1 + 4 files changed, 42 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 387cf2c..42b0cba 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -260,6 +260,27 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`int +ppl_@CLASS@_has_@UPPERLOWER@_bound +(ppl_@CLASS@_t ps, + ppl_dimension_type dim, + int* pclosed, + ppl_Coefficient_t ext_n, + ppl_Coefficient_t ext_d) try { + const @CPP_CLASS@& pps = *to_const(ps); + Coefficient& eext_n = *to_nonconst(ext_n); + Coefficient& eext_d = *to_nonconst(ext_d); + bool closed; + bool bounded = pps.has_@UPPERLOWER@_bound(dim, closed, eext_n, eext_d); + if (bounded) + *pclosed = closed ? 1 : 0; + return bounded ? 1 : 0; +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_frequency_code', `int ppl_@CLASS@_frequency diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4 index c85fe29..5454df3 100644 --- a/interfaces/C/ppl_interface_generator_c_h_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_h_code.m4 @@ -280,6 +280,18 @@ PPL_PROTO((ppl_const_@CLASS@_t ph, ') +m4_define(`ppl_@CLASS@_get_@UPPERLOWER@_bound_code', +`/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_get_@UPPERLOWER@_bound +PPL_PROTO((ppl_@CLASS@_t ps, + ppl_dimension_type dim, + int* pclosed, + ppl_Coefficient_t ext_n, + ppl_Coefficient_t ext_d)); + +') + m4_define(`ppl_@CLASS@_frequency_code', `/*! \relates ppl_@CLASS@_tag */ int diff --git a/interfaces/ppl_interface_generator_common_dat.m4 b/interfaces/ppl_interface_generator_common_dat.m4 index 17b6a63..099795a 100644 --- a/interfaces/ppl_interface_generator_common_dat.m4 +++ b/interfaces/ppl_interface_generator_common_dat.m4 @@ -509,6 +509,7 @@ class_represent, has_property, simplify, abovebelow, +upperlower, maxmin, comparison, refine_represent, @@ -940,6 +941,13 @@ dnl --------------------------------------------------------------------- m4_define(`m4_abovebelow_replacements', `above, below') dnl --------------------------------------------------------------------- +dnl pattern -- upper/lower +dnl Used for has_upper_bound and has_lower_bound methods (Box domains). +dnl --------------------------------------------------------------------- + +m4_define(`m4_upperlower_replacements', `upper, lower') + +dnl --------------------------------------------------------------------- dnl pattern == maxmin dnl Maximize or Minimize dnl --------------------------------------------------------------------- diff --git a/interfaces/ppl_interface_generator_common_procedure_generators.m4 b/interfaces/ppl_interface_generator_common_procedure_generators.m4 index ead5e2c..2e89423 100644 --- a/interfaces/ppl_interface_generator_common_procedure_generators.m4 +++ b/interfaces/ppl_interface_generator_common_procedure_generators.m4 @@ -63,6 +63,7 @@ ppl_@CLASS@_get_minimized_@CLASS_REPRESENT@s/2 +simple, ppl_@CLASS@_@HAS_PROPERTY@/1 +all, ppl_@CLASS@_@SIMPLIFY@/1 *nofail +all, ppl_@CLASS@_bounds_from_@ABOVEBELOW@/2 +all, +ppl_@CLASS@_has_@UPPERLOWER@_bound/5 +box, ppl_@CLASS@_@MAXMIN@/5 +all, ppl_@CLASS@_@MAXMIN@_with_point/6 +all, ppl_@CLASS@_frequency/6 +simple,

1 0

[GIT] ppl/ppl(master): Added Box method has_{upper, lower}_bound to Java language interface.
by Enea Zaffanella 19 Mar '12

19 Mar '12

Module: ppl/ppl Branch: master Commit: 1efe14de85745fad6e00f32f4c74d3f2e0dc0d74 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1efe14de8574… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 19 10:52:36 2012 +0100 Added Box method has_{upper,lower}_bound to Java language interface. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 30 ++++++++++++++++++++ ...l_interface_generator_java_classes_java_code.m4 | 10 ++++++ .../ppl_interface_generator_java_test_java_code.m4 | 13 ++++++++ 3 files changed, 53 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index ea90b5e..8dd0863 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 @@ -511,6 +511,36 @@ Java_parma_1polyhedra_1library_@1CLASS@_bounds_1from_1@1ABOVEBELOW@ ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`dnl +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_@1CLASS@_has_1@UPPERLOWER@_1bound +(JNIEnv* env, jobject j_this, jobject j_var, + jobject j_ref_boolean, jobject j_num, jobject j_den) { + try { + @CPP_CLASS@* this_ptr + = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); + PPL_DIRTY_TEMP_COEFFICIENT(num); + PPL_DIRTY_TEMP_COEFFICIENT(den); + num = build_cxx_coeff(env, j_num); + den = build_cxx_coeff(env, j_den); + Variable v = build_cxx_variable(env, j_var); + bool b_value; + if (this_ptr->has_@UPPERLOWER@_bound(v.id(), b_value, num, den)) { + set_coefficient(env, j_num, build_java_coeff(env, num)); + set_coefficient(env, j_den, build_java_coeff(env, den)); + jobject j_boolean = bool_to_j_boolean_class(env, b_value); + set_by_reference(env, j_ref_boolean, j_boolean); + return true; + } + return false; + } + CATCH_ALL; + return false; +} + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl JNIEXPORT jboolean JNICALL 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 17c8d05..ce7baf5 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 @@ -216,6 +216,16 @@ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ + public native boolean has_@UPPERLOWER@_bound(Variable var, + By_Reference<Boolean> closed, + Coefficient bound_n, Coefficient bound_d); + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl ___END_OF_FILE___ diff --git a/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 b/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 index dc71a8f..8de4f34 100644 --- a/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 +++ b/interfaces/Java/tests/ppl_interface_generator_java_test_java_code.m4 @@ -480,6 +480,19 @@ m4_define(`ppl_@CLASS@_constrains_code', ') +m4_define(`ppl_@CLASS@_has_@UPPERLOWER@_bound_code', + `dnl +{ + PPL_Test.print_if_noisy("Testing has_@UPPERLOWER@_bound: "); + @TOPOLOGY@@CLASS@ gd = new @TOPOLOGY@@CLASS@(@CONSTRAINER@s1); + boolean has_@UPPERLOWER@ + = gd.has_@UPPERLOWER@_bound(var_C, bool_by_ref1, coeff_0, coeff_5); + report_success_or_failure(gd.OK()); + gd.free(); +} + +') + m4_define(`ppl_@CLASS@_@MAXMIN@_code', `dnl {

1 0

[GIT] ppl/ppl(master): Text revised.
by Roberto Bagnara 19 Mar '12

19 Mar '12

Module: ppl/ppl Branch: master Commit: e604b2c5f03b7ed08a3a355d8e9bc787d1b0025f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e604b2c5f03b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 19 13:31:42 2012 +0100 Text revised. --- tests/README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/README b/tests/README index c26fdc9..82826d1 100644 --- a/tests/README +++ b/tests/README @@ -5,8 +5,8 @@ See below for the copying conditions. How To Use the Test Programs (If You Really Want To Use Them) ============================================================= -The programs in this directory are part of the test suite of the Parma -Polyhedra Library (PPL). They have various origins: +The programs in this directory are part of the extensive test suite of +the Parma Polyhedra Library (PPL). They have various origins: 1) some have been written to test the expressivity of the library; 2) some have been written to reproduce bugs that have now been fixed;

1 0