December 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Prefer early return to dummy assignment in unreachable code path.
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: 50504a0234039cab2e473884ed378a3058739412 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=50504a023403… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 07:42:51 2011 +0100 Prefer early return to dummy assignment in unreachable code path. --- src/Polyhedron_public.cc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index a3f242b..8f61679 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -3017,8 +3017,7 @@ generalized_affine_preimage(const Variable var, default: // The EQUAL and NOT_EQUAL cases have been already dealt with. PPL_UNREACHABLE; - reversed_relsym = GREATER_OR_EQUAL; - break; + return; } // Check whether the preimage of this affine relation can be easily

1 0

[GIT] ppl/ppl(master): Add assignment to silence compiler warning.
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: 9e39d6074bab1388bf7f63a58bcf1317f4c65ce2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9e39d6074bab… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 07:41:12 2011 +0100 Add assignment to silence compiler warning. --- src/Polyhedron_public.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index 3f652f5..a3f242b 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -3017,6 +3017,7 @@ generalized_affine_preimage(const Variable var, default: // The EQUAL and NOT_EQUAL cases have been already dealt with. PPL_UNREACHABLE; + reversed_relsym = GREATER_OR_EQUAL; break; }

1 0

[GIT] ppl/ppl(master): Fixed typo.
by Enea Zaffanella 10 Dec '11

10 Dec '11

Module: ppl/ppl Branch: master Commit: e7479b827db977fc493088ef56671f0b539f6b66 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e7479b827db9… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Dec 10 07:37:40 2011 +0100 Fixed typo. --- doc/devref.doxyconf-html.in | 2 +- doc/devref.doxyconf-latex.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/devref.doxyconf-html.in b/doc/devref.doxyconf-html.in index 8a67bd5..ea929aa 100644 --- a/doc/devref.doxyconf-html.in +++ b/doc/devref.doxyconf-html.in @@ -139,7 +139,7 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/termination.defs.hh \ @srcdir@/../src/termination.templates.hh \ @srcdir@/../src/termination.cc \ - @srcdir@/../src/Topology.hh \ + @srcdir@/../src/Topology.types.hh \ @srcdir@/../src/Sparse_Row.types.hh \ @srcdir@/../src/Sparse_Row.defs.hh \ @srcdir@/../src/Sparse_Row.inlines.hh \ diff --git a/doc/devref.doxyconf-latex.in b/doc/devref.doxyconf-latex.in index dce5cac..1c75de1 100644 --- a/doc/devref.doxyconf-latex.in +++ b/doc/devref.doxyconf-latex.in @@ -139,7 +139,7 @@ INPUT = @srcdir@/definitions.dox \ @srcdir@/../src/termination.defs.hh \ @srcdir@/../src/termination.templates.hh \ @srcdir@/../src/termination.cc \ - @srcdir@/../src/Topology.hh \ + @srcdir@/../src/Topology.types.hh \ @srcdir@/../src/Sparse_Row.types.hh \ @srcdir@/../src/Sparse_Row.defs.hh \ @srcdir@/../src/Sparse_Row.inlines.hh \

1 0

[GIT] ppl/ppl(master): Improved name of helper function in OCaml interface.
by Enea Zaffanella 09 Dec '11

09 Dec '11

Module: ppl/ppl Branch: master Commit: e4cc508f1bfe1164358556884cd44474485c50a1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e4cc508f1bfe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 18:46:44 2011 +0100 Improved name of helper function in OCaml interface. Add default label to switch to avoid warning. --- interfaces/OCaml/ppl_ocaml_common.cc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 6a7efa5..0777a00 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -249,12 +249,13 @@ build_ppl_Complexity_Class(value cc) { } MIP_Problem::Control_Parameter_Name -build_ppl_control_parameter_name(value caml_cp_name) { +build_ppl_mip_problem_control_parameter_name(value caml_cp_name) { assert(Is_long(caml_cp_name)); if (Int_val(caml_cp_name) == 0) return MIP_Problem::PRICING; else - PPL_OCAML_UNEXPECTED_MSG("build_ppl_control_parameter_name(cpn)"); + PPL_OCAML_UNEXPECTED_MSG("build_ppl_mip_problem_" + "control_parameter_name(cpn)"); } MIP_Problem::Control_Parameter_Value @@ -1022,7 +1023,7 @@ ppl_MIP_Problem_get_control_parameter(value caml_mip, CAMLparam2(caml_mip, caml_cp_name); MIP_Problem& ppl_mip = *p_MIP_Problem_val(caml_mip); MIP_Problem::Control_Parameter_Name ppl_cp_name - = build_ppl_control_parameter_name(caml_cp_name); + = build_ppl_mip_problem_control_parameter_name(caml_cp_name); MIP_Problem::Control_Parameter_Value ppl_cp_value = ppl_mip.get_control_parameter(ppl_cp_name); switch (ppl_cp_value) { @@ -1377,8 +1378,10 @@ ppl_PIP_Problem_get_control_parameter(value caml_pip, CAMLreturn(Val_int(3)); case PIP_Problem::PIVOT_ROW_STRATEGY_MAX_COLUMN: CAMLreturn(Val_int(4)); + default: + PPL_UNREACHABLE; + CAMLreturn(Val_int(5)); } - PPL_UNREACHABLE; } CATCH_ALL

1 0

[GIT] ppl/ppl(master): Added debugging macro PPL_EXPECT_HEAVY.
by Enea Zaffanella 09 Dec '11

09 Dec '11

Module: ppl/ppl Branch: master Commit: 3c49e9f58f55eb1dd2302b35d3ec8f05d2673a96 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3c49e9f58f55… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 18:31:20 2011 +0100 Added debugging macro PPL_EXPECT_HEAVY. Added debugging helper function template copy_contains(). Systematically use PPL_EXPECT_HEAVY(copy_contains(...)) when checking containment assumptions in widening/narrowing methods. --- src/Affine_Space.cc | 20 ++--------- src/BD_Shape.templates.hh | 50 ++++++----------------------- src/Box.templates.hh | 20 ++--------- src/Grid_widenings.cc | 66 +++++++------------------------------- src/MIP_Problem.cc | 2 - src/Octagonal_Shape.templates.hh | 50 ++++++----------------------- src/Polyhedron_widenings.cc | 42 ++++------------------- src/assert.hh | 23 +++++++++++++ 8 files changed, 71 insertions(+), 202 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=3c49e9f5…

1 0

[GIT] ppl/ppl(master): Better differentiate between unreachable code and unexpected values.
by Enea Zaffanella 09 Dec '11

09 Dec '11

Module: ppl/ppl Branch: master Commit: 3440f5a82c511096e4070825fb85c5374b6ddb72 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3440f5a82c51… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 17:41:47 2011 +0100 Better differentiate between unreachable code and unexpected values. We call, e.g., PPL_JAVA_UNEXPECTED when we are converting an illegal Java value to a C++ value; we call PPL_UNREACHABLE when such a mismatch occurs the other way round (an illegal C++ value produced by the core library). --- interfaces/C/ppl_c_implementation_common.cc | 9 +-- interfaces/C/ppl_c_implementation_common.defs.hh | 3 - ...ppl_interface_generator_java_classes_cc_code.m4 | 8 +- interfaces/Java/jni/ppl_java_common.cc | 52 ++++++++-------- interfaces/Java/jni/ppl_java_common.defs.hh | 24 ++++--- interfaces/OCaml/ppl_ocaml_common.cc | 67 ++++++++------------ interfaces/OCaml/ppl_ocaml_common.defs.hh | 4 +- 7 files changed, 75 insertions(+), 92 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=3440f5a8…

1 0

[GIT] ppl/ppl(master): Prefer if statement to switch having a single case.
by Enea Zaffanella 09 Dec '11

09 Dec '11

Module: ppl/ppl Branch: master Commit: 8c89cabcad0b8e807538ec7dbc75985936ef621e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c89cabcad0b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 15:10:42 2011 +0100 Prefer if statement to switch having a single case. Detected by ECLAIR service swchlabs. --- interfaces/Java/jni/ppl_java_common.cc | 12 ++++-------- interfaces/OCaml/ppl_ocaml_common.cc | 12 +++++------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 3358b90..0c9e0d0 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -637,12 +637,10 @@ build_cxx_control_parameter_name(JNIEnv* env, jobject j_cp_name) { CHECK_RESULT_ASSERT(env, cp_name_ordinal_id); jint cp_name = env->CallIntMethod(j_cp_name, cp_name_ordinal_id); CHECK_EXCEPTION_ASSERT(env); - switch (cp_name) { - case 0: + if (cp_name == 0) return MIP_Problem::PRICING; - default: + else PPL_JAVA_UNREACHABLE; - } } jobject @@ -655,13 +653,11 @@ build_java_control_parameter_name = env->GetStaticFieldID(j_cp_name_class, "PRICING", "Lparma_polyhedra_library/Control_Parameter_Name;"); CHECK_RESULT_ASSERT(env, cp_name_pricing_get_id); - switch (cp_name) { - case MIP_Problem::PRICING: + if (cp_name == MIP_Problem::PRICING) return env->GetStaticObjectField(j_cp_name_class, cp_name_pricing_get_id); - default: + else PPL_JAVA_UNREACHABLE; - } } MIP_Problem::Control_Parameter_Value diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index ffae786..ad085f1 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -251,12 +251,10 @@ build_ppl_Complexity_Class(value cc) { MIP_Problem::Control_Parameter_Name build_ppl_control_parameter_name(value caml_cp_name) { assert(Is_long(caml_cp_name)); - switch (Int_val(caml_cp_name)) { - case 0: - return MIP_Problem::PRICING; - default: + if (Int_val(caml_cp_name) == 0) + return MIP_Problem::PRICING; + else PPL_OCAML_UNREACHABLE_MSG("build_ppl_control_parameter_name(cpn)"); - } } MIP_Problem::Control_Parameter_Value @@ -279,9 +277,9 @@ build_ppl_pip_problem_control_parameter_name(value caml_cp_name) { assert(Is_long(caml_cp_name)); switch (Int_val(caml_cp_name)) { case 0: - return PIP_Problem::CUTTING_STRATEGY; + return PIP_Problem::CUTTING_STRATEGY; case 1: - return PIP_Problem::PIVOT_ROW_STRATEGY; + return PIP_Problem::PIVOT_ROW_STRATEGY; default: PPL_OCAML_UNREACHABLE_MSG("build_ppl_pip_problem_" "control_parameter_name(cpn)");

1 0

[GIT] ppl/ppl(master): Prefer if-then-else to switch having a single case label.
by Enea Zaffanella 09 Dec '11

09 Dec '11

Module: ppl/ppl Branch: master Commit: 17c7d99b34eb7abbb25de24b0ff7a200fb3da598 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=17c7d99b34eb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 14:27:14 2011 +0100 Prefer if-then-else to switch having a single case label. Detected by ECLAIR service swchlabs. --- src/ppl-config.cc.in | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/ppl-config.cc.in b/src/ppl-config.cc.in index 2da0c8e..1f5bc9d 100644 --- a/src/ppl-config.cc.in +++ b/src/ppl-config.cc.in @@ -697,13 +697,8 @@ main(int argc, char* argv[]) try { if (s.length() > 0) s += ' '; s += "-lppl"; - switch (required_interface) { - case C: + if (required_interface == C) s += " -lppl_c"; - break; - default: - break; - } s += " -lgmpxx -lgmp"; } portray("LDFLAGS", s);

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 09 Dec '11

09 Dec '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d4b12db130c3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 13:53:56 2011 +0100 Added macro PPL_C_UNREACHABLE_MSG. Use the new macro in a few places in the C interface code. Standardized messages for errors due to Watchdog library not enabled. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9438c7071464… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 13:40:22 2011 +0100 Added macros PPL_OCAML_UNREACHABLE and PPL_OCAML_UNREACHABLE_MSG. Try and use them systematically in the OCaml interface. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a523cbe043f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 13:02:40 2011 +0100 Added new macro PPL_JAVA_UNREACHABLE. Use the new macro to mark unreachable code in the Java interface files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d08420c8dc65… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 12:58:29 2011 +0100 Replaced throws of runtime_error exceptions by calls to PPL_UNREACHABLE. Got rid of a few (now unused) exception throwers. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=31a0bdcb139c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 11:26:13 2011 +0100 Avoid (unreachable) default label when all cases have been listed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3849aea53fcb… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 11:23:36 2011 +0100 Prefer PPL_UNREACHABLE to PPL_ASSERT(0). Avoid mixing reachable and unreachable code paths. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=14344113942d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 11:22:27 2011 +0100 Replaced an occurrence of PPL_ASSERT(0) by PPL_UNREACHABLE. Added an assertion and comment explaining why cases are unreachable. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3265acda1a5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 11:20:54 2011 +0100 Replaced an occurrence of PPL_ASSERT(0) by PPL_UNREACHABLE. Added proper assertion for preconditions. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7c636fa0e883… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 09:42:20 2011 +0100 Prefer if-then-else construct to binary switch. Detected by ECLAIR service swchlabs. Prefer listing a couple of residual switch cases to default label. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=eb0fe79c7af7… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 09:20:35 2011 +0100 Replaced PPL_ASSERT(false) with PPL_UNREACHABLE. For readability, avoid mixing reachable and unreachable paths. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1bc6cf294d3c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 09:16:19 2011 +0100 Prefer if-then-else construct to binary switch. Detected by ECLAIR service swchlabs. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=13865670123a… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 08:56:38 2011 +0100 Fixed a couple of switch statements where we were mixing reachable and unreachable code paths, reducing readability. Added precondition assertions at the start of assign_special_float() so as to make clearer why the default switch case is unreachable. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5adf6d4df3cc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Dec 9 08:25:19 2011 +0100 Added new macro PPL_UNREACHABLE, to be used instead of PPL_ASSERT(false). Started replacing calls to PPL_ASSERT(false) in the core library code.

1 0

[GIT] ppl/ppl(sparse_matrices): Sparse_Row: fix a bug in the constructor from a Dense_Row with a specified size.
by Marco Poletti 07 Dec '11

07 Dec '11

Module: ppl/ppl Branch: sparse_matrices Commit: 0eb66773f43939abd0d8837e957b63c6e5e1c665 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0eb66773f439… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Dec 7 22:53:24 2011 +0100 Sparse_Row: fix a bug in the constructor from a Dense_Row with a specified size. --- src/Sparse_Row.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sparse_Row.cc b/src/Sparse_Row.cc index f17b907..a6ad4fb 100644 --- a/src/Sparse_Row.cc +++ b/src/Sparse_Row.cc @@ -102,8 +102,8 @@ PPL::Sparse_Row::Sparse_Row(const PPL::Dense_Row& row) PPL::Sparse_Row::Sparse_Row(const Dense_Row& row, dimension_type sz, dimension_type capacity) - : tree(Sparse_Row_from_Dense_Row_helper_iterator(row, sz), - Sparse_Row_from_Dense_Row_helper_function(row, sz)), + : tree(Sparse_Row_from_Dense_Row_helper_iterator(row, row.size()), + Sparse_Row_from_Dense_Row_helper_function(row, row.size())), size_(sz) { (void)capacity; PPL_ASSERT(OK());

1 0