April 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Typo fixed.
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 99f17d8aa4bd39d2dfb3b9404a73ea907f7d2698 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=99f17d8aa4bd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 11:42:06 2010 +0100 Typo fixed. --- interfaces/Prolog/tests/pl_check.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index d291960..e70d85a 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2472,7 +2472,7 @@ pip_solution :- ppl_PIP_Tree_Node_as_decision(Tree_Node, Dec), ppl_PIP_Tree_Node_constraints(Dec, _CS1), ppl_PIP_Decision_Node_get_true_child(Dec, TChild), - ppl_PIP_Decision_Node_get_true_child(Dec, _FChild), + ppl_PIP_Decision_Node_get_false_child(Dec, _FChild), ppl_PIP_Tree_Node_as_decision(TChild, TChild_Dec), ppl_PIP_Decision_Node_get_true_child(TChild_Dec, TTChild), \+ ppl_PIP_Tree_Node_as_decision(TTChild, _TTChild_Dec),

1 0

[GIT] ppl/w3ppl(master): Added BagnaraMPZ10TR.
by Roberto Bagnara 07 Apr '10

07 Apr '10

Module: ppl/w3ppl Branch: master Commit: 77f2d0719a99cb91bbc7fb9156197a453ddb52d0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=77f2d0719a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 7 21:28:33 2010 +0200 Added BagnaraMPZ10TR. --- htdocs/Documentation/ppl.bib | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/htdocs/Documentation/ppl.bib b/htdocs/Documentation/ppl.bib index ee137a7..fe8ae8c 100644 --- a/htdocs/Documentation/ppl.bib +++ b/htdocs/Documentation/ppl.bib @@ -373,6 +373,40 @@ algorithm for the domain of \emph{octagonal shapes}.", } +@Techreport{BagnaraMPZ10TR, + Author = "R. Bagnara and F. Mesnard and A. Pescetti and E. Zaffanella", + Title = "The Automatic Synthesis of Linear Ranking Functions: + The Complete Unabridged Version", + Number = 498, + Type = "Quaderno", + Institution = "Dipartimento di Matematica, Universit\`a di Parma, Italy", + Year = 2010, + Note = "Available at \url{http://www.cs.unipr.it/Publications/}. + Also published as {\tt arXiv:cs.PL/1004.0944}, + available from \url{http://arxiv.org/}.", + Abstract = "The classical technique for proving termination of a + generic sequential computer program involves the + synthesis of a \emph{ranking function} for each loop of + the program. \emph{Linear} ranking functions are + particularly interesting because many terminating loops + admit one and algorithms exist to automatically + synthesize it. In this paper we present two such + algorithms: one based on work dated 1991 by Sohn and + Van~Gelder; the other, due to Podelski and Rybalchenko, + dated 2004. Remarkably, while the two algorithms will + synthesize a linear ranking function under exactly the + same set of conditions, the former is mostly unknown to + the community of termination analysis and its general + applicability has never been put forward before the + present paper. In this paper we thoroughly justify both + algorithms, we prove their correctness, we compare their + worst-case complexity and experimentally evaluate their + efficiency, and we present an open-source implementation + of them that will make it very easy to include + termination-analysis capabilities in automatic program + verifiers." +} + @InProceedings{BagnaraRZH02, Author = "R. Bagnara and E. Ricci and E. Zaffanella and P. M. Hill", Title = "Possibly Not Closed Convex Polyhedra

1 0

[GIT] ppl/ppl(master): Restructured the OCaml interface to PIP_Tree_Node C++ classes.
by Enea Zaffanella 07 Apr '10

07 Apr '10

Module: ppl/ppl Branch: master Commit: 6f92bdda48d52db1c27f36537b9af13f20b6c755 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6f92bdda48d5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Apr 7 17:37:14 2010 +0200 Restructured the OCaml interface to PIP_Tree_Node C++ classes. Also corrected several bugs related to object finalization. --- interfaces/OCaml/ppl_ocaml_common.cc | 238 ++++++++++++++------------------ interfaces/OCaml/ppl_ocaml_globals.ml | 46 +++---- interfaces/OCaml/ppl_ocaml_globals.mli | 34 ++--- 3 files changed, 141 insertions(+), 177 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=6f92bdda…

1 0

[GIT] ppl/ppl(master): Added a couple of entries.
by Enea Zaffanella 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: f39f1ccdbe873dfac61fd101c1075f11678e98dc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f39f1ccdbe87… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Apr 6 11:24:24 2010 +0200 Added a couple of entries. --- NEWS | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 835744d..74781bc 100644 --- a/NEWS +++ b/NEWS @@ -38,14 +38,28 @@ o The C and Java interfaces now support timeout computation facilities. o New configuration option `--with-gmp-build=DIR' allows to use a non-installed build of GMP in DIR. -o New methods +o New class PIP_Problem provides a Parametric Integer Programming (PIP) + problem solver mainly based on P. Feautrier's specification. + The implementation combines a parametric dual simplex algorithm using + exact arithmetic with Gomory's cut generation. + Still under beta testing. + +o New Linear_Expression methods - bool Linear_Expression::is_zero() const - bool Linear_Expression::all_homogeneous_terms_are_zero() const + bool is_zero() const + bool all_homogeneous_terms_are_zero() const return true if and only if `*this' is 0, and if and only if all the homogeneous terms of `*this' are 0, respectively. +o New Linear_Expression methods + + void add_mul_assign(Coefficient_traits::const_reference c, Variable v) + void sub_mul_assign(Coefficient_traits::const_reference c, Variable v) + + assign linear expression *this + c * v (resp., *this - c * v) to *this, + while avoiding the allocation of a temporary Linear_Expression. + o For the PPL semantic objects, other than the Pointset_Powerset and Partially_Reduced Product, there is a new method:

1 0

[GIT] ppl/ppl(master): ...get_big_parameter_dimension/2 changed to
by Patricia Hill 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: 8354fb40ac3b479de4176560139e6daba5d46bc7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8354fb40ac3b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Apr 6 09:52:31 2010 +0100 ..get_big_parameter_dimension/2 changed to ..has_big_parameter_dimension/2 and now this fails if the "big dimension" == not_a_dimension(). --- ...erface_generator_prolog_procedure_generators.m4 | 2 +- interfaces/Prolog/ppl_prolog_common.cc | 7 +++++-- interfaces/Prolog/ppl_prolog_common.defs.hh | 2 +- interfaces/Prolog/tests/pl_check.pl | 19 +++++++++++-------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index e29aeda..1d80e1c 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -98,7 +98,7 @@ ppl_PIP_Problem_add_constraint/2, ppl_PIP_Problem_add_constraints/2, ppl_PIP_Problem_set_control_parameter/2 *nofail, ppl_PIP_Problem_get_control_parameter/3, -ppl_PIP_Problem_get_big_parameter_dimension/2, +ppl_PIP_Problem_has_big_parameter_dimension/2, ppl_PIP_Problem_set_big_parameter_dimension/2, ppl_PIP_Problem_is_satisfiable/1, ppl_PIP_Problem_solve/2, diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 1c945a2..fbb985d 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -2846,13 +2846,16 @@ ppl_PIP_Problem_set_control_parameter(Prolog_term_ref t_pip, } extern "C" Prolog_foreign_return_type -ppl_PIP_Problem_get_big_parameter_dimension(Prolog_term_ref t_pip, +ppl_PIP_Problem_has_big_parameter_dimension(Prolog_term_ref t_pip, Prolog_term_ref t_d) { static const char* where = "ppl_PIP_Problem_get_big_parameter_dimension/2"; try { PIP_Problem* pip = term_to_handle<PIP_Problem>(t_pip, where); PPL_CHECK(pip); - if (unify_ulong(t_d, pip->get_big_parameter_dimension())) + dimension_type dim = pip->get_big_parameter_dimension(); + if (dim == not_a_dimension()) + return PROLOG_FAILURE; + if (unify_ulong(t_d, dim)) return PROLOG_SUCCESS; } CATCH_ALL; diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index e1be161..337b9fc 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -1028,7 +1028,7 @@ ppl_PIP_Problem_optimizing_solution(Prolog_term_ref t_pip, Prolog_term_ref t_pip_tree); extern "C" Prolog_foreign_return_type -ppl_PIP_Problem_get_big_parameter_dimension(Prolog_term_ref t_pip, +ppl_PIP_Problem_has_big_parameter_dimension(Prolog_term_ref t_pip, Prolog_term_ref t_d); extern "C" Prolog_foreign_return_type diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index c3a29ad..d291960 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2428,16 +2428,19 @@ pip_set :- make_vars(3, [A, B, C]), clean_ppl_new_PIP_Problem( 3, [A >= 0, A =< 3, A + B + C >= 9, B >= 5, C =< 5], [B], PIP), - pl_check_prolog_flag(bounded, Y), - (Y == false -> - ppl_PIP_Problem_get_big_parameter_dimension(PIP, _X) -% ppl_PIP_Problem_set_big_parameter_dimension(PIP, X), - ; - true - ), + \+ ppl_PIP_Problem_has_big_parameter_dimension(PIP, _X), ppl_PIP_Problem_solve(PIP, optimized), !, - ppl_delete_PIP_Problem(PIP). + ppl_delete_PIP_Problem(PIP), + + make_vars(4, [X, Y, P, M]), + clean_ppl_new_PIP_Problem( + 4, [Y - M >= -2*X + 2*M - 4, 2*Y - 2*M =< X - M + 2*P], [P, M], PIP1), + ppl_PIP_Problem_set_big_parameter_dimension(PIP1, 3), + ppl_PIP_Problem_has_big_parameter_dimension(PIP1, 3), + ppl_PIP_Problem_solve(PIP1, optimized), + !, + ppl_delete_PIP_Problem(PIP1). pip_solve :- make_vars(3, [A, B, C]),

1 0

[GIT] ppl/ppl(master): Solaris users should install GNU sed.
by Enea Zaffanella 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: 5c4bc05adbdf6d6b2d853ad0ddb926c21695bc3a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5c4bc05adbdf… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Apr 6 10:18:29 2010 +0200 Solaris users should install GNU sed. --- README.Solaris | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README.Solaris b/README.Solaris new file mode 100644 index 0000000..e454198 --- /dev/null +++ b/README.Solaris @@ -0,0 +1,8 @@ +Build problems have been reported for Solaris 10, affecting the build +of the Java language interface, which are due to the use of an +incompatible version of sed: + + https://www.cs.unipr.it/mantis/view.php?id=103 + +The solution is to install and use GNU sed. +This is recommended, even when only using the C++ language interface.

1 0

[GIT] ppl/ppl(master): Check if the Prolog system supports unbounded integers before
by Patricia Hill 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: 087b4f0fa21c23ce4799ec96ad8108cb7911c40a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=087b4f0fa21c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Apr 6 09:00:38 2010 +0100 Check if the Prolog system supports unbounded integers before testing the big_parameter for PIP_Problem. --- interfaces/Prolog/tests/pl_check.pl | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 0db2379..c3a29ad 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2428,8 +2428,13 @@ pip_set :- make_vars(3, [A, B, C]), clean_ppl_new_PIP_Problem( 3, [A >= 0, A =< 3, A + B + C >= 9, B >= 5, C =< 5], [B], PIP), - ppl_PIP_Problem_get_big_parameter_dimension(PIP, _X), + pl_check_prolog_flag(bounded, Y), + (Y == false -> + ppl_PIP_Problem_get_big_parameter_dimension(PIP, _X) % ppl_PIP_Problem_set_big_parameter_dimension(PIP, X), + ; + true + ), ppl_PIP_Problem_solve(PIP, optimized), !, ppl_delete_PIP_Problem(PIP).

1 0

[GIT] ppl/ppl(master): Added calls to WEIGHT macros.
by Enea Zaffanella 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: 85ea941ab9bc28f334e6fba3ed6263757ebf5a25 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=85ea941ab9bc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Apr 6 09:58:17 2010 +0200 Added calls to WEIGHT macros. --- src/PIP_Tree.cc | 106 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 96 insertions(+), 10 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=85ea941a…

1 0

[GIT] ppl/ppl(master): Corrected PIP_Problem test04 to properly call predicate ppl_*_artificials( ).
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: cac4da6e7ece70ff7ebd8b0bfc16e07d41e375af URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cac4da6e7ece… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 20:46:24 2010 +0200 Corrected PIP_Problem test04 to properly call predicate ppl_*_artificials(). Applied a few renamings to the implementation of the predicate. --- interfaces/Prolog/ppl_prolog_common.cc | 25 +++++++++++-------------- interfaces/Prolog/ppl_prolog_common.defs.hh | 2 +- interfaces/Prolog/tests/pl_check.pl | 9 ++++++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 2b5a2bc..1c945a2 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -1405,13 +1405,11 @@ grid_generator_term(const Grid_Generator& g) { } Prolog_term_ref - artificial_parameter_term(const PIP_Tree_Node::Artificial_Parameter& art) { +artificial_parameter_term(const PIP_Tree_Node::Artificial_Parameter& art) { Prolog_term_ref t = Prolog_new_term_ref(); - Prolog_construct_compound - (t, - a_divided_by, - get_linear_expression(art), - Coefficient_to_integer_term(art.denominator())); + Prolog_construct_compound(t, a_divided_by, + get_linear_expression(art), + Coefficient_to_integer_term(art.denominator())); return t; } @@ -3036,25 +3034,24 @@ ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_pip, CATCH_ALL; } -/* FIXME: (Commented) test in pl_check.pl gives segmentation fault! */ extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_pip, +ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, Prolog_term_ref t_artlist) { static const char* where = "ppl_PIP_Tree_Node_artificials/2"; try { - const PIP_Tree_Node* pip = term_to_handle<PIP_Tree_Node>(t_pip, where); - PPL_CHECK(pip); + const PIP_Tree_Node* node + = term_to_handle<PIP_Tree_Node>(t_tree_node, where); + PPL_CHECK(node); Prolog_term_ref tail = Prolog_new_term_ref(); Prolog_put_atom(tail, a_nil); for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator - i = pip->art_parameter_begin(), - arts_end = pip->art_parameter_end(); i != arts_end; ++i) + i = node->art_parameter_begin(), + arts_end = node->art_parameter_end(); i != arts_end; ++i) Prolog_construct_cons(tail, artificial_parameter_term(*i), tail); - if (Prolog_unify(t_artlist, tail)) { + if (Prolog_unify(t_artlist, tail)) return PROLOG_SUCCESS; - } } CATCH_ALL; } diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index e935de8..e1be161 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -1054,7 +1054,7 @@ ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_tree_node, Prolog_term_ref t_dec_node); extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_pip_tree, +ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, Prolog_term_ref t_artlist); extern "C" Prolog_foreign_return_type diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index d0cb260..0db2379 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2457,9 +2457,8 @@ pip_solution :- clean_ppl_new_PIP_Problem( 4, [3*J >= -2*I + 8, J =< 4*I - 4, J =< M, I =< N], [M,N], PIP), ppl_PIP_Problem_solution(PIP, Tree_Node), -%% ppl_PIP_Tree_Node_artificials(PIP, Artificials), -%% write(Artificials), nl, -%% compare_artificials_lists(Artificials, ), + ppl_PIP_Tree_Node_artificials(Tree_Node, Artificials), + Artificials = [], \+ ppl_PIP_Tree_Node_as_solution(Tree_Node, _Sol), ppl_PIP_Tree_Node_constraints(Tree_Node, _CS), ppl_PIP_Tree_Node_as_decision(Tree_Node, Dec), @@ -2472,6 +2471,10 @@ pip_solution :- ppl_PIP_Tree_Node_as_solution(TTChild, TTChild_Sol), ppl_PIP_Solution_Node_get_parametric_values(TTChild_Sol, I, _TPV), ppl_PIP_Decision_Node_get_false_child(TChild_Dec, FTChild), + ppl_PIP_Tree_Node_artificials(FTChild, FTChild_Artificials), + FTChild_Artificials = [Art_LinExpr/Art_Den], + compare_lin_expressions(Art_LinExpr, M), + Art_Den = 2, ppl_PIP_Tree_Node_as_solution(FTChild, FTChild_Sol), ppl_PIP_Solution_Node_get_parametric_values(FTChild_Sol, I, _FPV), ppl_PIP_Problem_OK(PIP),

1 0

[GIT] ppl/ppl(master): Fixed Java interface for PIP_Decision_Node:: child_node(branch).
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: a72963f00f6c6bec5367543096149785c7b4a2e0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a72963f00f6c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 18:44:27 2010 +0200 Fixed Java interface for PIP_Decision_Node::child_node(branch). New interface has a (unboxed) boolean parameter. --- interfaces/Java/jni/ppl_java_globals.cc | 14 +++++++------- .../parma_polyhedra_library/PIP_Decision_Node.java | 7 +++---- interfaces/Java/tests/PIP_Problem_test1.java | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 457ea45..8b28785 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -2012,15 +2012,15 @@ Java_parma_1polyhedra_1library_PIP_1Tree_1Node_artificials JNIEXPORT jobject JNICALL Java_parma_1polyhedra_1library_PIP_1Decision_1Node_child_1node -(JNIEnv* env, jobject j_this, jobject j_branch) { +(JNIEnv* env, jobject j_this, jboolean j_branch) { try { - PIP_Decision_Node* pip + PIP_Decision_Node* dec_node = reinterpret_cast<PIP_Decision_Node*>(get_ptr(env, j_this)); - unsigned u = jtype_to_unsigned<unsigned>(j_integer_to_j_int(env, j_branch)); - bool b = (u == 0) ? false : true; - const PIP_Tree_Node* child - = pip->child_node(b); - + const PIP_Tree_Node* child = dec_node->child_node(j_branch); + if (child == 0) { + jobject null = 0; + return null; + } jclass j_class_s = env->FindClass("parma_polyhedra_library/PIP_Tree_Node"); CHECK_RESULT_ASSERT(env, j_class_s); jmethodID j_ctr_id_s = env->GetMethodID(j_class_s, "<init>", "()V"); diff --git a/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java b/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java index d13ac53..3af54da 100644 --- a/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java +++ b/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java @@ -30,9 +30,8 @@ import java.io.IOException; public class PIP_Decision_Node extends PIP_Tree_Node { /*! \brief - Returns a the true branch (if \p b is not zero) - or the false branch (if \p b is zero) of \p pip_dec. + Returns the true branch (if \p branch is true) + or the false branch (if \p branch is false) of \p this. */ - /* FIXME: j_branch should be a boolean. */ - public native PIP_Tree_Node child_node(Integer j_branch); + public native PIP_Tree_Node child_node(boolean branch); } diff --git a/interfaces/Java/tests/PIP_Problem_test1.java b/interfaces/Java/tests/PIP_Problem_test1.java index 78e5621..d36b8e7 100644 --- a/interfaces/Java/tests/PIP_Problem_test1.java +++ b/interfaces/Java/tests/PIP_Problem_test1.java @@ -380,7 +380,7 @@ static { if (relsym != Relation_Symbol.GREATER_OR_EQUAL || (le_left.is_zero()) || (le_right.is_zero())) return false; - PIP_Tree_Node root_true_branch = root.child_node(1); + PIP_Tree_Node root_true_branch = root.child_node(true); if (root_true_branch == null) return false; @@ -406,9 +406,9 @@ static { || (le_left2.is_zero()) || (le_right2.is_zero())) return false; - if (t_child.child_node(1) == null) + if (t_child.child_node(true) == null) return false; - PIP_Solution_Node t_t_child = t_child.child_node(1).as_solution(); + PIP_Solution_Node t_t_child = t_child.child_node(true).as_solution(); if (t_t_child == null || !t_t_child.OK()) return false; @@ -421,7 +421,7 @@ static { Linear_Expression v_i = t_t_child.parametric_values(I); Linear_Expression v_j = t_t_child.parametric_values(J); - PIP_Solution_Node t_f_child = t_child.child_node(0).as_solution(); + PIP_Solution_Node t_f_child = t_child.child_node(false).as_solution(); if (t_f_child == null || !t_f_child.OK()) return false;

1 0