April 2010 - PPL-devel - BUGSENG Mailman

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

02 Apr '10

Module: ppl/ppl Branch: master Commit: daa93a691f89a54975ae2d457ff43ee25df9eaa9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=daa93a691f89… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 13:00:27 2010 +0100 Type fixed. --- .../Artificial_Parameter_Sequence.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java index 9fac898..c8dd38f 100644 --- a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java +++ b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java @@ -28,7 +28,7 @@ import java.io.IOException; //! A sequence of artificial parameters. /*! \ingroup PPL_Java_interface An object of the class Artificial_Parameter_Sequence is a - sequence of atrtificial parameters. + sequence of artificial parameters. */ public class Artificial_Parameter_Sequence extends java.util.Vector<Artificial_Parameter> {

1 0

[GIT] ppl/ppl(master): Restored previously removed method PIP_Problem_constraints().
by Patricia Hill 02 Apr '10

02 Apr '10

Module: ppl/ppl Branch: master Commit: a8098a8c8f00141390bde6197d7f96aa750afd70 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a8098a8c8f00… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 12:58:56 2010 +0100 Restored previously removed method PIP_Problem_constraints(). --- interfaces/Java/jni/ppl_java_globals.cc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 3fa8e41..457ea45 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -1834,6 +1834,31 @@ Java_parma_1polyhedra_1library_PIP_1Problem_constraint_1at_1index return null; } +JNIEXPORT jobject JNICALL +Java_parma_1polyhedra_1library_PIP_1Problem_constraints +(JNIEnv* env, jobject j_this_pip_problem) { + try { + jobject j_cs = env->NewObject(cached_classes.Constraint_System, + cached_FMIDs.Constraint_System_init_ID); + CHECK_RESULT_RETURN(env, j_cs, 0); + + PIP_Problem* pip + = reinterpret_cast<PIP_Problem*>(get_ptr(env, j_this_pip_problem)); + for (PIP_Problem::const_iterator cs_it = pip->constraints_begin(), + cs_end = pip->constraints_end(); cs_it != cs_end; ++cs_it) { + jobject j_constraint = build_java_constraint(env, *cs_it); + env->CallBooleanMethod(j_cs, + cached_FMIDs.Constraint_System_add_ID, + j_constraint); + CHECK_EXCEPTION_RETURN(env, 0); + } + return j_cs; + } + CATCH_ALL; + jobject null = 0; + return null; +} + JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_PIP_1Problem_set_1pip_1problem_1control_1parameter (JNIEnv* env, jobject j_this_pip_problem, jobject j_cpv) {

1 0

[GIT] ppl/ppl(master): Tests added.
by Patricia Hill 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: 1b2dac6f55ee22faced4501a6ec216eeb29ff408 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b2dac6f55ee… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 1 17:25:42 2010 +0100 Tests added. Some tests marked as expected to fail indicating bug(s) in the code. --- tests/BD_Shape/Makefile.am | 3 + tests/BD_Shape/dropsomenonintegerpoints1.cc | 343 +++++++++++++++++++ tests/Octagonal_Shape/Makefile.am | 3 + tests/Octagonal_Shape/dropsomenonintegerpoints1.cc | 345 ++++++++++++++++++++ 4 files changed, 694 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1b2dac6f…

1 0

[GIT] ppl/ppl(master): Varios bug fixes and small improvements.
by Patricia Hill 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: c068dabdd90cec7104c1d0ca5f3ddcbcc29a21a8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c068dabdd90c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 1 14:48:14 2010 +0100 Varios bug fixes and small improvements. A clone of test02 in pipproblem1.cc added to the Java tests. FIXME added to jni/ppl_java_common.cc --- interfaces/Java/jni/ppl_java_common.cc | 16 ++ interfaces/Java/jni/ppl_java_common.defs.hh | 9 +- interfaces/Java/jni/ppl_java_common.inlines.hh | 8 + interfaces/Java/jni/ppl_java_globals.cc | 93 ++++++--- .../Artificial_Parameter_Sequence.java | 6 - .../parma_polyhedra_library/PIP_Decision_Node.java | 3 +- .../parma_polyhedra_library/PIP_Solution_Node.java | 2 +- .../parma_polyhedra_library/PIP_Tree_Node.java | 10 + interfaces/Java/tests/PIP_Problem_test1.java | 205 +++++++++++++++++--- 9 files changed, 288 insertions(+), 64 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c068dabd…

1 0

[GIT] ppl/ppl(master): Added "quasi ranking functions" generation procedures to OCaml interface.
by Enea Zaffanella 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: 0006315311935e1d87c70bfa788ed15e6488b38a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=000631531193… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 1 09:47:46 2010 +0200 Added "quasi ranking functions" generation procedures to OCaml interface. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 53 ++++++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 16 ++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 14 +++++ ...terface_generator_ocaml_procedure_generators.m4 | 2 + 4 files changed, 85 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 bb7984e..ad58ad4 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -1391,6 +1391,59 @@ CATCH_ALL ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ + (value pset) + try { + CAMLparam1(pset); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + all_affine_quasi_ranking_functions_MS(ppset, *ph_decreasing, *ph_bounded); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, + unregistered_value_p_Polyhedron(*ph_decreasing)); + Store_field(caml_return_value, 1, + unregistered_value_p_Polyhedron(*ph_bounded)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 + (value pset_before, value pset_after) + try { + CAMLparam2(pset_before, pset_after); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_before))); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_after))); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + all_affine_quasi_ranking_functions_MS_2(ppset_before, ppset_after, + *ph_decreasing, *ph_bounded); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, + unregistered_value_p_Polyhedron(*ph_decreasing)); + Store_field(caml_return_value, 1, + unregistered_value_p_Polyhedron(*ph_bounded)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_wrap_assign_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 4268a25..160121b 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -619,6 +619,22 @@ external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron * polyhedron + = "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron * polyhedron + = "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2" + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `dnl external ppl_@CLASS@_wrap_assign: @!CLASS@ diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index 86efeaa..df7eb0e 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -538,6 +538,20 @@ val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron * polyhedron + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron * polyhedron + +') + val ppl_@CLASS@_wrap_assign: @!CLASS@ -> bounded_integer_type_width -> bounded_integer_type_representation diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index 8b8ff38..19832d2 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -46,9 +46,11 @@ m4_define(`m4_procedure_list', ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ +simple, ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 +simple, ) ')

1 0