- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Revised to allow for for expected logic_error.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: master Commit: 0ec850342436eb232eedec639fe8250b573a5bef URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ec850342436… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 10:19:29 2010 +0000 Revised to allow for for expected logic_error. --- interfaces/Prolog/tests/pl_check.pl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 22b08d3..409966a 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2787,7 +2787,8 @@ must_catch(Call, prolog_exception_error) :- must_catch(Call, cpp_error) :- !, catch( Call, Message, format_exception_message( cpp_error(Message) ) ), - ( ( \+ var(Message), name(Message, [80,80,76,58,58|_] ) ) -> + ( ( \+ var(Message), + functor(Message, ppl_logic_error, _) ) -> true ; fail

1 0

[GIT] ppl/ppl(master): Let test13 compile.
by Enea Zaffanella 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: master Commit: 027210b2a7098cbd20259456cac08cb41f5e120d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=027210b2a709… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 21 19:25:53 2010 +0100 Let test13 compile. --- tests/Octagonal_Shape/frequency1.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 652a5e0..ad840a6 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -299,8 +299,8 @@ test13() { TOctagonal_Shape os(3); os.add_constraint(4*A - 4*B == 1); - o.add_constraint(3*C == 1); - o.add_constraint(B <= 2); + os.add_constraint(3*C == 1); + os.add_constraint(B <= 2); Coefficient num; Coefficient den;

1 0

[GIT] ppl/ppl(termination): Merge branch 'master' into termination
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: termination Commit: ede25520fb54f969f037310ae4ebddd97976607e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ede25520fb54… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:33:09 2010 +0400 Merge branch 'master' into termination ---

1 0

[GIT] ppl/ppl(termination): Fixed the ordering of exception handlers.
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: termination Commit: b43d29400ddc9823f5d08d4148adb804dcc8e321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b43d29400ddc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:32:40 2010 +0400 Fixed the ordering of exception handlers. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index db969a8..7754c68 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,10 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (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()))); \ @@ -209,10 +213,6 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ -catch(std::logic_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ - (const_cast<char*>(e.what()))); \ -} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \

1 0

[GIT] ppl/ppl(master): Fixed the ordering of exception handlers.
by Roberto Bagnara 21 Mar '10

21 Mar '10

Module: ppl/ppl Branch: master Commit: b43d29400ddc9823f5d08d4148adb804dcc8e321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b43d29400ddc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 07:32:40 2010 +0400 Fixed the ordering of exception handlers. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index db969a8..7754c68 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,10 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (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()))); \ @@ -209,10 +213,6 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ -catch(std::logic_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ - (const_cast<char*>(e.what()))); \ -} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \

1 0

[GIT] ppl/ppl(termination): New commits
by Roberto Bagnara 21 Mar '10

21 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3b435f819c6f… Merge: 636c546843046a5cfa6d27a1aa4a8171d7e537ab 0f40cc8d92d033ab5c78cdd2d4661f395603e8b5 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 21 06:56:23 2010 +0400 Merge branch 'master' into termination URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f40cc8d92d0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 22:00:34 2010 +0000 Added further needed code for handling logic_error exception. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ceb0b7e208b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:49:18 2010 +0000 Added missing code for logic_error exception. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0cf98127510b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Mar 18 15:08:15 2010 +0000 Added std::logic_error to the list of exceptions caught. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca9a894625c3… Author: François Galea <francois.galea(a)uvsq.fr> Date: Sat Mar 20 11:41:44 2010 +0100 Added a test generating a solution node with two context constraints. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=42a77adddb8e… Merge: 367f75cf57a1576f54c0bf553c714e838d8c1773 b831a0b77c3ba4f7dbe716619a8b3f225f430079 Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 20 08:27:47 2010 +0400 Merge branch 'master' into products URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=367f75cf57a1… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 15 16:27:50 2010 +0000 Test changed so as to be meaningful for all integer types. Comment typos fixed.

1 0

[GIT] ppl/ppl(master): Added further needed code for handling logic_error exception.
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 0f40cc8d92d033ab5c78cdd2d4661f395603e8b5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f40cc8d92d0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 22:00:34 2010 +0000 Added further needed code for handling logic_error exception. --- interfaces/Prolog/ppl_prolog_common.cc | 10 ++++++++++ interfaces/Prolog/ppl_prolog_common.defs.hh | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 0c1b4a2..4921bf9 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -161,6 +161,7 @@ Prolog_atom a_ppl_invalid_argument; Prolog_atom a_ppl_overflow_error; Prolog_atom a_ppl_domain_error; Prolog_atom a_ppl_length_error; +Prolog_atom a_ppl_logic_error; Prolog_atom a_ppl_representation_error; Prolog_atom a_expected; Prolog_atom a_found; @@ -245,6 +246,7 @@ const Prolog_Interface_Atom prolog_interface_atoms[] = { { &a_ppl_overflow_error, "ppl_overflow_error" }, { &a_ppl_domain_error, "ppl_domain_error" }, { &a_ppl_length_error, "ppl_length_error" }, + { &a_ppl_logic_error, "ppl_logic_error" }, { &a_ppl_representation_error, "ppl_representation_error" }, { &a_expected, "expected" }, { &a_found, "found" }, @@ -583,6 +585,14 @@ handle_exception(const std::length_error& e) { } void +handle_exception(const std::logic_error& e) { + Prolog_term_ref et = Prolog_new_term_ref(); + Prolog_construct_compound(et, a_ppl_logic_error, + Prolog_atom_term_from_string(e.what())); + Prolog_raise_exception(et); +} + +void handle_exception(const std::bad_alloc&) { Prolog_term_ref et = Prolog_new_term_ref(); Prolog_put_atom(et, out_of_memory_exception_atom); diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index ce3fb55..c674f50 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -510,13 +510,13 @@ handle_exception(const deterministic_timeout_exception&); catch(const std::length_error& e) { \ handle_exception(e); \ } \ - catch (const std::bad_alloc& e) { \ + catch (const std::logic_error& e) { \ handle_exception(e); \ } \ - catch (const std::exception& e) { \ + catch (const std::bad_alloc& e) { \ handle_exception(e); \ } \ - catch (const std::logic_error& e) { \ + catch (const std::exception& e) { \ handle_exception(e); \ } \ catch (...) { \

1 0

[GIT] ppl/ppl(master): Added missing code for logic_error exception.
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 8ceb0b7e208be8a99d61372f883c1853ce390952 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ceb0b7e208b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:49:18 2010 +0000 Added missing code for logic_error exception. --- interfaces/Prolog/ppl_prolog_common.defs.hh | 3 + tests/Grid/frequency1.cc | 64 +++++++++++++++++++++++++++ tests/Octagonal_Shape/frequency1.cc | 31 +++++++++++++ 3 files changed, 98 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index bb3e245..ce3fb55 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -413,6 +413,9 @@ void handle_exception(const std::length_error& e); void +handle_exception(const std::logic_error& e); + +void handle_exception(const std::bad_alloc&); void diff --git a/tests/Grid/frequency1.cc b/tests/Grid/frequency1.cc index d4727e4..1ee313e 100644 --- a/tests/Grid/frequency1.cc +++ b/tests/Grid/frequency1.cc @@ -267,6 +267,67 @@ test11() { return ok && (gr == known_gr); } +bool +test12() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_constraint(A == 0); + gr.add_congruence(B %= 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(A), num, den, valn, vald) + && num == 0 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + + return ok; +} + +bool +test13() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_constraint(A == 0); + gr.add_constraint(B == 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(A), num, den, valn, vald) + && num == 0 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + + return ok; +} + +bool +test14() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_congruence((A %= 0) / 1); + gr.add_congruence((2*A - B %= 0) / 2); + print_congruences(gr, "*** gr ***"); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(B), num, den, valn, vald) + && num == 2 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + nout << num << den; + return ok; +} + } // namespace BEGIN_MAIN @@ -281,4 +342,7 @@ BEGIN_MAIN DO_TEST(test09); DO_TEST(test10); DO_TEST(test11); + DO_TEST(test12); + DO_TEST(test13); + DO_TEST(test14); END_MAIN diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 8184a0c..652a5e0 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -291,6 +291,36 @@ test12() { return ok; } +bool +test13() { + Variable A(0); + Variable B(1); + Variable C(2); + + TOctagonal_Shape os(3); + os.add_constraint(4*A - 4*B == 1); + o.add_constraint(3*C == 1); + o.add_constraint(B <= 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool discrete = os.frequency(Linear_Expression(A - B), + num, den, valn, vald); + // If the shape is based on an integral coefficient type, then + // approximations will induce non discreteness of the linear expression. + bool ok + = std::numeric_limits<TOctagonal_Shape::coefficient_type_base>::is_integer + ? (!discrete && num == 0 && den == 0 && valn == 0 && vald == 0) + : (discrete && num == 0 && den == 1 && valn == 1 && vald == 4); + print_constraints(os, "*** os ***"); + nout << "num " << num << ", den " << den << endl; + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + } // namespace BEGIN_MAIN @@ -306,4 +336,5 @@ BEGIN_MAIN DO_TEST(test10); DO_TEST(test11); DO_TEST(test12); + DO_TEST(test13); END_MAIN

1 0

[GIT] ppl/ppl(termination): Simplified OCaml code for all_zero() and all_homogeneous_terms_are_zero()
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: 636c546843046a5cfa6d27a1aa4a8171d7e537ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=636c54684304… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:44:54 2010 +0000 Simplified OCaml code for all_zero() and all_homogeneous_terms_are_zero() --- interfaces/OCaml/ppl_ocaml_common.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index e574656..8592046 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1206,8 +1206,7 @@ extern "C" CAMLprim value ppl_Linear_Expression_is_zero(value ocaml_le) try { CAMLparam1(ocaml_le); - Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); - CAMLreturn(ppl_le.is_zero() + CAMLreturn(build_ppl_Linear_Expression(ocaml_le).is_zero() ? Val_true : Val_false); } CATCH_ALL @@ -1216,8 +1215,8 @@ extern "C" CAMLprim value ppl_Linear_Expression_all_homogeneous_terms_are_zero(value ocaml_le) try { CAMLparam1(ocaml_le); - Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); - CAMLreturn(ppl_le.all_homogeneous_terms_are_zero() + CAMLreturn(build_ppl_Linear_Expression(ocaml_le). + all_homogeneous_terms_are_zero() ? Val_true : Val_false); } CATCH_ALL

1 0

[GIT] ppl/ppl(termination): Added OCaml interface for Linear_Expression:: is_zero() and
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: 866c0a278c0373dfc2ac3809ca894f366251a0a0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=866c0a278c03… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:27:54 2010 +0000 Added OCaml interface for Linear_Expression::is_zero() and all_homogeneous_terms_are_zero(). --- interfaces/OCaml/ppl_ocaml_common.cc | 20 ++++++++++++++++++++ interfaces/OCaml/ppl_ocaml_globals.ml | 7 +++++++ interfaces/OCaml/ppl_ocaml_globals.mli | 6 ++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 62b67d5..e574656 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1204,6 +1204,26 @@ CATCH_ALL extern "C" CAMLprim value +ppl_Linear_Expression_is_zero(value ocaml_le) try { + CAMLparam1(ocaml_le); + Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); + CAMLreturn(ppl_le.is_zero() + ? Val_true : Val_false); +} +CATCH_ALL + +extern "C" +CAMLprim value +ppl_Linear_Expression_all_homogeneous_terms_are_zero(value ocaml_le) try { + CAMLparam1(ocaml_le); + Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); + CAMLreturn(ppl_le.all_homogeneous_terms_are_zero() + ? Val_true : Val_false); +} +CATCH_ALL + +extern "C" +CAMLprim value ppl_set_rounding_for_PPL(value unit) try { CAMLparam1(unit); set_rounding_for_PPL(); diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index c8995eb..cd263d5 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -152,6 +152,13 @@ unit -> Z.t = "ppl_Coefficient_max" external ppl_Coefficient_min: unit -> Z.t = "ppl_Coefficient_min" +external ppl_Linear_Expression_is_zero: +linear_expression -> bool = "ppl_Linear_Expression_is_zero" + +external ppl_Linear_Expression_all_homogeneous_terms_are_zero: +linear_expression -> bool + = "ppl_Linear_Expression_all_homogeneous_terms_are_zero" + external ppl_set_rounding_for_PPL: unit -> unit = "ppl_set_rounding_for_PPL" diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index a95ac64..f806f0d 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -137,6 +137,12 @@ val ppl_Coefficient_max: val ppl_Coefficient_min: unit -> Z.t +val ppl_Linear_Expression_is_zero: + linear_expression -> bool + +val ppl_Linear_Expression_all_homogeneous_terms_are_zero: + linear_expression -> bool + val ppl_set_rounding_for_PPL: unit -> unit

1 0