March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fix2.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: bc52a4d4a0c7ee84a73a13bd93ab177416c2143c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bc52a4d4a0c7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 12:15:51 2009 +0200 Fix2. --- interfaces/Java/jni/ppl_java_globals.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 29d15b0..2da6a8c 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -729,7 +729,7 @@ Java_parma_1polyhedra_1library_IO_wrap_1string using namespace Parma_Polyhedra_Library::IO_Operators; std::string s = wrap_string(chars, ind, pfll, pll); env->ReleaseStringUTFChars(str, chars); - return env->NewStringUTF(s.c_str(); + return env->NewStringUTF(s.c_str()); } CATCH_ALL; return 0;

1 0

[GIT] ppl/ppl(master): Fix.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 2535ee2f997ff4cfbc36906ac7f99691d85f5111 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2535ee2f997f… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 12:15:22 2009 +0200 Fix. --- interfaces/Java/jni/ppl_java_globals.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 3e20768..29d15b0 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -721,8 +721,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); - usngined pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length); - usngined pll = jtype_to_unsigned<unsigned int>(preferred_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); if (!chars) return 0;

1 0

[GIT] ppl/ppl(master): Added wrap_string.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 295220a25d62f85a1c8fcd59e6de8c43100a2ffc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=295220a25d62… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 12:12:07 2009 +0200 Added wrap_string. --- interfaces/Java/jni/ppl_java_globals.cc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index d35275d..3e20768 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -714,3 +714,23 @@ Java_parma_1polyhedra_1library_Congruence_1System_ascii_1dump CATCH_ALL; return 0; } + +JNIEXPORT jstring JNICALL +Java_parma_1polyhedra_1library_IO_wrap_1string +(JNIEnv* env, jstring str, jint indent_depth, + jint preferred_first_line_length, jint preferred_line_length) { + try { + unsigned ind = jtype_to_unsigned<unsigned int>(indent_depth); + usngined pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length); + usngined pll = jtype_to_unsigned<unsigned int>(preferred_line_length); + const char* chars = env->GetStringUTFChars(str, 0); + if (!chars) + return 0; + using namespace Parma_Polyhedra_Library::IO_Operators; + std::string s = wrap_string(chars, ind, pfll, pll); + env->ReleaseStringUTFChars(str, chars); + return env->NewStringUTF(s.c_str(); + } + CATCH_ALL; + return 0; +}

1 0

[GIT] ppl/ppl(master): Helper OCaml interface function renamed for consistency.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: bb9b33148f43dac15831470fd14f4941587f67d1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb9b33148f43… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 13:05:32 2009 +0200 Helper OCaml interface function renamed for consistency. value_to_unsigned_native --> value_to_unsigned (to be consistent with similar functions in the Java and Prolog interfaces). --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 10 +++++----- interfaces/OCaml/ppl_ocaml_common.cc | 8 ++++---- interfaces/OCaml/ppl_ocaml_common.defs.hh | 2 +- interfaces/OCaml/ppl_ocaml_common.inlines.hh | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index 8f96e4b..00da21d 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -602,7 +602,7 @@ ppl_@CLASS@_@WIDEN@_widening_assign_with_tokens CAMLparam3(ph1, ph2, tokens); @CPP_CLASS@& pph1 = *p_@CLASS@_val(ph1); @CPP_CLASS@& pph2 = *p_@CLASS@_val(ph2); - unsigned u_tokens = value_to_unsigned_native<unsigned>(tokens); + unsigned u_tokens = value_to_unsigned<unsigned>(tokens); pph1.@WIDEN@_widening_assign(pph2, &u_tokens); CAMLreturn(Val_long(u_tokens)); } @@ -635,7 +635,7 @@ ppl_@CLASS@_widening_assign_with_tokens CAMLparam3(ph1, ph2, tokens); @CPP_CLASS@& pph1 = *p_@CLASS@_val(ph1); @CPP_CLASS@& pph2 = *p_@CLASS@_val(ph2); - unsigned u_tokens = value_to_unsigned_native<unsigned>(tokens); + unsigned u_tokens = value_to_unsigned<unsigned>(tokens); pph1.widening_assign(pph2, &u_tokens); CAMLreturn(Val_long(u_tokens)); } @@ -653,7 +653,7 @@ ppl_@CLASS@_@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign_with_tokens @CPP_CLASS@& pph1 = *p_@CLASS@_val(ph1); @CPP_CLASS@& pph2 = *p_@CLASS@_val(ph2); @!CONSTRAINER@_System ppl_cs = build_ppl_@!CONSTRAINER@_System(caml_cs); - unsigned u_tokens = value_to_unsigned_native<unsigned>(tokens); + unsigned u_tokens = value_to_unsigned<unsigned>(tokens); pph1.@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign(pph2, ppl_cs, &u_tokens); CAMLreturn(Val_long(u_tokens)); @@ -870,7 +870,7 @@ ppl_@CLASS@_@EXTRAPOLATION@_extrapolation_assign_with_tokens CAMLparam3(ph1, ph2, tokens); @CPP_CLASS@& pph1 = *p_@CLASS@_val(ph1); @CPP_CLASS@& pph2 = *p_@CLASS@_val(ph2); - unsigned u_tokens = value_to_unsigned_native<unsigned>(tokens); + unsigned u_tokens = value_to_unsigned<unsigned>(tokens); pph1.@EXTRAPOLATION@_extrapolation_assign(pph2, &u_tokens); CAMLreturn(Val_long(u_tokens)); } @@ -1083,7 +1083,7 @@ ppl_@CLASS@_BGP99_@DISJUNCT_WIDEN@_extrapolation_assign @CPP_CLASS@& pph1 = *p_@CLASS@_val(ph1); @CPP_CLASS@& pph2 = *p_@CLASS@_val(ph2); unsigned cpp_max_disj - = value_to_unsigned_native<unsigned>(max_disj); + = value_to_unsigned<unsigned>(max_disj); pph1.BGP99_extrapolation_assign (pph2, widen_fun_ref(&@DISJUNCT_TOPOLOGY@@A_DISJUNCT@::@DISJUNCT_WIDEN@_widening_assign), diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index c623139..a705ffd 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1135,11 +1135,11 @@ ppl_io_wrap_string(value src, CAMLparam4(src, indent_depth, preferred_first_line_length, preferred_line_length); unsigned cpp_indent_depth - = value_to_unsigned_native<unsigned>(indent_depth); + = value_to_unsigned<unsigned>(indent_depth); unsigned cpp_preferred_first_line_length - = value_to_unsigned_native<unsigned>(preferred_first_line_length); + = value_to_unsigned<unsigned>(preferred_first_line_length); unsigned cpp_preferred_line_length - = value_to_unsigned_native<unsigned>(preferred_line_length); + = value_to_unsigned<unsigned>(preferred_line_length); using IO_Operators::wrap_string; CAMLreturn(caml_copy_string(wrap_string(String_val(src), cpp_indent_depth, @@ -1222,7 +1222,7 @@ ppl_set_timeout(value time) try { #else // In case a timeout was already set. reset_timeout(); - unsigned cpp_time = value_to_unsigned_native<unsigned>(time); + unsigned cpp_time = value_to_unsigned<unsigned>(time); static timeout_exception e; using Parma_Watchdog_Library::Watchdog; p_timeout_object = new Watchdog(cpp_time, abandon_expensive_computations, e); diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index 05d87de..294cf82 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -51,7 +51,7 @@ namespace Interfaces { namespace OCaml { template <typename U_Int> -U_Int value_to_unsigned_native(value v); +U_Int value_to_unsigned(value v); value ppl_dimension_to_value(dimension_type dim); diff --git a/interfaces/OCaml/ppl_ocaml_common.inlines.hh b/interfaces/OCaml/ppl_ocaml_common.inlines.hh index 95579af..7951f11 100644 --- a/interfaces/OCaml/ppl_ocaml_common.inlines.hh +++ b/interfaces/OCaml/ppl_ocaml_common.inlines.hh @@ -31,7 +31,7 @@ namespace OCaml { template <typename U_Int> U_Int -value_to_unsigned_native(value v) { +value_to_unsigned(value v) { // FIXME: check the following at compile time. assert(std::numeric_limits<U_Int>::is_integer && !std::numeric_limits<U_Int>::is_signed); @@ -57,7 +57,7 @@ value_to_unsigned_native(value v) { inline dimension_type value_to_ppl_dimension(value v) { - return value_to_unsigned_native<dimension_type>(v); + return value_to_unsigned<dimension_type>(v); } inline value

1 0

[GIT] ppl/ppl(master): Moved TODO items to their place.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 4bf7b9a5ca28607ae5293fb3509aec4fef2d1e99 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4bf7b9a5ca28… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 12:26:28 2009 +0200 Moved TODO items to their place. --- TODO | 2 ++ Watchdog/src/Watchdog.defs.hh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index a512db3..713db37 100644 --- a/TODO +++ b/TODO @@ -8,6 +8,8 @@ Enhancements for PPL 0.10.1 or later versions Enhancements for PPL 0.11 or later versions =========================================== +- Reconsider the datatype for the units parameter in the Watchdog + constructors: should we prefer an unsigned? - Rename set_rational_sqrt_precision_parameter to set_irrational_precision and make it available on all interfaces. - Intervals are best instantiated with checked numbers with diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index 7104e16..733c355 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -41,11 +41,9 @@ extern "C" void PWL_handle_timeout(int signum); //! A watchdog timer. class Watchdog { public: - // TODO: reconsider whether `units' should be an unsigned. template <typename Flag_Base, typename Flag> Watchdog(int units, const Flag_Base* volatile& holder, Flag& flag); - // TODO: reconsider whether `units' should be an unsigned. Watchdog(int units, void (*function)()); ~Watchdog();

1 0

[GIT] ppl/ppl(master): Added timeout functions to the OCaml interface.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 67042a165fa0d65c0d7460f62808f742407944da URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=67042a165fa0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 12:16:24 2009 +0200 Added timeout functions to the OCaml interface. Also removed duplicate CATCH_ALL macro definitions in the Prolog and OCaml interfaces. --- Watchdog/src/Watchdog.defs.hh | 2 + interfaces/OCaml/ppl_ocaml_common.cc | 80 ++++++++++++++++++++-------- interfaces/OCaml/ppl_ocaml_common.defs.hh | 20 +++++++ interfaces/OCaml/ppl_ocaml_globals.ml | 6 ++ interfaces/OCaml/ppl_ocaml_globals.mli | 6 ++ interfaces/Prolog/ppl_prolog_common.cc | 66 ------------------------ 6 files changed, 91 insertions(+), 89 deletions(-) diff --git a/Watchdog/src/Watchdog.defs.hh b/Watchdog/src/Watchdog.defs.hh index 733c355..7104e16 100644 --- a/Watchdog/src/Watchdog.defs.hh +++ b/Watchdog/src/Watchdog.defs.hh @@ -41,9 +41,11 @@ extern "C" void PWL_handle_timeout(int signum); //! A watchdog timer. class Watchdog { public: + // TODO: reconsider whether `units' should be an unsigned. template <typename Flag_Base, typename Flag> Watchdog(int units, const Flag_Base* volatile& holder, Flag& flag); + // TODO: reconsider whether `units' should be an unsigned. Watchdog(int units, void (*function)()); ~Watchdog(); diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index d3a3177..c623139 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -21,7 +21,6 @@ For the most up-to-date information see the Parma Polyhedra Library site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_ocaml_common.defs.hh" -//#include <stdexcept> namespace Parma_Polyhedra_Library { @@ -79,29 +78,31 @@ class PFunc { } }; -#define CATCH_ALL \ - catch(std::bad_alloc&) { \ - caml_raise_out_of_memory(); \ - } \ - catch(std::invalid_argument& e) { \ - caml_invalid_argument(const_cast<char*>(e.what())); \ - } \ - catch(std::overflow_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(std::runtime_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(std::exception& e) { \ - caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ - (const_cast<char*>(e.what()))); \ - } \ - catch(...) { \ - caml_raise_constant(*caml_named_value("PPL_unexpected_error")); \ + +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + +Parma_Watchdog_Library::Watchdog* p_timeout_object = 0; + +void +reset_timeout() { + if (p_timeout_object) { + delete p_timeout_object; + p_timeout_object = 0; + abandon_expensive_computations = 0; } +} +#endif // PPL_WATCHDOG_LIBRARY_ENABLED + +void +handle_timeout_exception() { +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED + assert(p_timeout_object); + reset_timeout(); +#endif + caml_raise_with_string(*caml_named_value("PPL_timeout_exception"), + "timeout expired"); +} namespace { @@ -1201,7 +1202,6 @@ ppl_set_rounding_for_PPL(value unit) try { } CATCH_ALL - extern "C" CAMLprim value ppl_restore_pre_PPL_rounding(value unit) try { @@ -1210,3 +1210,37 @@ ppl_restore_pre_PPL_rounding(value unit) try { CAMLreturn(Val_unit); } CATCH_ALL + +extern "C" +CAMLprim value +ppl_set_timeout(value time) try { + CAMLparam1(time); +#ifndef PPL_WATCHDOG_LIBRARY_ENABLED + const char* what = "PPL OCaml interface usage error:\n" + "ppl_set_timeout: the PPL Watchdog library is not enabled."; + throw std::runtime_error(what); +#else + // In case a timeout was already set. + reset_timeout(); + unsigned cpp_time = value_to_unsigned_native<unsigned>(time); + static timeout_exception e; + using Parma_Watchdog_Library::Watchdog; + p_timeout_object = new Watchdog(cpp_time, abandon_expensive_computations, e); + CAMLreturn(Val_unit); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED +} +CATCH_ALL + +extern "C" +CAMLprim value +ppl_reset_timeout(value unit) try { + CAMLparam1(unit); +#ifndef PPL_WATCHDOG_LIBRARY_ENABLED + throw std::runtime_error("PPL OCaml interface error:\n" + "the PPL Watchdog library is not enabled."); +#else + reset_timeout(); + CAMLreturn(Val_unit); +#endif // PPL_WATCHDOG_LIBRARY_ENABLED +} +CATCH_ALL diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index 1555518..05d87de 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -24,6 +24,9 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_ppl_ocaml_common_defs_hh 1 #include "ppl.hh" +#ifdef PPL_WATCHDOG_LIBRARY_ENABLED +#include "pwl.hh" +#endif #include "interfaced_boxes.hh" #include "marked_pointers.hh" @@ -155,6 +158,20 @@ private: std::vector<dimension_type> vec; }; +class timeout_exception : public Parma_Polyhedra_Library::Throwable { +public: + void throw_me() const { + throw *this; + } + int priority() const { + return 0; + } + timeout_exception() { + } +}; + +void handle_timeout_exception(); + } // namespace OCaml } // namespace Interfaces @@ -176,6 +193,9 @@ catch(std::bad_alloc&) { \ caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ (const_cast<char*>(e.what()))); \ } \ + catch(timeout_exception&) { \ + handle_timeout_exception(); \ + } \ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index 06e66bf..1d9fb22 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -138,6 +138,12 @@ unit -> unit = "ppl_set_rounding_for_PPL" external ppl_restore_pre_PPL_rounding: unit -> unit = "ppl_restore_pre_PPL_rounding" +external ppl_set_timeout: +int -> unit = "ppl_set_timeout" + +external ppl_reset_timeout: +unit -> unit = "ppl_reset_timeout" + external ppl_new_MIP_Problem_from_space_dimension: int -> mip_problem = "ppl_new_MIP_Problem_from_space_dimension" diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index 8973162..dcc6d22 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -137,6 +137,12 @@ val ppl_set_rounding_for_PPL: val ppl_restore_pre_PPL_rounding: unit -> unit +val ppl_set_timeout: + int -> unit + +val ppl_reset_timeout: + unit -> unit + type mip_problem val ppl_new_MIP_Problem_from_space_dimension: diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 2a43542..782a368 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -622,72 +622,6 @@ handle_exception(const timeout_exception&) { Prolog_raise_exception(et); } -#define CATCH_ALL \ - catch (const Prolog_unsigned_out_of_range& e) { \ - handle_exception(e); \ - } \ - catch (const not_unsigned_integer& e) { \ - handle_exception(e); \ - } \ - catch (const non_linear& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_variable& e) { \ - handle_exception(e); \ - } \ - catch (const not_an_integer& e) { \ - handle_exception(e); \ - } \ - catch (const ppl_handle_mismatch& e) { \ - handle_exception(e); \ - } \ - catch (const not_an_optimization_mode& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_complexity_class& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_control_parameter_name& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_control_parameter_value& e) { \ - handle_exception(e); \ - } \ - catch (const not_universe_or_empty& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_relation& e) { \ - handle_exception(e); \ - } \ - catch (const not_a_nil_terminated_list& e) { \ - handle_exception(e); \ - } \ - catch (const PPL_integer_out_of_range& e) { \ - handle_exception(e); \ - } \ - catch (const unknown_interface_error& e) { \ - handle_exception(e); \ - } \ - catch (const timeout_exception& e) { \ - handle_exception(e); \ - } \ - catch(const std::overflow_error& e) { \ - handle_exception(e); \ - } \ - catch(const std::length_error& e) { \ - handle_exception(e); \ - } \ - catch (const std::bad_alloc& e) { \ - handle_exception(e); \ - } \ - catch (const std::exception& e) { \ - handle_exception(e); \ - } \ - catch (...) { \ - handle_exception(); \ - } \ - return PROLOG_FAILURE - Prolog_term_ref variable_term(dimension_type varid) { Prolog_term_ref v = Prolog_new_term_ref();

1 0

[GIT] ppl/ppl(master): Improvements to the OCaml and Prolog interface documentation.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 35c225d666eba8a683faf08f6f840b65bc36802f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=35c225d666eb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 12:14:05 2009 +0200 Improvements to the OCaml and Prolog interface documentation. --- interfaces/OCaml/OCaml_interface.dox | 66 +++++++++++++++++++------------ interfaces/Prolog/Prolog_interface.dox | 6 +- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 50c59f1..bc786da 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -133,11 +133,11 @@ on the use of the OCaml interface. intended version(s) of the library are ever used. Functions \code - ppl_version_major/1, - ppl_version_minor/1, - ppl_version_revision/1, - ppl_version_beta/1, - ppl_version/1, + ppl_version_major, + ppl_version_minor, + ppl_version_revision, + ppl_version_beta, + ppl_version, ppl_banner. \endcode allow run-time checking of information about the version being used. @@ -149,27 +149,27 @@ Below is a short description of many of the interface functions. For full definitions of terminology used here, see the main PPL user manual. \anchor di_functions -<H3> Domain Independent Functions </H3> +<H1> Domain Independent Functions </H1> First we describe some domain independent functions included with all instantiations of the OCaml interfaces. -<H2><CODE> ppl_version_major</CODE></H2> +<H2><CODE> ppl_version_major </CODE></H2> Returns the major number of the PPL version. -<H2><CODE> ppl_version_minor</CODE></H2> +<H2><CODE> ppl_version_minor </CODE></H2> Returns the minor number of the PPL version. -<H2><CODE> ppl_version_revision</CODE></H2> +<H2><CODE> ppl_version_revision </CODE></H2> Returns the revision number of the PPL version. -<H2><CODE> ppl_version_beta</CODE></H2> +<H2><CODE> ppl_version_beta </CODE></H2> Returns the beta number of the PPL version. -<H2><CODE> ppl_version</CODE></H2> +<H2><CODE> ppl_version </CODE></H2> Returns the PPL version. -<H2><CODE> ppl_banner</CODE></H2> +<H2><CODE> ppl_banner </CODE></H2> Returns information about the PPL version, the licensing, the lack of any warranty whatsoever, the C++ compiler used to build the library, where to report bugs and where to look for further information. @@ -189,7 +189,8 @@ included with all instantiations of the OCaml interfaces. If the coefficients are bounded, returns the minimum coefficient the C++ interface can handle. -<H2><CODE> ppl_io_wrap_string </CODE></H2> +<H2><CODE> ppl_io_wrap_string source_string indent_depth + preferred_first_line_length preferred_line_length </CODE></H2> Utility function for the wrapping of lines of text. The function wraps the lines of text stored in its first string argument according to the next three integer arguments, which are interpreted as @@ -197,27 +198,29 @@ included with all instantiations of the OCaml interfaces. preferred length for all the other lines, respecively; it returns a string containing the wrapped text. -<H2><CODE> ppl_set_timeout c_unsigned </CODE></H2> - Computations taking exponential time will be interrupted - some time after <CODE>c_unsigned</CODE> ms after that call. +<H2><CODE> ppl_set_timeout hsecs </CODE></H2> + Computations taking exponential time will be interrupted some time + after <CODE>hsecs</CODE> hundreths of seconds after that call. If the computation is interrupted that way, a timeout exception will be thrown. - <CODE>c_unsigned</CODE> must be strictly greater than zero. + An exception is immediately thrown if <CODE>hsecs</CODE> is not strictly + greater than zero, or if the PPL Watchdog library is not enabled. <H2><CODE> ppl_reset_timeout </CODE></H2> Resets the timeout time so that the computation is not interrupted. + An exception is thrown if the PPL Watchdog library is not enabled. <H2><CODE> ppl_set_rounding_for_PPL </CODE></H2> Sets the FPU rounding mode so that the PPL abstractions based on floating point numbers work correctly. This is performed automatically at initialization-time. Calling - this function is needed only if <CODE>restore_pre_PPL_rounding()</CODE> + this function is needed only if <CODE>restore_pre_PPL_rounding</CODE> has previously been called. <H2><CODE> ppl_restore_pre_PPL_rounding </CODE></H2> Sets the FPU rounding mode as it was before initialization of the PPL. After calling this function it is absolutely necessary to call - <CODE>set_rounding_for_PPL()</CODE> before using any PPL abstractions + <CODE>set_rounding_for_PPL</CODE> before using any PPL abstractions based on floating point numbers. This is performed automatically at finalization-time. @@ -401,9 +404,7 @@ defining mixed integer (linear) programming problems. \anchor main_OCaml_C_polyhedron_functions <H1> C_Polyhedron Functions </H1> Here we describe the main functions available for PPL objects -defining convex and closed polyhedra. A list of the available -PPL functions for convex polyhedra for the OCaml interface is given in -Section \ref OCamldoc_Documentation "OCamldoc Documentation". +defining convex and closed polyhedra. <H2><CODE> ppl_new_C_Polyhedron_from_space_dimension space_dimension universe_or_empty @@ -954,17 +955,30 @@ This is the inverse transformation to that for <CODE>ppl_affine_image</CODE>. \anchor OCamldoc_Documentation -\latexonly -\input ocamldoc.tex -\endlatexonly -\htmlonly <H1>OCamldoc Documentation</H1> +\htmlonly For a list of the PPL functions available to the generated domains for the OCaml interface, see the <A HREF="ocamldoc/index.html">OCamldoc-generated documentation</a>. +<P> \endhtmlonly +<strong>NOTE:</strong> +the complete documentation for module <code>Ppl_ocaml</code>, including +all the types and functions that were enabled at configuration time, is +only available in the <em>configuration dependent</em> OCamldoc +documentation. +The configuration independent OCamldoc documentation only contains +those types and functions that are always enabled, which are grouped +into module <code>Ppl_ocaml_globals</code>. +Also note that module <code>Ppl_ocaml</code> automatically includes +module <code>Ppl_ocaml_globals</code>. + +\latexonly +\input ocamldoc.tex +\endlatexonly + \anchor OI_Compilation <H1>Compilation and Installation</H1> diff --git a/interfaces/Prolog/Prolog_interface.dox b/interfaces/Prolog/Prolog_interface.dox index 38c88db..7ab65d3 100644 --- a/interfaces/Prolog/Prolog_interface.dox +++ b/interfaces/Prolog/Prolog_interface.dox @@ -423,13 +423,13 @@ that are included with all instantiations of the Prolog interfaces. <EM>The atom to be thrown by timeout exceptions is unified with <CODE>Atom</CODE>.</EM> -<P><CODE> ppl_set_timeout(+C_unsigned) </CODE><BR> +<P><CODE> ppl_set_timeout(+Hsecs) </CODE><BR> <EM>Computations taking exponential time will be interrupted - some time after <CODE>C_unsigned</CODE> ms after that call. + some time after <CODE>Hsecs</CODE> hundreths of seconds after that call. If the computation is interrupted that way, the current timeout exception atom will be thrown. - <CODE>C_unsigned</CODE> must be strictly greater than zero.</EM> + <CODE>Hsecs</CODE> must be strictly greater than zero.</EM> <P><CODE> ppl_reset_timeout </CODE><BR>

1 0

[PATCH] Pass MAKE environment to run_tests script
by Tobias Grosser 30 Mar '09

30 Mar '09

The tests/Box/run_tests script uses make from $MAKE otherwise just 'make'. As on FreeBSD gnu make is 'gmake', we have to set MAKE in the environment of run_tests to not execute the bsd make 'make'. --- tests/Box/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index 53600ef..ce2bc6b 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -22,14 +22,14 @@ if VALGRIND_TESTS_ENABLED -CHECKER = \ +CHECKER = MAKE=$(MAKE) \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ --num-callers=100 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED -CHECKER = +CHECKER = MAKE=$(MAKE) endif !VALGRIND_TESTS_ENABLED -- 1.6.1.3

1 0

[GIT] ppl/ppl(master): Fixed restore of parallelized tests.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: d2d08794ca7d154847d5b6d30de0e0cb242c97cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d2d08794ca7d… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 10:52:47 2009 +0200 Fixed restore of parallelized tests. --- tests/BD_Shape/.gitignore | 1 + tests/BD_Shape/Makefile.am | 11 ++++++++++- tests/Box/.gitignore | 1 + tests/Box/Makefile.am | 11 ++++++++++- tests/Octagonal_Shape/.gitignore | 1 + tests/Octagonal_Shape/Makefile.am | 11 ++++++++++- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/tests/BD_Shape/.gitignore b/tests/BD_Shape/.gitignore index b750b4e..c43beea 100644 --- a/tests/BD_Shape/.gitignore +++ b/tests/BD_Shape/.gitignore @@ -62,6 +62,7 @@ relations2 relations3 relations4 removespacedims1 +run_tests.stamp timeelapse1 unconstrain1 universe1 diff --git a/tests/BD_Shape/Makefile.am b/tests/BD_Shape/Makefile.am index 97044a5..3a6e92d 100644 --- a/tests/BD_Shape/Makefile.am +++ b/tests/BD_Shape/Makefile.am @@ -116,7 +116,13 @@ TEST_CPPFLAGS=-DBD_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = $(srcdir)/run_tests +TESTS = run_tests.stamp + +.PHONY: run_tests.stamp +run_tests.stamp: run_tests + +$(srcdir)/run_tests + echo "true" >run_tests.stamp + chmod +x run_tests.stamp XFAIL_TESTS = @@ -280,5 +286,8 @@ writebdshape1_SOURCES = writebdshape1.cc MOSTLYCLEANFILES = \ ascii_dump_load1.dat +CLEANFILES = \ +run_tests.stamp + DISTCLEANFILES = \ dirty_marker diff --git a/tests/Box/.gitignore b/tests/Box/.gitignore index b16b31f..7b03b66 100644 --- a/tests/Box/.gitignore +++ b/tests/Box/.gitignore @@ -57,6 +57,7 @@ relations2 relations3 relations4 removespacedims1 +run_tests.stamp timeelapse1 topclosed1 unconstrain1 diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index 53600ef..6ed73cd 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -120,7 +120,13 @@ TEST_CPPFLAGS=-DBOX_INSTANCE=rt_r_oc dist_check_SCRIPTS = run_tests -TESTS = $(srcdir)/run_tests +TESTS = run_tests.stamp + +.PHONY: run_tests.stamp +run_tests.stamp: run_tests + +$(srcdir)/run_tests + echo "true" >run_tests.stamp + chmod +x run_tests.stamp XFAIL_TESTS = @@ -303,5 +309,8 @@ EXTRA_DIST = $(refinewithconstraints2_SRCS) MOSTLYCLEANFILES = \ ascii_dump_load1.dat +CLEANFILES = \ +run_tests.stamp + DISTCLEANFILES = \ dirty_marker diff --git a/tests/Octagonal_Shape/.gitignore b/tests/Octagonal_Shape/.gitignore index bd12d6f..4091625 100644 --- a/tests/Octagonal_Shape/.gitignore +++ b/tests/Octagonal_Shape/.gitignore @@ -60,6 +60,7 @@ relatwithcons2 relatwithcons3 relatwithgen1 removespacedims1 +run_tests.stamp timeelapse1 unconstrain1 universe1 diff --git a/tests/Octagonal_Shape/Makefile.am b/tests/Octagonal_Shape/Makefile.am index 710f81a..7615cc5 100644 --- a/tests/Octagonal_Shape/Makefile.am +++ b/tests/Octagonal_Shape/Makefile.am @@ -123,7 +123,13 @@ TEST_CPPFLAGS=-DOCTAGONAL_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = $(srcdir)/run_tests +TESTS = run_tests.stamp + +.PHONY: run_tests.stamp +run_tests.stamp: run_tests + +$(srcdir)/run_tests + echo "true" >run_tests.stamp + chmod +x run_tests.stamp XFAIL_TESTS = @@ -281,5 +287,8 @@ writeoctagon1_SOURCES = writeoctagon1.cc MOSTLYCLEANFILES = \ ascii_dump_load1.dat +CLEANFILES = \ +run_tests.stamp + DISTCLEANFILES = \ dirty_marker

1 0

[GIT] ppl/ppl(master): Revert "Restore parallelized tests."
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 2991d105382cbef859fbd9125fe1e786c552b40f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2991d105382c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 09:59:17 2009 +0200 Revert "Restore parallelized tests." This reverts commit b163fee3b048fe3dd07be912850ec042f4d24b2d. --- tests/BD_Shape/Makefile.am | 6 +----- tests/Box/Makefile.am | 6 +----- tests/Octagonal_Shape/Makefile.am | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/tests/BD_Shape/Makefile.am b/tests/BD_Shape/Makefile.am index cfba93a..97044a5 100644 --- a/tests/BD_Shape/Makefile.am +++ b/tests/BD_Shape/Makefile.am @@ -116,11 +116,7 @@ TEST_CPPFLAGS=-DBD_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests -tests: - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS = diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index 35caa5f..53600ef 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -120,11 +120,7 @@ TEST_CPPFLAGS=-DBOX_INSTANCE=rt_r_oc dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests -tests: - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS = diff --git a/tests/Octagonal_Shape/Makefile.am b/tests/Octagonal_Shape/Makefile.am index 604dac7..710f81a 100644 --- a/tests/Octagonal_Shape/Makefile.am +++ b/tests/Octagonal_Shape/Makefile.am @@ -123,11 +123,7 @@ TEST_CPPFLAGS=-DOCTAGONAL_SHAPE_INSTANCE=mpq_class dist_check_SCRIPTS = run_tests -TESTS = tests - -.PHONY: tests -tests: - +$(srcdir)/run_tests +TESTS = $(srcdir)/run_tests XFAIL_TESTS =

1 0