- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Completed draft Java interface for PIP_Problem ( untested).
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 08a88693cc732a773db32c70afe8b85d64a2c67f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08a88693cc73… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 15:12:11 2010 +0100 Completed draft Java interface for PIP_Problem (untested). --- interfaces/Java/jni/ppl_java_globals.cc | 31 ++++++++++++------- .../Constraint_System_Iterator.java | 4 ++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index f05c6e9..d253fe2 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -1474,7 +1474,8 @@ Java_parma_1polyhedra_1library_IO_wrap_1string jint preferred_first_line_length, jint preferred_line_length) { try { unsigned ind = jtype_to_unsigned<unsigned int>(indent_depth); - unsigned pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length); + unsigned pfll = jtype_to_unsigned<unsigned int> + (preferred_first_line_length); unsigned pll = jtype_to_unsigned<unsigned int>(preferred_line_length); const char* chars = env->GetStringUTFChars(str, 0); CHECK_RESULT_RETURN(env, chars, 0); @@ -1549,9 +1550,11 @@ Java_parma_1polyhedra_1library_Constraint_1System_1Iterator_equals (JNIEnv* env, jobject j_this, jobject j_y) { try { Constraint_System::const_iterator* this_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_this)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_this)); Constraint_System::const_iterator* y_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_y)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_y)); return *this_ptr == *y_ptr; } CATCH_ALL; @@ -1562,7 +1565,8 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Constraint_1System_1Iterator_next (JNIEnv* env, jobject j_this) try { Constraint_System::const_iterator* this_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_this)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_this)); ++(*this_ptr); } CATCH_ALL @@ -1572,7 +1576,8 @@ Java_parma_1polyhedra_1library_Constraint_1System_1Iterator_get_1constraint (JNIEnv* env, jobject j_this) { try { Constraint_System::const_iterator* this_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_this)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_this)); jclass j_class = env->FindClass("parma_polyhedra_library/Constraint"); CHECK_RESULT_ASSERT(env, j_class); jmethodID j_ctr_id = env->GetMethodID(j_class, "<init>", "()V"); @@ -1592,7 +1597,8 @@ Java_parma_1polyhedra_1library_Constraint_1System_1Iterator_free (JNIEnv* env, jobject j_this) try { if (!is_java_marked(env, j_this)) { Constraint_System::const_iterator* this_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_this)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_this)); delete this_ptr; void* null_ptr = 0; set_ptr(env, j_this, null_ptr); @@ -1605,7 +1611,8 @@ Java_parma_1polyhedra_1library_Constraint_1System_1Iterator_finalize (JNIEnv* env, jobject j_this) try { if (!is_java_marked(env, j_this)) { Constraint_System::const_iterator* this_ptr - = reinterpret_cast<Constraint_System::const_iterator*>(get_ptr(env, j_this)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_this)); delete this_ptr; } } @@ -1622,7 +1629,6 @@ Java_parma_1polyhedra_1library_PIP_1Problem_build_1cpp_1object__J CATCH_ALL; } -/* JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_PIP_1Problem_build_1cpp_1object__JLparma_1polyhedra_1library_Constraint_1System_1Iterator_2Lparma_1polyhedra_1library_Constraint_1System_1Iterator_2Lparma_1polyhedra_1library_Variables_1Set_2 (JNIEnv* env , jobject j_this_pip_problem, jlong j_dim, @@ -1630,16 +1636,17 @@ Java_parma_1polyhedra_1library_PIP_1Problem_build_1cpp_1object__JLparma_1polyhed try { dimension_type p_dim = jtype_to_unsigned<dimension_type>(j_dim); Constraint_System::const_iterator* p_first - = reinterpret_cast<Constraint_System::iterator*>(get_ptr(env, j_first)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_first)); Constraint_System::const_iterator* p_last - = reinterpret_cast<Constraint_System::iterator*>(get_ptr(env, j_last)); + = reinterpret_cast<Constraint_System::const_iterator*> + (get_ptr(env, j_last)); Variables_Set p_vars = build_cxx_variables_set(env, j_vars); - PIP_Problem* pip_ptr = new PIP_Problem(p_dim, p_first, p_last, p_vars); + PIP_Problem* pip_ptr = new PIP_Problem(p_dim, *p_first, *p_last, p_vars); set_ptr(env, j_this_pip_problem, pip_ptr); } CATCH_ALL; } -*/ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_PIP_1Problem_build_1cpp_1object__Lparma_1polyhedra_1library_PIP_1Problem_2 diff --git a/interfaces/Java/parma_polyhedra_library/Constraint_System_Iterator.java b/interfaces/Java/parma_polyhedra_library/Constraint_System_Iterator.java index 6a68570..d27eb74 100644 --- a/interfaces/Java/parma_polyhedra_library/Constraint_System_Iterator.java +++ b/interfaces/Java/parma_polyhedra_library/Constraint_System_Iterator.java @@ -41,6 +41,10 @@ public class Constraint_System_Iterator extends PPL_Object { public native boolean equals(Constraint_System_Iterator itr); + public native void begin(); + + public native void end(); + public native void next(); public native Constraint get_constraint();

1 0

[GIT] ppl/ppl(master): Added Java interface tests for termination_test_MS,
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: d083ca77b75e1ddf570221c57680a00cd0a35b52 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d083ca77b75e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 11:30:48 2010 +0100 Added Java interface tests for termination_test_MS, termination_test_PR, termination_test_MS_2 and termination_test_PR_2 --- interfaces/Java/tests/NNC_Polyhedron_test1.java | 31 ++++++++++++++++++++ .../ppl_interface_generator_java_test_java_code.m4 | 26 ++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/tests/NNC_Polyhedron_test1.java b/interfaces/Java/tests/NNC_Polyhedron_test1.java index d3efe92..4de59cb 100644 --- a/interfaces/Java/tests/NNC_Polyhedron_test1.java +++ b/interfaces/Java/tests/NNC_Polyhedron_test1.java @@ -82,6 +82,37 @@ static { return cs.isEmpty(); } + public static boolean test03() { + // Test termination methods. + Variable X1 = new Variable(0); + Variable X2 = new Variable(1); + Variable XP1 = new Variable(2); + Variable XP2 = new Variable(3); + NNC_Polyhedron ph = new NNC_Polyhedron(4, Degenerate_Element.UNIVERSE); + Coefficient coeff_1 = new Coefficient(1); + Coefficient coeff_0 = new Coefficient(0); + Linear_Expression le_X1 = new Linear_Expression_Variable(X1); + Linear_Expression le_X2 = new Linear_Expression_Variable(X2); + Linear_Expression le_XP1 = new Linear_Expression_Variable(XP1); + Linear_Expression le_XP2 = new Linear_Expression_Variable(XP2); + Linear_Expression le_1 = new Linear_Expression_Coefficient(coeff_1); + Linear_Expression le_0 = new Linear_Expression_Coefficient(coeff_0); + Linear_Expression le_X1_difference_XP1 = le_X1.sum(le_XP1); + Constraint c_XP2_eq_1 + = new Constraint(le_XP2, Relation_Symbol.EQUAL, le_1); + Constraint c_X1_geq_1 + = new Constraint(le_X1, Relation_Symbol.GREATER_OR_EQUAL, le_1); + Constraint c_X1_minus_XP1_geq_1 + = new Constraint(le_X1_difference_XP1, Relation_Symbol.GREATER_OR_EQUAL, le_1); + Constraint c_X2_leq_0 + = new Constraint(le_X2, Relation_Symbol.LESS_OR_EQUAL, le_0); + ph.add_constraint(c_XP2_eq_1); + ph.add_constraint(c_X1_geq_1); + ph.add_constraint(c_X1_minus_XP1_geq_1); + ph.add_constraint(c_X2_leq_0); + return Termination.termination_test_MS_NNC_Polyhedron(ph); + } + public static void main(String[] args) { Parma_Polyhedra_Library.initialize_library(); boolean test_result_ok = 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 764edf5..f605d58 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 @@ -897,4 +897,30 @@ m4_define(`ppl_free_@CLASS@_code', ') +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_codexxx', + `dnl +{ + PPL_Test.print_if_noisy("Testing termination_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: "); + @TOPOLOGY@@CLASS@ gd1 = new @TOPOLOGY@@CLASS@(@CONSTRAINER@s1); + boolean term = Termination.termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(gd1); + report_success_or_failure(gd1.OK() && term); + gd1.free(); +} + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_codexxx', + `dnl +{ + PPL_Test.print_if_noisy("Testing termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: "); + @TOPOLOGY@@CLASS@ gd1 = new @TOPOLOGY@@CLASS@(@CONSTRAINER@s1); + @TOPOLOGY@@CLASS@ gd2 = new @TOPOLOGY@@CLASS@(@CONSTRAINER@s2); + boolean term = Termination.termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(gd1, gd2); + report_success_or_failure(gd1.OK() && gd2.OK() && term); + gd1.free(); + gd2.free(); +} + +') + m4_divert`'dnl

1 0

[GIT] ppl/ppl(master): Enable Java interface for termination procedures ( and corrected bugs).
by Enea Zaffanella 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 09db70209198b5acc3d35c423323196c0a56d35f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=09db70209198… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Mar 30 11:53:00 2010 +0200 Enable Java interface for termination procedures (and corrected bugs). --- interfaces/Java/jni/Makefile.am | 5 +- ...ppl_interface_generator_java_classes_cc_code.m4 | 64 ++++++++++---------- .../Java/parma_polyhedra_library/Makefile.am | 2 +- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/interfaces/Java/jni/Makefile.am b/interfaces/Java/jni/Makefile.am index 79d7919..ce947ef 100644 --- a/interfaces/Java/jni/Makefile.am +++ b/interfaces/Java/jni/Makefile.am @@ -106,6 +106,7 @@ ppl_java_common.cc \ ppl_java_globals.cc nodist_EXTRA_libppl_java_la_SOURCES = \ +ppl_java_Termination.cc \ ppl_java_Int8_Box.cc \ ppl_java_Int16_Box.cc \ ppl_java_Int32_Box.cc \ @@ -179,12 +180,14 @@ ppl_java_Constraints_Product_Grid_C_Polyhedron.cc \ ppl_java_Constraints_Product_Grid_NNC_Polyhedron.cc libppl_java_la_LIBADD = \ +ppl_java_Termination.lo \ @required_instantiations_java_cxx_objects@ \ $(top_builddir)/src/libppl.la \ $(WATCHDOG_LIBRARY) \ @extra_libraries@ libppl_java_la_DEPENDENCIES = \ +ppl_java_Termination.lo \ @required_instantiations_java_cxx_objects@ ppl_java_implementation_domains.cc.stamp: $(interface_generator_dependencies) @@ -198,8 +201,8 @@ ppl_java_implementation_domains.cc.stamp: $(interface_generator_dependencies) echo timestamp >$@ CLEANFILES = \ -@required_instantiations_java_cxx_sources@ \ ppl_java_Termination.cc \ +@required_instantiations_java_cxx_sources@ \ ppl_java_implementation_domains.cc.stamp $(top_builddir)/interfaces/ppl_interface_instantiations.m4: 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 3c09592..256acec 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 @@ -1387,8 +1387,8 @@ JNIEXPORT jboolean JNICALL Java_parma_1polyhedra_1library_Termination_termination_1test_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ (JNIEnv* env, jclass, jobject j_p) { try { - @TOPOLOGY@@CLASS@* p_ptr - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + @TOPOLOGY@@CPP_CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p)); return termination_test_@TERMINATION_ID@(*p_ptr); } CATCH_ALL; @@ -1406,10 +1406,10 @@ JNIEXPORT jboolean JNICALL Java_parma_1polyhedra_1library_Termination_termination_1test_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 (JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after) { try { - @TOPOLOGY@@CLASS@* p_ptr_before - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); - @TOPOLOGY@@CLASS@* p_ptr_after - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_after)); return termination_test_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after); } CATCH_ALL; @@ -1427,8 +1427,8 @@ JNIEXPORT jboolean JNICALL Java_parma_1polyhedra_1library_Termination_one_1affine_1ranking_1function_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ (JNIEnv* env, jclass, jobject j_p, jobject j_g) { try { - @TOPOLOGY@@CLASS@* p_ptr - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + @TOPOLOGY@@CPP_CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p)); Generator g(point()); if (one_affine_ranking_function_@TERMINATION_ID@(*p_ptr, g)) { jobject j_g_result = build_java_generator(env, g);; @@ -1450,12 +1450,12 @@ ___BEGIN_OF_FILE___ ppl_java_Termination.cc << ___END_OF_FILE___ JNIEXPORT jboolean JNICALL Java_parma_1polyhedra_1library_Termination_one_1affine_1ranking_1function_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 -(JNIEnv* env, jclass, jobject j_p_before, jobject j_g_after) { +(JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after, jobject j_g) { try { - @TOPOLOGY@@CLASS@* p_ptr_before - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); - @TOPOLOGY@@CLASS@* p_ptr_after - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_after)); Generator g(point()); if (one_affine_ranking_function_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after, g)) { jobject j_g_result = build_java_generator(env, g);; @@ -1479,11 +1479,11 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Termination_all_1affine_1ranking_1functions_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ (JNIEnv* env, jclass, jobject j_p, jobject j_ph) { try { - @TOPOLOGY@@CLASS@* p_ptr - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + @TOPOLOGY@@CPP_CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p)); @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); - all_affine_ranking_functions_@TERMINATION_ID@(*p_ptr, *ph) { - set_ptr(env, j_ph, *ph); + all_affine_ranking_functions_@TERMINATION_ID@(*p_ptr, *ph); + set_ptr(env, j_ph, ph); } CATCH_ALL; } @@ -1499,13 +1499,13 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Termination_all_1affine_1ranking_1functions_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 (JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after, jobject j_ph) { try { - @TOPOLOGY@@CLASS@* p_ptr_before - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); - @TOPOLOGY@@CLASS@* p_ptr_after - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_after)); @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); all_affine_ranking_functions_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after, *ph); - set_ptr(env, j_ph, *ph); + set_ptr(env, j_ph, ph); } CATCH_ALL; } @@ -1522,13 +1522,13 @@ Java_parma_1polyhedra_1library_Termination_all_1affine_1quasi_1ranking_1function (JNIEnv* env, jclass, jobject j_p, jobject j_ph_decreasing, jobject j_ph_bounded) { try { - @TOPOLOGY@@CLASS@* p_ptr - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + @TOPOLOGY@@CPP_CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p)); C_Polyhedron* ph_decreasing = new C_Polyhedron(); C_Polyhedron* ph_bounded = new C_Polyhedron(); all_affine_quasi_ranking_functions_MS(*p_ptr, *ph_decreasing, *ph_bounded); - set_ptr(env, j_ph_decreasing, *ph_decreasing); - set_ptr(env, j_ph_bounded, *ph_bounded); + set_ptr(env, j_ph_decreasing, ph_decreasing); + set_ptr(env, j_ph_bounded, ph_bounded); } CATCH_ALL; } @@ -1545,16 +1545,16 @@ Java_parma_1polyhedra_1library_Termination_all_1affine_1quasi_1ranking_1function (JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after, jobject j_ph_decreasing, jobject j_ph_bounded) { try { - @TOPOLOGY@@CLASS@* p_ptr_before - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); - @TOPOLOGY@@CLASS@* p_ptr_after - = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CPP_CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(get_ptr(env, j_p_after)); C_Polyhedron* ph_decreasing = new C_Polyhedron(); C_Polyhedron* ph_bounded = new C_Polyhedron(); all_affine_quasi_ranking_functions_MS_2(*p_ptr_before, *p_ptr_after, *ph_decreasing, *ph_bounded); - set_ptr(env, j_ph_decreasing, *ph_decreasing); - set_ptr(env, j_ph_bounded, *ph_bounded); + set_ptr(env, j_ph_decreasing, ph_decreasing); + set_ptr(env, j_ph_bounded, ph_bounded); } CATCH_ALL; } diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 6de00bb..a87bf56 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -78,7 +78,7 @@ parma_polyhedra_library.Poly_Con_Relation \ parma_polyhedra_library.Poly_Gen_Relation \ parma_polyhedra_library.PPL_Object \ parma_polyhedra_library.Relation_Symbol \ -parma_polyhedra_library.Termination \ +parma_polyhedra_library.Termination \ parma_polyhedra_library.Variable \ parma_polyhedra_library.Variables_Set

1 0

[GIT] ppl/ppl(master): Whitespace bug fixed.
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 424dcc2421483d60d936f3c1b724d237325adc18 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=424dcc242148… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 09:12:22 2010 +0100 Whitespace bug fixed. --- interfaces/Java/jni/ppl_java_common.cc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 5c79670..fef4484 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -1153,7 +1153,7 @@ build_java_constraint_system(JNIEnv* env, const Constraint_System& cs) { cached_FMIDs.Constraint_System_init_ID); CHECK_RESULT_THROW(env, j_cs); for (Constraint_System::const_iterator v_begin = cs.begin(), - v_end = cs.end(); v_begin != v_end; ++v_begin) { + v_end = cs.end(); v_begin != v_end; ++v_begin) { jobject j_constraint = build_java_constraint(env, *v_begin); env->CallBooleanMethod(j_cs, cached_FMIDs.Constraint_System_add_ID, @@ -1169,7 +1169,7 @@ build_java_generator_system(JNIEnv* env, const Generator_System& gs) { cached_FMIDs.Generator_System_init_ID); CHECK_RESULT_THROW(env, j_gs); for (Generator_System::const_iterator v_begin = gs.begin(), - v_end = gs.end(); v_begin != v_end; ++v_begin) { + v_end = gs.end(); v_begin != v_end; ++v_begin) { jobject j_generator = build_java_generator(env, *v_begin); env->CallBooleanMethod(j_gs, cached_FMIDs.Generator_System_add_ID, @@ -1186,7 +1186,7 @@ build_java_grid_generator_system(JNIEnv* env, cached_FMIDs.Grid_Generator_System_init_ID); CHECK_RESULT_THROW(env, j_gs); for (Grid_Generator_System::const_iterator v_begin = gs.begin(), - v_end = gs.end(); v_begin != v_end; ++v_begin) { + v_end = gs.end(); v_begin != v_end; ++v_begin) { jobject j_generator = build_java_grid_generator(env, *v_begin); env->CallBooleanMethod(j_gs, cached_FMIDs.Grid_Generator_System_add_ID, @@ -1202,7 +1202,7 @@ build_java_congruence_system(JNIEnv* env, const Congruence_System& cgs) { cached_FMIDs.Congruence_System_init_ID); CHECK_RESULT_THROW(env, j_cgs); for (Congruence_System::const_iterator v_begin = cgs.begin(), - v_end = cgs.end(); v_begin != v_end; ++v_begin) { + v_end = cgs.end(); v_begin != v_end; ++v_begin) { jobject j_congruence = build_java_congruence(env,*v_begin); env->CallBooleanMethod(j_cgs, cached_FMIDs.Congruence_System_add_ID, @@ -1217,8 +1217,9 @@ build_java_artificial_parameter_sequence(JNIEnv* env, const PIP_Tree_Node::Artif jobject j_aps = env->NewObject(cached_classes.Artificial_Parameter_Sequence, cached_FMIDs.Artificial_Parameter_Sequence_init_ID); CHECK_RESULT_THROW(env, j_aps); - for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator v_begin = aps.begin(), - v_end = aps.end(); v_begin != v_end; ++v_begin) { + for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator v_begin + = aps.begin(), + v_end = aps.end(); v_begin != v_end; ++v_begin) { jobject j_aps = build_java_artificial_parameter(env, *v_begin); env->CallBooleanMethod(j_aps, cached_FMIDs.Artificial_Parameter_Sequence_add_ID,

1 0

[GIT] ppl/ppl(master): Almost complete (but untested) Java interface to the PIP_Problem
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: dae0d2224e1ebd9a073a6b7ee1f2755c0420d4ea URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dae0d2224e1e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 09:06:27 2010 +0100 Almost complete (but untested) Java interface to the PIP_Problem --- interfaces/Java/jni/ppl_java_common.cc | 157 ++++ interfaces/Java/jni/ppl_java_common.defs.hh | 91 +++ interfaces/Java/jni/ppl_java_globals.cc | 822 ++++++++++++++++++++ .../Artificial_Parameter.java | 70 ++ .../Artificial_Parameter_Sequence.java | 44 + .../Artificial_Parameter_Sequence_Iterator.java | 57 ++ .../Constraint_System_Iterator.java | 53 ++ .../Java/parma_polyhedra_library/Makefile.am | 44 + .../parma_polyhedra_library/PIP_Decision_Node.java | 37 + .../Java/parma_polyhedra_library/PIP_Problem.java | 330 ++++++++ .../PIP_Problem_Control_Parameter_Name.java | 32 + .../PIP_Problem_Control_Parameter_Value.java | 38 + .../PIP_Problem_Status.java | 37 + .../parma_polyhedra_library/PIP_Solution_Node.java | 43 + .../parma_polyhedra_library/PIP_Tree_Node.java | 84 ++ 15 files changed, 1939 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=dae0d222…

1 0

[GIT] ppl/ppl(master): Corrected several errors in Java interface for termination test procedures .
by Enea Zaffanella 29 Mar '10

29 Mar '10

Module: ppl/ppl Branch: master Commit: 3f296c7dd6be1f8e0994b6e80fa8ac846baeb178 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f296c7dd6be… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 29 20:20:25 2010 +0200 Corrected several errors in Java interface for termination test procedures. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 93 +++++++++++++------- ...l_interface_generator_java_classes_java_code.m4 | 40 +++++++-- ...nterface_generator_java_procedure_generators.m4 | 4 +- .../ppl_interface_generator_java_test_java_code.m4 | 8 +- 4 files changed, 99 insertions(+), 46 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=3f296c7d…

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 29 Mar '10

29 Mar '10

Module: ppl/ppl Branch: master Commit: fccd1989cdc058baccd35ac4e0127a9956254fe9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fccd1989cdc0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 29 19:21:57 2010 +0400 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index dcab740..e8c0fbc 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.11pre16], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre17], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Added to Prolog interface the predicates for quasi-ranking functions.
by Enea Zaffanella 29 Mar '10

29 Mar '10

Module: ppl/ppl Branch: master Commit: f7c33880fca5903781922d35eb284d4e8e44c623 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f7c33880fca5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 29 10:08:20 2010 +0200 Added to Prolog interface the predicates for quasi-ranking functions. --- .../ppl_interface_generator_prolog_cc_code.m4 | 124 ++++++++++++++++---- .../ppl_interface_generator_prolog_hh_code.m4 | 19 +++ ...erface_generator_prolog_procedure_generators.m4 | 2 + 3 files changed, 121 insertions(+), 24 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 39dcd33..de6a103 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1243,7 +1243,7 @@ m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', @TOPOLOGY@@CPP_CLASS@* pset = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset, where); PPL_CHECK(pset); if (Parma_Polyhedra_Library::termination_test_@TERMINATION_ID@(*pset)) - return PROLOG_SUCCESS; + return PROLOG_SUCCESS; } CATCH_ALL; } @@ -1265,7 +1265,7 @@ m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', PPL_CHECK(pset_after); if (Parma_Polyhedra_Library ::termination_test_@TERMINATION_ID@_2(*pset_before, *pset_after)) - return PROLOG_SUCCESS; + return PROLOG_SUCCESS; } CATCH_ALL; } @@ -1285,8 +1285,8 @@ m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_co PPL_CHECK(pset); if (Parma_Polyhedra_Library ::one_affine_ranking_function_@TERMINATION_ID@(*pset, gg) - && Prolog_unify(t_g, generator_term(gg))) - return PROLOG_SUCCESS; + && Prolog_unify(t_g, generator_term(gg))) + return PROLOG_SUCCESS; } CATCH_ALL; } @@ -1310,16 +1310,17 @@ m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_ PPL_CHECK(pset_before); PPL_CHECK(pset_after); if (Parma_Polyhedra_Library - ::one_affine_ranking_function_@TERMINATION_ID@_2(*pset_before, - *pset_after, - gg) + ::one_affine_ranking_function_@TERMINATION_ID@_2(*pset_before, + *pset_after, + gg) && Prolog_unify(t_g, generator_term(gg))) - return PROLOG_SUCCESS; + return PROLOG_SUCCESS; } CATCH_ALL; } ') + m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', `extern "C" Prolog_foreign_return_type ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ @@ -1333,15 +1334,14 @@ m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_c @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); Parma_Polyhedra_Library ::all_affine_ranking_functions_@TERMINATION_ID@(*pset, *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 + 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; } @@ -1368,15 +1368,91 @@ m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 ::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 + 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_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', + `extern "C" Prolog_foreign_return_type + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ + (Prolog_term_ref t_pset, + Prolog_term_ref t_ph_decreasing, + Prolog_term_ref t_ph_bounded) { + static const char* where = + "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@/3"; + try { + @TOPOLOGY@@CPP_CLASS@* pset = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset, where); + PPL_CHECK(pset); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + Parma_Polyhedra_Library + ::all_affine_quasi_ranking_functions_MS(*pset, + *ph_decreasing, *ph_bounded); + Prolog_term_ref tmp_decreasing = Prolog_new_term_ref(); + Prolog_put_address(tmp_decreasing, ph_decreasing); + Prolog_term_ref tmp_bounded = Prolog_new_term_ref(); + Prolog_put_address(tmp_bounded, ph_bounded); + if (Prolog_unify(t_ph_decreasing, tmp_decreasing) + && Prolog_unify(t_ph_bounded, tmp_bounded)) { + PPL_REGISTER(ph_decreasing); + PPL_REGISTER(ph_bounded); + return PROLOG_SUCCESS; + } + else { + delete ph_decreasing; + delete ph_bounded; + } + } + CATCH_ALL; +} + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_ph_decreasing, + Prolog_term_ref t_ph_bounded) { + static const char* where = + "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2/4"; + try { + @TOPOLOGY@@CPP_CLASS@* pset_before + = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset_before, where); + @TOPOLOGY@@CPP_CLASS@* pset_after + = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset_after, where); + PPL_CHECK(pset_before); + PPL_CHECK(pset_after); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + Parma_Polyhedra_Library + ::all_affine_quasi_ranking_functions_MS_2(*pset_before, *pset_after, + *ph_decreasing, *ph_bounded); + Prolog_term_ref tmp_decreasing = Prolog_new_term_ref(); + Prolog_put_address(tmp_decreasing, ph_decreasing); + Prolog_term_ref tmp_bounded = Prolog_new_term_ref(); + Prolog_put_address(tmp_bounded, ph_bounded); + if (Prolog_unify(t_ph_decreasing, tmp_decreasing) + && Prolog_unify(t_ph_bounded, tmp_bounded)) { + PPL_REGISTER(ph_decreasing); + PPL_REGISTER(ph_bounded); + return PROLOG_SUCCESS; + } + else { + delete ph_decreasing; + delete ph_bounded; + } } CATCH_ALL; } diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 index 846fe05..2ffaf4b 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -573,6 +573,25 @@ m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', + `extern "C" Prolog_foreign_return_type + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ + (Prolog_term_ref t_pset, + Prolog_term_ref t_ph_decreasing, + Prolog_term_ref t_ph_bounded); + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', + `extern "C" Prolog_foreign_return_type + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 + (Prolog_term_ref t_pset_before, + Prolog_term_ref t_pset_after, + Prolog_term_ref t_ph_decreasing, + Prolog_term_ref t_ph_bounded); + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_wrap_assign diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 685844f..e8b76b7 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -90,8 +90,10 @@ m4_define(`m4_procedure_list', ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/1 +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@/3 +simple, ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/2 +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3 +simple, ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3 +simple, +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2/4 +simple, ) ')

1 0

[GIT] ppl/ppl(master): Added procedures computing all the affine quasi-ranking functions.
by Enea Zaffanella 29 Mar '10

29 Mar '10

Module: ppl/ppl Branch: master Commit: 5707e3d66eca4be05ef4891081217c1cac5fb96e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5707e3d66eca… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 29 09:17:19 2010 +0200 Added procedures computing all the affine quasi-ranking functions. Corrected a few glitches in the documentation and in exception messages. --- src/termination.cc | 38 ++++++++++++ src/termination.defs.hh | 134 ++++++++++++++++++++++++++++++++++++++---- src/termination.templates.hh | 87 ++++++++++++++++++++++----- 3 files changed, 233 insertions(+), 26 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5707e3d6…

1 0

[GIT] ppl/ppl(master): Factored away common code in the MS-based termination procedures.
by Enea Zaffanella 27 Mar '10

27 Mar '10

Module: ppl/ppl Branch: master Commit: d05d653edab6827589a3138989fac44bd2f9db49 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d05d653edab6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 27 15:55:01 2010 +0100 Factored away common code in the MS-based termination procedures. Improved PR-based termination procedures relying on MIP_Problem by mapping optimizations to satisfiability testing. --- src/termination.cc | 388 +++++++++++++++--------------------------- src/termination.templates.hh | 13 -- 2 files changed, 136 insertions(+), 265 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d05d653e…

1 0