March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): In frequency(), deal properly with the case when a box is empty.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 0bbcc5ab4f06cb3ebc8b1043e2e25c89c67e09ad URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0bbcc5ab4f06… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 12:12:44 2010 +0000 In frequency(), deal properly with the case when a box is empty. Added tests for this case. Re-enable frequency test in the Prolog interface. --- ...face_generator_prolog_generated_test_pl_code.m4 | 2 +- src/Box.templates.hh | 2 +- tests/BD_Shape/frequency1.cc | 20 ++++++++++++++++++++ tests/Box/frequency1.cc | 20 ++++++++++++++++++++ tests/Octagonal_Shape/frequency1.cc | 20 ++++++++++++++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 index 56eb533..4ed6891 100644 --- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 +++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 @@ -905,7 +905,7 @@ ppl_@CLASS@_@MAXMIN@_with_point_6_test :- ). ') -m4_define(`ppl_@CLASS@_frequency_codeXXX', +m4_define(`ppl_@CLASS@_frequency_code', ` ppl_@CLASS@_frequency_6_test :- ( diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 5b08ea1..674fd44 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1383,7 +1383,7 @@ Box<ITV>::frequency(const Linear_Expression& expr, } // For an empty Box, we simply return false. - if (marked_empty()) + if (is_empty()) return false; // The Box has at least 1 dimension and is not empty. diff --git a/tests/BD_Shape/frequency1.cc b/tests/BD_Shape/frequency1.cc index 7c420b6..f74e6fb 100644 --- a/tests/BD_Shape/frequency1.cc +++ b/tests/BD_Shape/frequency1.cc @@ -243,6 +243,25 @@ test09() { return ok; } +// Non-relational test of an empty bd_shape in 1-dimension. +bool +test10() { + Variable A(0); + + TBD_Shape bds(1); + bds.add_constraint(A <= 0); + bds.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!bds.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(bds, "*** bds ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -255,4 +274,5 @@ BEGIN_MAIN DO_TEST(test07); DO_TEST(test08); DO_TEST(test09); + DO_TEST(test10); END_MAIN diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc index b64be53..d6c53b1 100644 --- a/tests/Box/frequency1.cc +++ b/tests/Box/frequency1.cc @@ -196,6 +196,25 @@ test08() { return ok; } +// Non-relational test of an empty box in 1-dimension. +bool +test09() { + Variable A(0); + + TBox box(1); + box.add_constraint(A <= 0); + box.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!box.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(box, "*** box ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -207,4 +226,5 @@ BEGIN_MAIN DO_TEST(test06); DO_TEST(test07); DO_TEST(test08); + DO_TEST(test09); END_MAIN diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index ad840a6..571dd5b 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -321,6 +321,25 @@ test13() { return ok; } +// Test of an empty octagonal_shape in 1-dimension. +bool +test14() { + Variable A(0); + + TOctagonal_Shape os(1); + os.add_constraint(A <= 0); + os.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!os.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(os, "*** os ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -337,4 +356,5 @@ BEGIN_MAIN DO_TEST(test11); DO_TEST(test12); DO_TEST(test13); + DO_TEST(test14); END_MAIN

1 0

[GIT] ppl/ppl(master): Test disabled while problem is investigated.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: edde5f27947380c13009e53fa293e34557f6e4f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=edde5f279473… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 11:37:30 2010 +0000 Test disabled while problem is investigated. --- ...face_generator_prolog_generated_test_pl_code.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 index 4ed6891..56eb533 100644 --- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 +++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 @@ -905,7 +905,7 @@ ppl_@CLASS@_@MAXMIN@_with_point_6_test :- ). ') -m4_define(`ppl_@CLASS@_frequency_code', +m4_define(`ppl_@CLASS@_frequency_codeXXX', ` ppl_@CLASS@_frequency_6_test :- (

1 0

[GIT] ppl/ppl(master): Added interface code for drop_some_non-integer_points() methods.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 5fb0618bd9c81e9a5a3e587a5c6d9bd561c3c027 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5fb0618bd9c8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 11:00:21 2010 +0000 Added interface code for drop_some_non-integer_points() methods. Note that these are only enabled for BD_Shapes, Octagonal_Shapes and Boxes. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 51 +++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 22 +++++++ ...ppl_interface_generator_java_classes_cc_code.m4 | 59 +++++++++++++++++++ ...l_interface_generator_java_classes_java_code.m4 | 18 ++++++ .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 40 +++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 16 +++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 14 +++++ .../ppl_interface_generator_prolog_cc_code.m4 | 60 ++++++++++++++++++++ .../ppl_interface_generator_prolog_hh_code.m4 | 14 +++++ ...erface_generator_common_procedure_generators.m4 | 2 + 10 files changed, 296 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5fb0618b…

1 0

[GIT] ppl/ppl(master): Added C interface for frequency().
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: dd86d85a455e91d89bf957e343e49ce7eb4a32b2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dd86d85a455e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 09:38:14 2010 +0000 Added C interface for frequency(). Moved generator to language independent file. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 21 ++++++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 13 ++++++++++++ ...nterface_generator_java_procedure_generators.m4 | 1 - ...terface_generator_ocaml_procedure_generators.m4 | 1 - ...erface_generator_prolog_procedure_generators.m4 | 1 - ...erface_generator_common_procedure_generators.m4 | 1 + 6 files changed, 35 insertions(+), 3 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 3cef2d7..076ee2f 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -258,6 +258,27 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_frequency_code', +`int +ppl_@CLASS@_frequency +(ppl_const_@CLASS@_t ph, + ppl_const_Linear_Expression_t le, + ppl_Coefficient_t freq_n, + ppl_Coefficient_t freq_d, + ppl_Coefficient_t val_n, + ppl_Coefficient_t val_d) try { + const @CPP_CLASS@& pph = *to_const(ph); + const Linear_Expression& lle = *to_const(le); + Coefficient& pfreq_n = *to_nonconst(freq_n); + Coefficient& pfreq_d = *to_nonconst(freq_d); + Coefficient& pval_n = *to_nonconst(val_n); + Coefficient& pval_d = *to_nonconst(val_d); + return pph.frequency(lle, pfreq_n, pfreq_d, pval_n, pval_d); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_@COMPARISON@_@CLASS@_code', `int ppl_@CLASS@_@COMPARISON@_@CLASS@ diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4 index c793a5e..90f17ec 100644 --- a/interfaces/C/ppl_interface_generator_c_h_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_h_code.m4 @@ -256,6 +256,19 @@ PPL_PROTO((ppl_const_@CLASS@_t ph, ') +m4_define(`ppl_@CLASS@_frequency_code', +`/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_frequency +PPL_PROTO((ppl_const_@CLASS@_t ph, + ppl_const_Linear_Expression_t le, + ppl_Coefficient_t ext_fn, + ppl_Coefficient_t ext_fd, + ppl_Coefficient_t ext_vn, + ppl_Coefficient_t ext_vd)); + +') + m4_define(`ppl_@CLASS@_@COMPARISON@_@CLASS@_code', `/*! \relates ppl_@CLASS@_tag */ int diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index 4f6482b..62d1dc4 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -43,7 +43,6 @@ m4_define(`m4_procedure_list', ppl_free_@CLASS@/1 +all, ppl_@CLASS@_hashcode/2 +all -box, ppl_@CLASS@_string/1 +all, -ppl_@CLASS@_frequency/6 +simple, 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, diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index aec7ed4..8b8ff38 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -43,7 +43,6 @@ dnl m4_define(`m4_procedure_list', `m4_echo_unquoted(ppl_new_@CLASS@_iterator +pointset_powerset, `m4_common_procedure_list', -ppl_@CLASS@_frequency/6 +simple, 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, diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 9e99852..685844f 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -87,7 +87,6 @@ ppl_MIP_Problem_ascii_dump/1`'dnl m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', -ppl_@CLASS@_frequency/6 +simple, 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, diff --git a/interfaces/ppl_interface_generator_common_procedure_generators.m4 b/interfaces/ppl_interface_generator_common_procedure_generators.m4 index 5e5473d..a9be300 100644 --- a/interfaces/ppl_interface_generator_common_procedure_generators.m4 +++ b/interfaces/ppl_interface_generator_common_procedure_generators.m4 @@ -64,6 +64,7 @@ ppl_@CLASS@_@SIMPLIFY@/1 *nofail +all, ppl_@CLASS@_bounds_from_@ABOVEBELOW@/2 +all, ppl_@CLASS@_@MAXMIN@/5 +all, ppl_@CLASS@_@MAXMIN@_with_point/6 +all, +ppl_@CLASS@_frequency/6 +simple, ppl_@CLASS@_@COMPARISON@_@CLASS@/2 +all, ppl_@CLASS@_equals_@CLASS@/2 +all, ppl_@CLASS@_OK/1 +all,

1 0

[GIT] ppl/ppl(master): Added Java interface method for frequency().
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 94aa8cd38dadf0f50e489c26a1c91c85dd94a554 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=94aa8cd38dad… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 09:24:00 2010 +0000 Added Java interface method for frequency(). --- ...ppl_interface_generator_java_classes_cc_code.m4 | 33 ++++++++++++++++++++ ...l_interface_generator_java_classes_java_code.m4 | 10 ++++++ ...nterface_generator_java_procedure_generators.m4 | 1 + 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index 8714619..7b9e995 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 @@ -573,6 +573,39 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1MAXMIN@__Lparma_1polyhedra_1library_Li ') +m4_define(`ppl_@CLASS@_frequency_code', +`dnl +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_@1CLASS@_1frequency__Lparma_1polyhedra_1library_Linear_1Expression_2Lparma_1polyhedra_1library_Coefficient_2Lparma_1polyhedra_1library_Coefficient_2Lparma_1polyhedra_1library_Coefficient_2Lparma_1polyhedra_1library_Coefficient_2 +(JNIEnv* env, jobject j_this, jobject j_le, + jobject j_freqn, jobject j_freqd, jobject j_valn, jobject j_vald) { + try { + @CPP_CLASS@* this_ptr + = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); + PPL_DIRTY_TEMP_COEFFICIENT(freqn); + PPL_DIRTY_TEMP_COEFFICIENT(freqd); + PPL_DIRTY_TEMP_COEFFICIENT(valn); + PPL_DIRTY_TEMP_COEFFICIENT(vald); + freqn = build_cxx_coeff(env, j_freqn); + freqd = build_cxx_coeff(env, j_freqd); + valn = build_cxx_coeff(env, j_valn); + vald = build_cxx_coeff(env, j_vald); + Linear_Expression le = build_cxx_linear_expression(env, j_le); + if (this_ptr->frequency(le, freqn, freqd, valn, vald)) { + set_coefficient(env, j_freqn, build_java_coeff(env, freqn)); + set_coefficient(env, j_freqd, build_java_coeff(env, freqd)); + set_coefficient(env, j_valn, build_java_coeff(env, valn)); + set_coefficient(env, j_vald, build_java_coeff(env, vald)); + return true; + } + return false; + } + CATCH_ALL; + return false; +} + +') + m4_define(`ppl_@CLASS@_@COMPARISON@_@CLASS@_code', `dnl JNIEXPORT jboolean JNICALL diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 index e83cada..13fd26b 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 @@ -236,6 +236,16 @@ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ ') +m4_define(`ppl_@CLASS@_frequency_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ + public native boolean frequency(Linear_Expression expr, + Coefficient freq_n, Coefficient freq_d, + Coefficient val_n, Coefficient val_d); + +') + m4_define(`ppl_@CLASS@_@COMPARISON@_@CLASS@_code', `dnl ___END_OF_FILE___ diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index 62d1dc4..4f6482b 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -43,6 +43,7 @@ m4_define(`m4_procedure_list', ppl_free_@CLASS@/1 +all, ppl_@CLASS@_hashcode/2 +all -box, ppl_@CLASS@_string/1 +all, +ppl_@CLASS@_frequency/6 +simple, 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,

1 0

[GIT] ppl/ppl(master): Added Ocaml interface function for frequency().
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 4b43b4bfd1d15e56cb5e3a4d271c5560ec260103 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4b43b4bfd1d1… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 09:12:41 2010 +0000 Added Ocaml interface function for frequency(). --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 26 ++++++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 9 +++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 8 ++++++ ...terface_generator_ocaml_procedure_generators.m4 | 1 + 4 files changed, 44 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 1922588..9e521c5 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -729,6 +729,32 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_frequency_code', +`dnl +extern "C" +CAMLprim value +ppl_@CLASS@_frequency(value ph, value caml_le) try { + CAMLparam2(ph, caml_le); + CAMLlocal1(caml_return_value); + PPL_DIRTY_TEMP_COEFFICIENT(f_num); + PPL_DIRTY_TEMP_COEFFICIENT(f_den); + PPL_DIRTY_TEMP_COEFFICIENT(v_num); + PPL_DIRTY_TEMP_COEFFICIENT(v_den); + @CPP_CLASS@& pph = *p_@CLASS@_val(ph); + bool ppl_return_value = pph.frequency(build_ppl_Linear_Expression(caml_le), + f_num, f_den, v_num, v_den); + caml_return_value = caml_alloc(5, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, build_ocaml_coefficient(f_num)); + Store_field(caml_return_value, 2, build_ocaml_coefficient(f_den)); + Store_field(caml_return_value, 3, build_ocaml_coefficient(v_num)); + Store_field(caml_return_value, 4, build_ocaml_coefficient(v_den)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_OK_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 aa3fd70..a454c72 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -360,6 +360,15 @@ external ppl_@CLASS@_@MAXMIN@_with_point: ') +m4_define(`ppl_@CLASS@_frequency_code', +`dnl +external ppl_@CLASS@_frequency: + @!CLASS@ -> linear_expression + -> bool * Z.t * Z.t * Z.t * Z.t + = "ppl_@CLASS@_frequency" + +') + m4_define(`ppl_@CLASS@_OK_code', `dnl external ppl_@CLASS@_OK: diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index 6f6125a..27b398d 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -322,6 +322,14 @@ val ppl_@CLASS@_@MAXMIN@_with_point: ') +m4_define(`ppl_@CLASS@_frequency_code', +`dnl +val ppl_@CLASS@_frequency: + @!CLASS@ -> linear_expression + -> bool * Z.t * Z.t * Z.t * Z.t + +') + m4_define(`ppl_@CLASS@_OK_code', `dnl val ppl_@CLASS@_OK: diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index 8b8ff38..aec7ed4 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -43,6 +43,7 @@ dnl m4_define(`m4_procedure_list', `m4_echo_unquoted(ppl_new_@CLASS@_iterator +pointset_powerset, `m4_common_procedure_list', +ppl_@CLASS@_frequency/6 +simple, 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,

1 0

[GIT] ppl/ppl(master): Added interface predicate for frequency().
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 490c97b15454bb992503324f57656f0f1c94d566 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=490c97b15454… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 08:34:57 2010 +0000 Added interface predicate for frequency(). Generated test added. --- .../ppl_interface_generator_prolog_cc_code.m4 | 28 +++++++++++++++++ .../ppl_interface_generator_prolog_hh_code.m4 | 8 +++++ ...erface_generator_prolog_procedure_generators.m4 | 1 + ...face_generator_prolog_generated_test_pl_code.m4 | 25 +++++++++++++++ .../tests/ppl_prolog_generated_test_common.pl | 33 ++++++++++++++++++++ 5 files changed, 95 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 8693093..89177df 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1927,3 +1927,31 @@ m4_define(`ppl_@CLASS@_wrap_assign_code', } ') + +m4_define(`ppl_@CLASS@_frequency_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_frequency(Prolog_term_ref t_ph, + Prolog_term_ref t_le_expr, + Prolog_term_ref t_freqn, Prolog_term_ref t_freqd, + Prolog_term_ref t_valn, Prolog_term_ref t_vald) { + static const char* where = "ppl_@CLASS@_frequency/6"; + try { + const @CPP_CLASS@* ph = term_to_handle<@CPP_CLASS@ >(t_ph, where); + PPL_CHECK(ph); + const Linear_Expression le = build_linear_expression(t_le_expr, where); + PPL_DIRTY_TEMP_COEFFICIENT(freqn); + PPL_DIRTY_TEMP_COEFFICIENT(freqd); + PPL_DIRTY_TEMP_COEFFICIENT(valn); + PPL_DIRTY_TEMP_COEFFICIENT(vald); + if (ph->frequency(le, freqn, freqd, valn, vald)) { + if (Prolog_unify_Coefficient(t_freqn, freqn) + && Prolog_unify_Coefficient(t_freqd, freqd) + && Prolog_unify_Coefficient(t_valn, valn) + && Prolog_unify_Coefficient(t_vald, vald)) + return PROLOG_SUCCESS; + } + } + 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 edf7a6a..1d3f594 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -572,3 +572,11 @@ m4_define(`ppl_@CLASS@_wrap_assign_code', Prolog_term_ref t_ind); ') + +m4_define(`ppl_@CLASS@_frequency_code', + `extern "C" Prolog_foreign_return_type + ppl_@CLASS@_frequency(Prolog_term_ref t_ph, Prolog_term_ref t_le_expr, + Prolog_term_ref t_freqn, Prolog_term_ref t_freqd, + Prolog_term_ref t_valn, Prolog_term_ref t_vald); + +') diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 685844f..9e99852 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -87,6 +87,7 @@ ppl_MIP_Problem_ascii_dump/1`'dnl m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', +ppl_@CLASS@_frequency/6 +simple, 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, diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 index 70f7fe9..4ed6891 100644 --- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 +++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 @@ -905,6 +905,31 @@ ppl_@CLASS@_@MAXMIN@_with_point_6_test :- ). ') +m4_define(`ppl_@CLASS@_frequency_code', +` +ppl_@CLASS@_frequency_6_test :- + ( + choose_test(TEST_DATA, Space_Dim), + ( + ppl_@TOPOLOGY@@CLASS@_build_test_object(TEST_DATA, PS, Space_Dim), + ppl_frequency_test_data(TEST_DATA, t_@TOPOLOGY@, @CONSTRAINER@, + LE, F_Nexptd, F_Dexptd, V_Nexptd, V_Dexptd, + SuccessFlag), + (SuccessFlag == true + -> + (ppl_@CLASS@_frequency(PS, LE, F_N, F_D, V_N, V_D), + F_N == F_Nexptd, F_D == F_Dexptd, + V_N == V_Nexptd, V_D == V_Dexptd) + ; + \+ ppl_@CLASS@_frequency(PS, LE, F_N, F_D, V_N, V_D) + ), + ppl_@CLASS@_OK(PS), + ppl_delete_@CLASS@(PS) + -> + fail ; true) + ). + +') m4_define(`ppl_@CLASS@_@COMPARISON@_@CLASS@_code', ` diff --git a/interfaces/Prolog/tests/ppl_prolog_generated_test_common.pl b/interfaces/Prolog/tests/ppl_prolog_generated_test_common.pl index 8fe7451..589e664 100644 --- a/interfaces/Prolog/tests/ppl_prolog_generated_test_common.pl +++ b/interfaces/Prolog/tests/ppl_prolog_generated_test_common.pl @@ -140,6 +140,7 @@ choose_2_tests(TEST_DATA1, TEST_DATA2, Dim) :- :- discontiguous(ppl_property_test_data/4). :- discontiguous(ppl_bounds_test_data/5). :- discontiguous(ppl_maxmin_test_data/10). +:- discontiguous(ppl_frequency_test_data/9). :- discontiguous(ppl_constrains_test_data/3). :- dynamic(all_class_dependent_predicates/1). :- discontiguous(all_class_dependent_predicates/1). @@ -195,6 +196,8 @@ ppl_bounds_test_data(test00, _, 0, _, true). ppl_maxmin_test_data(test00, _Topology, _, _, 0, _, _, _, _, false). +ppl_frequency_test_data(test00, _Topology, _, 0, _, _, _, _, false). + /* Test data for test test01 (an empty object in 1 dimension) */ ppl_build_test_data(test01, _Topology, constraints, CS) :- @@ -240,6 +243,8 @@ ppl_bounds_test_data(test01, _, A, _, true) :- ppl_maxmin_test_data(test01, _Topology, _, _, 0, _, _, _, _, false). +ppl_frequency_test_data(test01, _Topology, _, 0, _, _, _, _, false). + ppl_constrains_test_data(test01, _, true). /* Test data for test test02 (a universe object in 0 dimensions) */ @@ -273,6 +278,8 @@ ppl_maxmin_test_data(test02, _Topology, constraint, _, 0, 0, 1, true, ppl_maxmin_test_data(test02, _Topology, congruence, _, 0, 0, 1, true, grid_point(0), true). +ppl_frequency_test_data(test02, _Topology, _, 0, 0, 1, 0, 1, true). + /* Test data for test test03 (a universe object in 1 dimension) */ ppl_build_test_data(test03, _Topology, constraints, CS) :- @@ -307,6 +314,8 @@ ppl_bounds_test_data(test03, _, A, _, false) :- ppl_maxmin_test_data(test03, _Topology, _, _, A, _, _, _, _, false) :- make_vars(1, [A]). +ppl_frequency_test_data(test03, _Topology, _, 0, 0, 1, 0, 1, true). + ppl_constrains_test_data(test03, _, false). /* Test data for test test04 and test05 @@ -351,6 +360,9 @@ ppl_maxmin_test_data(test04, _Topology, congruence, _, A, 1, 1, true, grid_point(A), true) :- make_vars(1, [A]). +ppl_frequency_test_data(test04, _Topology, _, A, 0, 1, 1, 1, true) :- + make_vars(1, [A]). + ppl_constrains_test_data(test04, _, true). ppl_build_test_data(test05, _Topology, constraints, CS) :- @@ -391,6 +403,9 @@ ppl_maxmin_test_data(test05, _Topology, congruence, _, A, -1, 1, true, grid_point(-1*A), true) :- make_vars(1, [A]). +ppl_frequency_test_data(test05, _Topology, _, A, 0, 1, -1, 1, true) :- + make_vars(1, [A]). + ppl_constrains_test_data(test05, _, true). /* Test data for test test06, @@ -456,6 +471,12 @@ ppl_maxmin_test_data(test06, t_NNC_, constraint, minimize, A, 0, 1, false, ppl_maxmin_test_data(test06, _, congruence, _, A, _, _, _, _, false) :- make_vars(1, [A]). +ppl_frequency_test_data(test06, _Topology, constraint, A, _, _, _, _, false) :- + make_vars(1, [A]). + +ppl_frequency_test_data(test06, _Topology, congruence, A, 1, 1, 0, 1, true) :- + make_vars(1, [A]). + ppl_constrains_test_data(test06, _, true). /* Test data for test test07, @@ -521,6 +542,12 @@ ppl_maxmin_test_data(test07, t_NNC_, constraint, maximize, A, 0, 1, false, ppl_maxmin_test_data(test07, _, congruence, _, A, _, _, _, _, false) :- make_vars(1, [A]). +ppl_frequency_test_data(test07, _Topology, constraint, A, _, _, _, _, false) :- + make_vars(1, [A]). + +ppl_frequency_test_data(test07, _Topology, congruence, A, 1, 1, 0, 1, true) :- + make_vars(1, [A]). + ppl_constrains_test_data(test07, _, true). /* Test data for test test08, @@ -589,6 +616,12 @@ ppl_maxmin_test_data(test08, t_NNC_, constraint, maximize, A, 5, 1, false, ppl_maxmin_test_data(test08, _, congruence, _, A, _, _, _, _, false) :- make_vars(1, [A]). +ppl_frequency_test_data(test07, _Topology, constraint, A, _, _, _, _, false) :- + make_vars(1, [A]). + +ppl_frequency_test_data(test07, _Topology, congruence, A, 7, 2, 3, 2, true) :- + make_vars(1, [A]). + ppl_constrains_test_data(test08, _, true). /* boxes */

1 0

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

24 Mar '10

Module: ppl/ppl Branch: master Commit: c9e41b895fb0f676f1c242aafc2b95e1e496adde URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c9e41b895fb0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 07:02:35 2010 +0000 Typo fixed. --- .../Prolog/YAP/ppl_interface_generator_yap_cc.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 b/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 index a616575..a1f6024 100644 --- a/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 +++ b/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 @@ -117,8 +117,8 @@ yap_stub_##name() { \ Prolog_term_ref arg4 = YAP_ARG4; \ Prolog_term_ref arg5 = YAP_ARG5; \ Prolog_term_ref arg6 = YAP_ARG6; \ - Prolog_term_ref arg6 = YAP_ARG7; \ - Prolog_term_ref arg6 = YAP_ARG8; \ + Prolog_term_ref arg7 = YAP_ARG7; \ + Prolog_term_ref arg8 = YAP_ARG8; \ return name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \ }

1 0

[GIT] ppl/ppl(master): Added stubs for 7 and 8 argument predicates.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: f3fd35ffe6f33237228814dcb33ad46a4c7ffdf2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f3fd35ffe6f3… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 07:00:40 2010 +0000 Added stubs for 7 and 8 argument predicates. Missing predicate names added for pl_check test. --- .../Prolog/XSB/ppl_interface_generator_xsb_cc.m4 | 27 ++++++++++++++++++++ interfaces/Prolog/XSB/xsb_pl_check.P | 2 + 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/XSB/ppl_interface_generator_xsb_cc.m4 b/interfaces/Prolog/XSB/ppl_interface_generator_xsb_cc.m4 index 74d0fe2..8202bb2 100644 --- a/interfaces/Prolog/XSB/ppl_interface_generator_xsb_cc.m4 +++ b/interfaces/Prolog/XSB/ppl_interface_generator_xsb_cc.m4 @@ -97,6 +97,33 @@ name() { \ return xsb_stub_##name(arg1, arg2, arg3, arg4, arg5, arg6); \ } +#define XSB_ENTRY_7(name) \ +extern "C" Prolog_foreign_return_type \ +name() { \ + Prolog_term_ref arg1 = reg_term(1); \ + Prolog_term_ref arg2 = reg_term(2); \ + Prolog_term_ref arg3 = reg_term(3); \ + Prolog_term_ref arg4 = reg_term(4); \ + Prolog_term_ref arg5 = reg_term(5); \ + Prolog_term_ref arg6 = reg_term(6); \ + Prolog_term_ref arg7 = reg_term(7); \ + return xsb_stub_##name(arg1, arg2, arg3, arg4, arg5, arg6, arg7); \ +} + +#define XSB_ENTRY_8(name) \ +extern "C" Prolog_foreign_return_type \ +name() { \ + Prolog_term_ref arg1 = reg_term(1); \ + Prolog_term_ref arg2 = reg_term(2); \ + Prolog_term_ref arg3 = reg_term(3); \ + Prolog_term_ref arg4 = reg_term(4); \ + Prolog_term_ref arg5 = reg_term(5); \ + Prolog_term_ref arg6 = reg_term(6); \ + Prolog_term_ref arg7 = reg_term(7); \ + Prolog_term_ref arg7 = reg_term(8); \ + return xsb_stub_##name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \ +} + m4_divert(2)dnl extern "C" void diff --git a/interfaces/Prolog/XSB/xsb_pl_check.P b/interfaces/Prolog/XSB/xsb_pl_check.P index 4ae27e9..2422033 100644 --- a/interfaces/Prolog/XSB/xsb_pl_check.P +++ b/interfaces/Prolog/XSB/xsb_pl_check.P @@ -124,6 +124,8 @@ site: http://www.cs.unipr.it/ppl/ . */ ppl_Polyhedron_constrains/2, ppl_Polyhedron_unconstrain_space_dimension/2, ppl_Polyhedron_unconstrain_space_dimensions/2, + ppl_termination_test_C_Polyhedron_MS/1, + ppl_termination_test_C_Polyhedron_PR/1, ppl_new_MIP_Problem_from_space_dimension/2, ppl_new_MIP_Problem/5, ppl_new_MIP_Problem_from_MIP_Problem/2,

1 0

[GIT] ppl/ppl(master): Added stubs for 7 and 8 argument predicates.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: c7864c532efdf6321d1426a078d3156d7aef9982 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c7864c532efd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 06:47:20 2010 +0000 Added stubs for 7 and 8 argument predicates. --- .../Prolog/YAP/ppl_interface_generator_yap_cc.m4 | 27 ++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 b/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 index f89cfbc..a616575 100644 --- a/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 +++ b/interfaces/Prolog/YAP/ppl_interface_generator_yap_cc.m4 @@ -95,6 +95,33 @@ yap_stub_##name() { \ return name(arg1, arg2, arg3, arg4, arg5, arg6); \ } +#define YAP_STUB_7(name) \ +extern "C" Prolog_foreign_return_type \ +yap_stub_##name() { \ + Prolog_term_ref arg1 = YAP_ARG1; \ + Prolog_term_ref arg2 = YAP_ARG2; \ + Prolog_term_ref arg3 = YAP_ARG3; \ + Prolog_term_ref arg4 = YAP_ARG4; \ + Prolog_term_ref arg5 = YAP_ARG5; \ + Prolog_term_ref arg6 = YAP_ARG6; \ + Prolog_term_ref arg7 = YAP_ARG7; \ + return name(arg1, arg2, arg3, arg4, arg5, arg6, arg7); \ +} + +#define YAP_STUB_8(name) \ +extern "C" Prolog_foreign_return_type \ +yap_stub_##name() { \ + Prolog_term_ref arg1 = YAP_ARG1; \ + Prolog_term_ref arg2 = YAP_ARG2; \ + Prolog_term_ref arg3 = YAP_ARG3; \ + Prolog_term_ref arg4 = YAP_ARG4; \ + Prolog_term_ref arg5 = YAP_ARG5; \ + Prolog_term_ref arg6 = YAP_ARG6; \ + Prolog_term_ref arg6 = YAP_ARG7; \ + Prolog_term_ref arg6 = YAP_ARG8; \ + return name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); \ +} + dnl dnl Place here YAP_STUB macros. dnl

1 0