March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(termination): Code, unintensionally added by previous commit, removed..
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: cfc36c700221dee64e736641692897791d7ce698 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cfc36c700221… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 17:13:14 2010 +0000 Code, unintensionally added by previous commit, removed.. --- .../Java/parma_polyhedra_library/Makefile.am | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 942ac77..199344b 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -164,10 +164,6 @@ all_java_sources = \ $(fixed_java_sources) \ $(required_instantiations_java_sources) -all_java_cxx_headers = \ -$(fixed_java_cxx_headers) \ -$(required_instantiations_java_cxx_headers) - # NOTE: Fake_Class_for_Doxygen.java should be added here. EXTRA_DIST = \ $(interface_generator_files) \

1 0

[GIT] ppl/ppl(termination): Finished adding code for the java interface to the termination methods.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: e8da5d7cae86912ab7c15708324f2d0b01338d82 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8da5d7cae86… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 16:47:17 2010 +0000 Finished adding code for the java interface to the termination methods. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 138 ++++++++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 10 +- ...l_interface_generator_java_classes_java_code.m4 | 42 ++++++- 3 files changed, 187 insertions(+), 3 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 dcc850b..8714619 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 @@ -1303,3 +1303,141 @@ Java_parma_1polyhedra_1library_termination_1test_1MS_1@TOPOLOGY@1@CLASS@ return 0; } ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_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)); + return termination_test_@TERMINATION_ID@(*p_ptr); + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_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)); + return termination_test_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after); + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_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)); + Generator g(point()); + if (one_affine_ranking_function_@TERMINATION_ID@(*p_ptr, g)) { + jobject j_g_result = build_java_generator(env, g);; + set_generator(env, j_g, j_g_result); + return true; + } + return false; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_one_1affine_1ranking_1function_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 +(JNIEnv* env, jclass, jobject j_p_before, jobject j_g_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)); + 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);; + set_generator(env, j_g, j_g_result); + return true; + } + return false; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_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)); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@(*p_ptr, *ph) { + set_ptr(env, j_p, *ph); + return true; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_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)); + @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_p, *ph); + return true; + } + CATCH_ALL; + return 0; +} + +') diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 20f8389..942ac77 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -67,6 +67,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.Variable \ parma_polyhedra_library.Variables_Set @@ -105,6 +106,7 @@ parma_polyhedra_library_Poly_Con_Relation.h \ parma_polyhedra_library_Poly_Gen_Relation.h \ parma_polyhedra_library_PPL_Object.h \ parma_polyhedra_library_Relation_Symbol.h \ +parma_polyhedra_library_Termination.h \ parma_polyhedra_library_Variable.h \ parma_polyhedra_library_Variables_Set.h @@ -153,14 +155,18 @@ $(srcdir)/Poly_Gen_Relation.java \ $(srcdir)/PPL_Object.java \ $(srcdir)/Relation_Symbol.java \ $(srcdir)/Timeout_Exception.java \ +$(builddir)/Termination.java \ $(srcdir)/Variable.java \ $(srcdir)/Variables_Set.java # NOTE: do _NOT_ add Fake_Class_for_Doxygen.java to this list. all_java_sources = \ $(fixed_java_sources) \ -$(required_instantiations_java_sources) \ -Termination.java +$(required_instantiations_java_sources) + +all_java_cxx_headers = \ +$(fixed_java_cxx_headers) \ +$(required_instantiations_java_cxx_headers) # NOTE: Fake_Class_for_Doxygen.java should be added here. EXTRA_DIST = \ 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 295ed7f..e83cada 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 @@ -657,5 +657,45 @@ m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', ___END_OF_FILE___ ___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ public static native boolean - ppl_termination_test_MS_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p); + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p); +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after); +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p, Generator g); +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after, Generator g); +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p, Polyhedron ph); +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after, Polyhedron ph); ')

1 0

[GIT] ppl/ppl(termination): Added OCaml interface code for the 6 new termination methods.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: c8799e410088e03c76f449184780d572822cb177 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c8799e410088… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 14:54:42 2010 +0000 Added OCaml interface code for the 6 new termination methods. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 121 ++++++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 47 ++++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 35 ++++++ ...terface_generator_ocaml_procedure_generators.m4 | 13 ++- 4 files changed, 215 insertions(+), 1 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index 356b65a..3900367 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -1204,3 +1204,124 @@ ppl_@CLASS@_approximate_@PARTITION@(value ph1, value ph2) try { CATCH_ALL ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(value pset) try { + CAMLparam1(pset); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + CAMLreturn(Val_bool(termination_test_@TERMINATION_ID@(ppset))); +} +CATCH_ALL + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(value pset_before, + value pset_after) + try { + CAMLparam2(pset_before, pset_after); + 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))); + CAMLreturn(Val_bool(termination_test_@TERMINATION_ID@_2(ppset_before, + ppset_after))); +} +CATCH_ALL + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_one_affine_ranking_function_@TERMINATION_ID@_@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))); + Generator g(point()); + bool ppl_return_value = one_affine_ranking_function_@TERMINATION_ID@ + (ppset, g); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, build_ocaml_generator(g)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_one_affine_ranking_function_@TERMINATION_ID@_@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))); + Generator g(point()); + bool ppl_return_value = one_affine_ranking_function_@TERMINATION_ID@_2 + (ppset_before, ppset_after, g); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, build_ocaml_generator(g)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@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))); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@(ppset, *ph); + CAMLreturn(unregistered_value_p_Polyhedron(*ph)); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@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))); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@_2(ppset_before, ppset_after, *ph); + CAMLreturn(unregistered_value_p_Polyhedron(*ph)); +} +CATCH_ALL + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 index 0617f89..0642842 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -546,3 +546,50 @@ external ppl_@CLASS@_@MAXMIN@: = "ppl_@CLASS@_@MAXMIN@" ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool + = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool * linear_generator + = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool * linear_generator + = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron + = "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron + = "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index 014d876..acb05a4 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -480,3 +480,38 @@ val ppl_@CLASS@_approximate_@PARTITION@: @!CLASS@ * pointset_powerset_grid * bool ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool * linear_generator + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool * linear_generator + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index 0e39dcb..8b8ff38 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -40,4 +40,15 @@ dnl in the ppl_interface_generator_*_code.m4 file. dnl The <name> must be exactly as written here. dnl -m4_define(`m4_procedure_list', `m4_common_procedure_list') +m4_define(`m4_procedure_list', + `m4_echo_unquoted(ppl_new_@CLASS@_iterator +pointset_powerset, +`m4_common_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_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, +) +') +

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: use std:: sort on a vector instead of using a map, in method OK().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 70cb7f3a54ea6f97489dc8b52b8ea11fbd30167e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=70cb7f3a54ea… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:14:00 2010 +0100 MIP_Problem: use std::sort on a vector instead of using a map, in method OK(). --- src/MIP_Problem.cc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 52a4817..6c97648 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -32,7 +32,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "Scalar_Products.defs.hh" #include <stdexcept> #include <deque> -#include <map> +#include <vector> #include <algorithm> #include <cmath> @@ -2391,24 +2391,26 @@ PPL::MIP_Problem::OK() const { } { // Needed to sort accesses to tableau_j, improving performance. - std::map<dimension_type,dimension_type> var_in_base; + typedef std::vector<std::pair<dimension_type,dimension_type> > + pair_vector_t; + pair_vector_t vars_in_base; for (dimension_type i = base.size(); i-- > 0; ) - var_in_base[base[i]] = i; + vars_in_base.push_back(std::make_pair(base[i],i)); + + std::sort(vars_in_base.begin(),vars_in_base.end()); for (dimension_type j = tableau_nrows; j-- > 0; ) { matrix_row_const_reference_type tableau_j = tableau[j]; - std::map<dimension_type,dimension_type>::iterator i - = var_in_base.begin(); - std::map<dimension_type,dimension_type>::iterator i_end - = var_in_base.end(); + pair_vector_t::iterator i = vars_in_base.begin(); + pair_vector_t::iterator i_end = vars_in_base.end(); matrix_const_row_const_iterator itr = tableau_j.begin(); matrix_const_row_const_iterator itr_end = tableau_j.end(); - for ( ; i!=i_end; ++i) { + for ( ; i!=i_end && itr!=itr_end; ++i) { // tableau[i][base[i] must be different from zero. // tableau[i][base[j], with i different from j, must not be a zero. - if ((itr != itr_end) && (*itr).first < i->first) + if ((*itr).first < i->first) itr = tableau_j.lower_bound((*itr).first, itr); - if (i->second != j && (itr != itr_end) && (*itr).first == i->first + if (i->second != j && (*itr).first == i->first && (*itr).second != 0) { #ifndef NDEBUG cerr << "tableau[i][base[i] must be different from zero" << endl;

1 0

[GIT] ppl/ppl(sparse_matrices): Indentation fixes: replace tab characters with spaces.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 7e98203132a0347e6441358d2d75f298f5ca0a5e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7e98203132a0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:01:44 2010 +0100 Indentation fixes: replace tab characters with spaces. --- src/MIP_Problem.cc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index c3899f4..52a4817 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -2133,8 +2133,8 @@ PPL::MIP_Problem::choose_branching_variable(const MIP_Problem& lp, for (Variables_Set::const_iterator v_it = i_vars.begin(), v_end = i_vars.end(); v_it != v_end; ++v_it) { gcd_assign(gcd, - last_generator.coefficient(Variable(*v_it)), - last_generator_divisor); + last_generator.coefficient(Variable(*v_it)), + last_generator_divisor); if (gcd != last_generator_divisor) candidate_variables.insert(*v_it); } @@ -2301,10 +2301,10 @@ PPL::MIP_Problem::OK() const { if (external_space_dim < input_obj_function.space_dimension()) { #ifndef NDEBUG cerr << "The MIP_Problem and the objective function have " - << "incompatible space dimensions (" - << external_space_dim << " < " - << input_obj_function.space_dimension() << ")." - << endl; + << "incompatible space dimensions (" + << external_space_dim << " < " + << input_obj_function.space_dimension() << ")." + << endl; ascii_dump(cerr); #endif return false; @@ -2331,9 +2331,9 @@ PPL::MIP_Problem::OK() const { cerr << "The cached feasible point does not belong to " << "the feasible region of the MIP_Problem." << endl; - ascii_dump(cerr); + ascii_dump(cerr); #endif - return false; + return false; } // Check that every integer declared variable is really integer. @@ -2341,7 +2341,7 @@ PPL::MIP_Problem::OK() const { if (!i_variables.empty()) { PPL_DIRTY_TEMP_COEFFICIENT(gcd); for (Variables_Set::const_iterator v_it = i_variables.begin(), - v_end = i_variables.end(); v_it != v_end; ++v_it) { + v_end = i_variables.end(); v_it != v_end; ++v_it) { gcd_assign(gcd, last_generator.coefficient(Variable(*v_it)), last_generator.divisor()); if (gcd != last_generator.divisor())

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: use get2() instead of two get( ) calls, in method get_exiting_base_index().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 9fd517f4302abb2830ef59e1c3bf9382afa393e2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9fd517f4302a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 13:45:45 2010 +0100 MIP_Problem: use get2() instead of two get() calls, in method get_exiting_base_index(). --- src/MIP_Problem.cc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index f286bfe..c3899f4 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1552,7 +1552,9 @@ PPL::MIP_Problem // These pointers are used instead of references in the following loop, to // improve performance. matrix_row_const_pointer_type t_e = &(tableau[exiting_base_index]); - const Coefficient* t_ee = &(t_e->get(entering_var_index)); + const Coefficient* t_ee; + const Coefficient* t_e0; + t_e->get2(0,entering_var_index,t_e0,t_ee); for (dimension_type i = exiting_base_index + 1; i < tableau_num_rows; ++i) { matrix_row_const_reference_type t_i = tableau[i]; t_i.get2(entering_var_index, base[i], t_ie, t_ib); @@ -1561,7 +1563,7 @@ PPL::MIP_Problem WEIGHT_BEGIN(); lcm_assign(lcm, *t_ee, *t_ie); exact_div_assign(current_min, lcm, *t_ee); - current_min *= t_e->get(0); + current_min *= *t_e0; abs_assign(current_min); exact_div_assign(challenger, lcm, *t_ie); challenger *= t_i.get(0); @@ -1572,7 +1574,7 @@ PPL::MIP_Problem || (sign == 0 && base[i] < base[exiting_base_index])) { exiting_base_index = i; t_e = &(tableau[exiting_base_index]); - t_ee = &(t_e->get(entering_var_index)); + t_e->get2(0,entering_var_index,t_e0,t_ee); } WEIGHT_ADD(1044); }

1 0

[GIT] ppl/ppl(sparse_matrices): Whitespace fix.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 7af60a2a24f08c8a916c721535e4667d706f4ef3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7af60a2a24f0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 13:35:16 2010 +0100 Whitespace fix. --- src/MIP_Problem.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 7b42739..f286bfe 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1518,7 +1518,7 @@ PPL::MIP_Problem::pivot(const dimension_type entering_var_index, // See pages 47 and 50 of [PapadimitriouS98]. PPL::dimension_type PPL::MIP_Problem -::get_exiting_base_index(const dimension_type entering_var_index) const { +::get_exiting_base_index(const dimension_type entering_var_index) const { // The variable exiting the base should be associated to a tableau // constraint such that the ratio // tableau[i][entering_var_index] / tableau[i][base[i]]

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: optimize find_create() calls in linear_combine() (#2).
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: d117160799a3174cd12c8d24a7d8ba378569f17b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d117160799a3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 13:32:36 2010 +0100 MIP_Problem: optimize find_create() calls in linear_combine() (#2). --- src/MIP_Problem.cc | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 95ef74a..7b42739 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1333,13 +1333,10 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, while ((i != i_end) && (j != j_end)) { if (j->first < i->first) { if (j->first != k) { - // FIXME: check if adding "if (j->second != 0)" speeds this up. - itr = x.find_create(j->first); + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_row_k); + itr = x.find_create(*j); Coefficient& x_i = (*itr).second; - PPL_ASSERT(x_i == 0); - - // sub_mul_assign(x_i, j->second, normalized_row_k); - x_i = j->second; x_i *= normalized_row_k; neg_assign(x_i); @@ -1369,12 +1366,10 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, while ((i != i_end) && (j != j_end)) { if (j->first < i->first) { if (j->first != k) { - // FIXME: check if adding "if (j->second != 0)" speeds this up. - itr = x.find_create(j->first, itr); + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_row_k); + itr = x.find_create(*j,itr); Coefficient& x_i = (*itr).second; - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_row_k); - x_i = j->second; x_i *= normalized_row_k; neg_assign(x_i); } @@ -1420,12 +1415,10 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, if (itr == x.end()) { while (j != j_end) { if (j->first != k) { - // FIXME: check if adding "if (j->second != 0)" speeds this up. - itr = x.find_create(j->first); + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_row_k); + itr = x.find_create(*j); Coefficient& x_i = (*itr).second; - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_row_k); - x_i = j->second; x_i *= normalized_row_k; neg_assign(x_i); @@ -1439,12 +1432,10 @@ PPL::MIP_Problem::linear_combine(matrix_row_reference_type x, } while (j != j_end) { if (j->first != k) { - // FIXME: check if adding "if (j->second != 0)" speeds this up. - itr = x.find_create(j->first,itr); + // The following statements are equivalent to + // sub_mul_assign(x[j->first], j->second, normalized_row_k); + itr = x.find_create(*j); Coefficient& x_i = (*itr).second; - PPL_ASSERT(x_i == 0); - // sub_mul_assign(x_i, j->second, normalized_row_k); - x_i = j->second; x_i *= normalized_row_k; neg_assign(x_i); }

1 0

[GIT] ppl/ppl(master): Cut exponential execution paths by calls to maybe_abandon().
by Enea Zaffanella 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: cf4849fd4290f04510c33c0a0582dc537e808500 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cf4849fd4290… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 22 13:54:43 2010 +0100 Cut exponential execution paths by calls to maybe_abandon(). --- src/PIP_Tree.cc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 2dd7c79..9a6f489 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1368,6 +1368,11 @@ PIP_Tree_Node::compatibility_check(Matrix& s) { // Perform simplex pivots on the context // until we find an empty solution or an optimum. while (true) { + // Check if the client has requested abandoning all expensive + // computations. If so, the exception specified by the client + // is thrown now. + maybe_abandon(); + dimension_type pi = num_rows; // pi is the pivot's row index. dimension_type pj = 0; // pj is the pivot's column index. @@ -1724,6 +1729,11 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, // Main loop of the simplex algorithm. while (true) { + // Check if the client has requested abandoning all expensive + // computations. If so, the exception specified by the client + // is thrown now. + maybe_abandon(); + PPL_ASSERT(OK()); const dimension_type num_rows = tableau.t.num_rows();

1 0

[GIT] ppl/ppl(master): All test functions should be declared in the anonymous namespace.
by Enea Zaffanella 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: 6fae6ec5525c4eac8e123570f1e775a2f9c1ea02 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6fae6ec5525c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 22 13:51:56 2010 +0100 All test functions should be declared in the anonymous namespace. --- tests/Polyhedron/exceptions1.cc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Polyhedron/exceptions1.cc b/tests/Polyhedron/exceptions1.cc index 4a74dc9..49d401a 100644 --- a/tests/Polyhedron/exceptions1.cc +++ b/tests/Polyhedron/exceptions1.cc @@ -1353,7 +1353,6 @@ test54() { return false; } -} bool test55() { Variable y(1); @@ -1400,7 +1399,9 @@ test56() { } return false; } - // namespace + +} // namespace + BEGIN_MAIN DO_TEST(test01); DO_TEST(test02);

1 0