- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added calls to WEIGHT macros.
by Enea Zaffanella 06 Apr '10

06 Apr '10

Module: ppl/ppl Branch: master Commit: 85ea941ab9bc28f334e6fba3ed6263757ebf5a25 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=85ea941ab9bc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Apr 6 09:58:17 2010 +0200 Added calls to WEIGHT macros. --- src/PIP_Tree.cc | 106 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 96 insertions(+), 10 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=85ea941a…

1 0

[GIT] ppl/ppl(master): Corrected PIP_Problem test04 to properly call predicate ppl_*_artificials( ).
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: cac4da6e7ece70ff7ebd8b0bfc16e07d41e375af URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cac4da6e7ece… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 20:46:24 2010 +0200 Corrected PIP_Problem test04 to properly call predicate ppl_*_artificials(). Applied a few renamings to the implementation of the predicate. --- interfaces/Prolog/ppl_prolog_common.cc | 25 +++++++++++-------------- interfaces/Prolog/ppl_prolog_common.defs.hh | 2 +- interfaces/Prolog/tests/pl_check.pl | 9 ++++++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 2b5a2bc..1c945a2 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -1405,13 +1405,11 @@ grid_generator_term(const Grid_Generator& g) { } Prolog_term_ref - artificial_parameter_term(const PIP_Tree_Node::Artificial_Parameter& art) { +artificial_parameter_term(const PIP_Tree_Node::Artificial_Parameter& art) { Prolog_term_ref t = Prolog_new_term_ref(); - Prolog_construct_compound - (t, - a_divided_by, - get_linear_expression(art), - Coefficient_to_integer_term(art.denominator())); + Prolog_construct_compound(t, a_divided_by, + get_linear_expression(art), + Coefficient_to_integer_term(art.denominator())); return t; } @@ -3036,25 +3034,24 @@ ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_pip, CATCH_ALL; } -/* FIXME: (Commented) test in pl_check.pl gives segmentation fault! */ extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_pip, +ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, Prolog_term_ref t_artlist) { static const char* where = "ppl_PIP_Tree_Node_artificials/2"; try { - const PIP_Tree_Node* pip = term_to_handle<PIP_Tree_Node>(t_pip, where); - PPL_CHECK(pip); + const PIP_Tree_Node* node + = term_to_handle<PIP_Tree_Node>(t_tree_node, where); + PPL_CHECK(node); Prolog_term_ref tail = Prolog_new_term_ref(); Prolog_put_atom(tail, a_nil); for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator - i = pip->art_parameter_begin(), - arts_end = pip->art_parameter_end(); i != arts_end; ++i) + i = node->art_parameter_begin(), + arts_end = node->art_parameter_end(); i != arts_end; ++i) Prolog_construct_cons(tail, artificial_parameter_term(*i), tail); - if (Prolog_unify(t_artlist, tail)) { + if (Prolog_unify(t_artlist, tail)) return PROLOG_SUCCESS; - } } CATCH_ALL; } diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index e935de8..e1be161 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -1054,7 +1054,7 @@ ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_tree_node, Prolog_term_ref t_dec_node); extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_pip_tree, +ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, Prolog_term_ref t_artlist); extern "C" Prolog_foreign_return_type diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index d0cb260..0db2379 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2457,9 +2457,8 @@ pip_solution :- clean_ppl_new_PIP_Problem( 4, [3*J >= -2*I + 8, J =< 4*I - 4, J =< M, I =< N], [M,N], PIP), ppl_PIP_Problem_solution(PIP, Tree_Node), -%% ppl_PIP_Tree_Node_artificials(PIP, Artificials), -%% write(Artificials), nl, -%% compare_artificials_lists(Artificials, ), + ppl_PIP_Tree_Node_artificials(Tree_Node, Artificials), + Artificials = [], \+ ppl_PIP_Tree_Node_as_solution(Tree_Node, _Sol), ppl_PIP_Tree_Node_constraints(Tree_Node, _CS), ppl_PIP_Tree_Node_as_decision(Tree_Node, Dec), @@ -2472,6 +2471,10 @@ pip_solution :- ppl_PIP_Tree_Node_as_solution(TTChild, TTChild_Sol), ppl_PIP_Solution_Node_get_parametric_values(TTChild_Sol, I, _TPV), ppl_PIP_Decision_Node_get_false_child(TChild_Dec, FTChild), + ppl_PIP_Tree_Node_artificials(FTChild, FTChild_Artificials), + FTChild_Artificials = [Art_LinExpr/Art_Den], + compare_lin_expressions(Art_LinExpr, M), + Art_Den = 2, ppl_PIP_Tree_Node_as_solution(FTChild, FTChild_Sol), ppl_PIP_Solution_Node_get_parametric_values(FTChild_Sol, I, _FPV), ppl_PIP_Problem_OK(PIP),

1 0

[GIT] ppl/ppl(master): Fixed Java interface for PIP_Decision_Node:: child_node(branch).
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: a72963f00f6c6bec5367543096149785c7b4a2e0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a72963f00f6c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 18:44:27 2010 +0200 Fixed Java interface for PIP_Decision_Node::child_node(branch). New interface has a (unboxed) boolean parameter. --- interfaces/Java/jni/ppl_java_globals.cc | 14 +++++++------- .../parma_polyhedra_library/PIP_Decision_Node.java | 7 +++---- interfaces/Java/tests/PIP_Problem_test1.java | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 457ea45..8b28785 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -2012,15 +2012,15 @@ Java_parma_1polyhedra_1library_PIP_1Tree_1Node_artificials JNIEXPORT jobject JNICALL Java_parma_1polyhedra_1library_PIP_1Decision_1Node_child_1node -(JNIEnv* env, jobject j_this, jobject j_branch) { +(JNIEnv* env, jobject j_this, jboolean j_branch) { try { - PIP_Decision_Node* pip + PIP_Decision_Node* dec_node = reinterpret_cast<PIP_Decision_Node*>(get_ptr(env, j_this)); - unsigned u = jtype_to_unsigned<unsigned>(j_integer_to_j_int(env, j_branch)); - bool b = (u == 0) ? false : true; - const PIP_Tree_Node* child - = pip->child_node(b); - + const PIP_Tree_Node* child = dec_node->child_node(j_branch); + if (child == 0) { + jobject null = 0; + return null; + } jclass j_class_s = env->FindClass("parma_polyhedra_library/PIP_Tree_Node"); CHECK_RESULT_ASSERT(env, j_class_s); jmethodID j_ctr_id_s = env->GetMethodID(j_class_s, "<init>", "()V"); diff --git a/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java b/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java index d13ac53..3af54da 100644 --- a/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java +++ b/interfaces/Java/parma_polyhedra_library/PIP_Decision_Node.java @@ -30,9 +30,8 @@ import java.io.IOException; public class PIP_Decision_Node extends PIP_Tree_Node { /*! \brief - Returns a the true branch (if \p b is not zero) - or the false branch (if \p b is zero) of \p pip_dec. + Returns the true branch (if \p branch is true) + or the false branch (if \p branch is false) of \p this. */ - /* FIXME: j_branch should be a boolean. */ - public native PIP_Tree_Node child_node(Integer j_branch); + public native PIP_Tree_Node child_node(boolean branch); } diff --git a/interfaces/Java/tests/PIP_Problem_test1.java b/interfaces/Java/tests/PIP_Problem_test1.java index 78e5621..d36b8e7 100644 --- a/interfaces/Java/tests/PIP_Problem_test1.java +++ b/interfaces/Java/tests/PIP_Problem_test1.java @@ -380,7 +380,7 @@ static { if (relsym != Relation_Symbol.GREATER_OR_EQUAL || (le_left.is_zero()) || (le_right.is_zero())) return false; - PIP_Tree_Node root_true_branch = root.child_node(1); + PIP_Tree_Node root_true_branch = root.child_node(true); if (root_true_branch == null) return false; @@ -406,9 +406,9 @@ static { || (le_left2.is_zero()) || (le_right2.is_zero())) return false; - if (t_child.child_node(1) == null) + if (t_child.child_node(true) == null) return false; - PIP_Solution_Node t_t_child = t_child.child_node(1).as_solution(); + PIP_Solution_Node t_t_child = t_child.child_node(true).as_solution(); if (t_t_child == null || !t_t_child.OK()) return false; @@ -421,7 +421,7 @@ static { Linear_Expression v_i = t_t_child.parametric_values(I); Linear_Expression v_j = t_t_child.parametric_values(J); - PIP_Solution_Node t_f_child = t_child.child_node(0).as_solution(); + PIP_Solution_Node t_f_child = t_child.child_node(false).as_solution(); if (t_f_child == null || !t_f_child.OK()) return false;

1 0

[GIT] ppl/ppl(master): Added known results for a couple of tests.
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: ff51314489c009aa8b8c7aa76366006e62d61299 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ff51314489c0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 18:26:47 2010 +0200 Added known results for a couple of tests. --- tests/BD_Shape/dropsomenonintegerpoints1.cc | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/BD_Shape/dropsomenonintegerpoints1.cc b/tests/BD_Shape/dropsomenonintegerpoints1.cc index 2a085b5..296300d 100644 --- a/tests/BD_Shape/dropsomenonintegerpoints1.cc +++ b/tests/BD_Shape/dropsomenonintegerpoints1.cc @@ -152,7 +152,7 @@ test06() { Variable A(0); Variable B(1); - BD_Shape<mpq_class>bds(2); + BD_Shape<mpq_class> bds(2); bds.add_constraint(2*A <= 1); bds.add_constraint(2*B <= -1); bds.add_constraint(4*A - 4*B <= 7); @@ -161,7 +161,12 @@ test06() { bds.drop_some_non_integer_points(); - bool ok = true; //(bds1 == bds2); + BD_Shape<mpq_class> known_result(2); + known_result.add_constraint(A <= 0); + known_result.add_constraint(B <= -1); + known_result.add_constraint(A - B <= 1); + + bool ok = (bds == known_result); print_constraints(bds, "*** after bds.drop_some_non_integer_points() ***"); @@ -192,7 +197,8 @@ test07() { bool ok = (bds == known_result); - print_constraints(bds, "*** after bds.drop_some_non_integer_points() ***"); + print_constraints(bds, + "*** after bds.drop_some_non_integer_points(varset_A) ***"); return ok; } @@ -309,7 +315,7 @@ test12() { Variables_Set varset_A; varset_A.insert(A); - BD_Shape<mpq_class>bds(2); + BD_Shape<mpq_class> bds(2); bds.add_constraint(2*A <= 1); bds.add_constraint(2*B <= -1); bds.add_constraint(4*A - 4*B <= 7); @@ -318,9 +324,15 @@ test12() { bds.drop_some_non_integer_points(varset_A); - bool ok = true; //(bds1 == bds2); + BD_Shape<mpq_class> known_result(2); + known_result.add_constraint(A <= 0); + known_result.add_constraint(2*B <= -1); + known_result.add_constraint(4*A - 4*B <= 7); - print_constraints(bds, "*** after bds.drop_some_non_integer_points() ***"); + bool ok = (bds == known_result); + + print_constraints(bds, + "*** after bds.drop_some_non_integer_points(varset_A) ***"); return ok; }

1 0

[GIT] ppl/ppl(master): Fixed bugs in Octagonal_Shape: drop_some_on_integer_points().
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: 930f0a20a7bfdc920dc8baff9cae2c3347669cd7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=930f0a20a7bf… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 18:14:15 2010 +0200 Fixed bugs in Octagonal_Shape:drop_some_on_integer_points(). --- src/Octagonal_Shape.templates.hh | 50 +++++++++++++++++--- tests/Octagonal_Shape/dropsomenonintegerpoints1.cc | 34 +++++++++---- 2 files changed, 66 insertions(+), 18 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index fb123c4..7dfb781 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -7572,6 +7572,23 @@ Octagonal_Shape<T>::drop_some_non_integer_points(Complexity_Class) { i_end = matrix.element_end(); i != i_end; ++i) drop_some_non_integer_points_helper(*i); + // Unary constraints should have an even integer boundary. + PPL_DIRTY_TEMP(N, temp_one); + assign_r(temp_one, 1, ROUND_NOT_NEEDED); + for (dimension_type i = 0; i < 2*space_dim; i += 2) { + const dimension_type ci = i+1; + N& mat_i_ci = matrix[i][ci]; + if (!is_plus_infinity(mat_i_ci) && !is_even(mat_i_ci)) { + sub_assign_r(mat_i_ci, mat_i_ci, temp_one, ROUND_UP); + reset_strongly_closed(); + } + N& mat_ci_i = matrix[ci][i]; + if (!is_plus_infinity(mat_ci_i) && !is_even(mat_ci_i)) { + sub_assign_r(mat_ci_i, mat_ci_i, temp_one, ROUND_UP); + reset_strongly_closed(); + } + } + PPL_ASSERT(OK()); } @@ -7593,21 +7610,40 @@ Octagonal_Shape<T> if (marked_empty()) return; + PPL_DIRTY_TEMP(N, temp_one); + assign_r(temp_one, 1, ROUND_NOT_NEEDED); + const Variables_Set::const_iterator v_begin = vars.begin(); const Variables_Set::const_iterator v_end = vars.end(); PPL_ASSERT(v_begin != v_end); typedef typename OR_Matrix<N>::row_reference_type Row_Reference; for (Variables_Set::const_iterator v_i = v_begin; v_i != v_end; ++v_i) { - const dimension_type i = *v_i; - Row_Reference m_i = matrix[i]; + const dimension_type i = 2 * (*v_i); const dimension_type ci = i + 1; + Row_Reference m_i = matrix[i]; Row_Reference m_ci = matrix[ci]; - // Unary constaints. - drop_some_non_integer_points_helper(m_i[ci]); - drop_some_non_integer_points_helper(m_ci[i]); - // Binary constraint (note: only consider j < i). + + // Unary constaints: should be even integers. + N& m_i_ci = m_i[ci]; + if (!is_plus_infinity(m_i_ci)) { + drop_some_non_integer_points_helper(m_i_ci); + if (!is_even(m_i_ci)) { + sub_assign_r(m_i_ci, m_i_ci, temp_one, ROUND_UP); + reset_strongly_closed(); + } + } + N& m_ci_i = m_ci[i]; + if (!is_plus_infinity(m_ci_i)) { + drop_some_non_integer_points_helper(m_ci_i); + if (!is_even(m_ci_i)) { + sub_assign_r(m_ci_i, m_ci_i, temp_one, ROUND_UP); + reset_strongly_closed(); + } + } + + // Binary constraints (note: only consider j < i). for (Variables_Set::const_iterator v_j = v_begin; v_j != v_i; ++v_j) { - const dimension_type j = *v_j; + const dimension_type j = 2 * (*v_j); const dimension_type cj = j + 1; drop_some_non_integer_points_helper(m_i[j]); drop_some_non_integer_points_helper(m_i[cj]); diff --git a/tests/Octagonal_Shape/dropsomenonintegerpoints1.cc b/tests/Octagonal_Shape/dropsomenonintegerpoints1.cc index f5dca86..588c858 100644 --- a/tests/Octagonal_Shape/dropsomenonintegerpoints1.cc +++ b/tests/Octagonal_Shape/dropsomenonintegerpoints1.cc @@ -154,7 +154,7 @@ test06() { Variable A(0); Variable B(1); - Octagonal_Shape<mpq_class>os(2); + Octagonal_Shape<mpq_class> os(2); os.add_constraint(2*A <= 1); os.add_constraint(2*B <= -1); os.add_constraint(4*A - 4*B <= 7); @@ -163,7 +163,12 @@ test06() { os.drop_some_non_integer_points(); - bool ok = true; //(os1 == os2); + Octagonal_Shape<mpq_class> known_result(2); + known_result.add_constraint(A <= 0); + known_result.add_constraint(B <= -1); + known_result.add_constraint(A - B <= 1); + + bool ok = (os == known_result); print_constraints(os, "*** after os.drop_some_non_integer_points() ***"); @@ -190,11 +195,12 @@ test07() { Octagonal_Shape<mpq_class> known_result(2); known_result.add_constraint(A >= 1); known_result.add_constraint(2*B >= -1); - known_result.add_constraint(2*A + 2*B >= 1); + known_result.add_constraint(2*A - 2*B >= 1); bool ok = (os == known_result); - print_constraints(os, "*** after os.drop_some_non_integer_points() ***"); + print_constraints(os, + "*** after os.drop_some_non_integer_points(varset_A) ***"); return ok; } @@ -311,7 +317,7 @@ test12() { Variables_Set varset_A; varset_A.insert(A); - Octagonal_Shape<mpq_class>os(2); + Octagonal_Shape<mpq_class> os(2); os.add_constraint(2*A <= 1); os.add_constraint(2*B <= -1); os.add_constraint(4*A - 4*B <= 7); @@ -320,9 +326,15 @@ test12() { os.drop_some_non_integer_points(varset_A); - bool ok = true; //(os1 == os2); + Octagonal_Shape<mpq_class> known_result(2); + known_result.add_constraint(A <= 0); + known_result.add_constraint(2*B <= -1); + known_result.add_constraint(4*A - 4*B <= 7); - print_constraints(os, "*** after os.drop_some_non_integer_points() ***"); + bool ok = (os == known_result); + + print_constraints(os, + "*** after os.drop_some_non_integer_points(varset_A) ***"); return ok; } @@ -330,16 +342,16 @@ test12() { } // namespace BEGIN_MAIN - DO_TEST_F(test01); + DO_TEST(test01); DO_TEST(test02); DO_TEST(test03); DO_TEST(test04); - DO_TEST_F(test05); + DO_TEST(test05); DO_TEST(test06); - DO_TEST_F(test07); + DO_TEST(test07); DO_TEST(test08); DO_TEST(test09); DO_TEST(test10); -// DO_TEST(test11); + DO_TEST(test11); DO_TEST(test12); END_MAIN

1 0

[GIT] ppl/ppl(master): Uniformed code and get rid of a warning.
by Abramo Bagnara 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: 3b995ff6fcf3f3c0c63f989beba3850c69f6d713 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3b995ff6fcf3… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Apr 5 16:56:29 2010 +0200 Uniformed code and get rid of a warning. --- src/checked_int.inlines.hh | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index ab82f95..f55416c 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -1383,16 +1383,12 @@ add_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case 0: return add<To_Policy, To_Policy, To_Policy>(to, to, z, dir); case -1: - if (to <= 0) { - to = z; - return r; - } + if (to <= 0) + return set_neg_overflow_int<To_Policy>(to, dir); return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); case 1: - if (to >= 0) { - to = z; - return r; - } + if (to >= 0) + return set_pos_overflow_int<To_Policy>(to, dir); return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); default: PPL_ASSERT(false); @@ -1411,11 +1407,11 @@ sub_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case -1: if (to >= 0) return set_pos_overflow_int<To_Policy>(to, dir); - return V_UNKNOWN_NEG_OVERFLOW; + return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); case 1: if (to <= 0) return set_neg_overflow_int<To_Policy>(to, dir); - return V_UNKNOWN_POS_OVERFLOW; + return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); default: PPL_ASSERT(false); return V_NAN;

1 0

[GIT] ppl/ppl(products): Revert "Uniformed code and get rid of a warning."
by Abramo Bagnara 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: products Commit: 77feabbd9e3c40b7a765ba82a3f6e9082af2b78f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=77feabbd9e3c… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Apr 5 16:58:39 2010 +0200 Revert "Uniformed code and get rid of a warning." This reverts commit 5bdc9854986308b794925967fff6995acd5bbb85. --- src/checked_int.inlines.hh | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index f55416c..ab82f95 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -1383,12 +1383,16 @@ add_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case 0: return add<To_Policy, To_Policy, To_Policy>(to, to, z, dir); case -1: - if (to <= 0) - return set_neg_overflow_int<To_Policy>(to, dir); + if (to <= 0) { + to = z; + return r; + } return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); case 1: - if (to >= 0) - return set_pos_overflow_int<To_Policy>(to, dir); + if (to >= 0) { + to = z; + return r; + } return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); default: PPL_ASSERT(false); @@ -1407,11 +1411,11 @@ sub_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case -1: if (to >= 0) return set_pos_overflow_int<To_Policy>(to, dir); - return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); + return V_UNKNOWN_NEG_OVERFLOW; case 1: if (to <= 0) return set_neg_overflow_int<To_Policy>(to, dir); - return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); + return V_UNKNOWN_POS_OVERFLOW; default: PPL_ASSERT(false); return V_NAN;

1 0

[GIT] ppl/ppl(products): Uniformed code and get rid of a warning.
by Abramo Bagnara 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: products Commit: 5bdc9854986308b794925967fff6995acd5bbb85 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5bdc98549863… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Apr 5 16:56:29 2010 +0200 Uniformed code and get rid of a warning. --- src/checked_int.inlines.hh | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index ab82f95..f55416c 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -1383,16 +1383,12 @@ add_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case 0: return add<To_Policy, To_Policy, To_Policy>(to, to, z, dir); case -1: - if (to <= 0) { - to = z; - return r; - } + if (to <= 0) + return set_neg_overflow_int<To_Policy>(to, dir); return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); case 1: - if (to >= 0) { - to = z; - return r; - } + if (to >= 0) + return set_pos_overflow_int<To_Policy>(to, dir); return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); default: PPL_ASSERT(false); @@ -1411,11 +1407,11 @@ sub_mul_int(Type& to, const Type x, const Type y, Rounding_Dir dir) { case -1: if (to >= 0) return set_pos_overflow_int<To_Policy>(to, dir); - return V_UNKNOWN_NEG_OVERFLOW; + return assign_nan<To_Policy>(to, V_UNKNOWN_NEG_OVERFLOW); case 1: if (to <= 0) return set_neg_overflow_int<To_Policy>(to, dir); - return V_UNKNOWN_POS_OVERFLOW; + return assign_nan<To_Policy>(to, V_UNKNOWN_POS_OVERFLOW); default: PPL_ASSERT(false); return V_NAN;

1 0

[GIT] ppl/ppl(master): Avoid useless boxing of builtins when interfacing the wrap_assign().
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: a0e0437138194a515fcdc03024d34f9d08a290cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a0e043713819… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 16:28:14 2010 +0200 Avoid useless boxing of builtins when interfacing the wrap_assign(). Got rid of buggy j_boolean_to_bool() helper. Helper bool_to_j_boolean() renamed to bool_to_j_boolean_class() for clarity, as it builds a boxed Java Boolean value. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 18 ++++++++---------- interfaces/Java/jni/ppl_java_common.cc | 10 +--------- interfaces/Java/jni/ppl_java_common.defs.hh | 6 +----- ...l_interface_generator_java_classes_java_code.m4 | 15 +++++++-------- 4 files changed, 17 insertions(+), 32 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 256acec..36f8938 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 @@ -528,7 +528,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1MAXMIN@__Lparma_1polyhedra_1library_Li if (this_ptr->@MAXMIN@(le, num, den, b_value)) { set_coefficient(env, j_num, build_java_coeff(env, num)); set_coefficient(env, j_den, build_java_coeff(env, den)); - jobject j_boolean = bool_to_j_boolean(env, b_value); + jobject j_boolean = bool_to_j_boolean_class(env, b_value); set_by_reference(env, j_ref_boolean, j_boolean); return true; } @@ -559,7 +559,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1MAXMIN@__Lparma_1polyhedra_1library_Li if (this_ptr->@MAXMIN@(le, num, den, b_value, g)) { set_coefficient(env, j_num, build_java_coeff(env, num)); set_coefficient(env, j_den, build_java_coeff(env, den)); - jobject j_boolean = bool_to_j_boolean(env, b_value); + jobject j_boolean = bool_to_j_boolean_class(env, b_value); set_by_reference(env, j_ref_boolean, j_boolean); jobject j_g_result = build_java_generator(env, g); set_generator(env, j_g, j_g_result); @@ -882,9 +882,9 @@ m4_define(`ppl_@CLASS@_wrap_assign_code', `dnl JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_@1CLASS@_wrap_1assign -(JNIEnv* env, jobject j_this, - jobject j_vars, jobject j_w, jobject j_r, jobject j_o, jobject j_cs, - jobject j_cx, jobject j_ind) try { +(JNIEnv* env, jobject j_this, jobject j_vars, + jobject j_w, jobject j_r, jobject j_o, jobject j_cs, + jlong j_cx, jboolean j_wrap_individually) try { @CPP_CLASS@* this_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); Variables_Set vars = build_cxx_variables_set(env, j_vars); @@ -892,10 +892,8 @@ Java_parma_1polyhedra_1library_@1CLASS@_wrap_1assign Bounded_Integer_Type_Representation r = build_cxx_bounded_rep(env, j_r); Bounded_Integer_Type_Overflow o = build_cxx_bounded_overflow(env, j_o); Constraint_System cs = build_cxx_constraint_system(env, j_cs); - unsigned cx = jtype_to_unsigned<unsigned>(j_integer_to_j_int(env, j_cx)); - bool ind = (j_boolean_to_bool(env, j_ind)); - - this_ptr->wrap_assign(vars, w, r, o, &cs, cx, ind); + unsigned cx = jtype_to_unsigned<unsigned int>(j_cx); + this_ptr->wrap_assign(vars, w, r, o, &cs, cx, j_wrap_individually); } CATCH_ALL @@ -1368,7 +1366,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_approximate_1@PARTITION@ set_ptr(env, j_obj_r2, r2); set_pair_element(env, j_pair_obj, 0, j_obj_r1); set_pair_element(env, j_pair_obj, 1, j_obj_r2); - jobject j_finite_bool = bool_to_j_boolean(env, b_finite_val); + jobject j_finite_bool = bool_to_j_boolean_class(env, b_finite_val); set_by_reference(env, j_ref_finite_bool, j_finite_bool); return j_pair_obj; } diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 0b61539..1829283 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -407,7 +407,7 @@ build_cxx_artificial_parameter(JNIEnv* env, jobject j_artificial_parameter) { } jobject -bool_to_j_boolean(JNIEnv* env, const bool value) { +bool_to_j_boolean_class(JNIEnv* env, const bool value) { jobject ret = env->CallStaticObjectMethod(cached_classes.Boolean, cached_FMIDs.Boolean_valueOf_ID, value); @@ -415,14 +415,6 @@ bool_to_j_boolean(JNIEnv* env, const bool value) { return ret; } -/* FIXME: Code is buggy - needs fixing. */ -bool -j_boolean_to_bool(JNIEnv* env, jobject j_boolean) { - bool b = env->CallIntMethod(j_boolean, cached_FMIDs.Boolean_boolValue_ID); - CHECK_EXCEPTION_ASSERT(env); - return b; -} - jobject j_long_to_j_long_class(JNIEnv* env, jlong jlong_value) { jobject ret = env->CallStaticObjectMethod(cached_classes.Long, diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index deda755..d064642 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -434,11 +434,7 @@ jtype_to_unsigned(const V& value); //! Builds a Java Boolean from C++ bool \p value. jobject -bool_to_j_boolean(JNIEnv* env, const bool value); - -//! Returns the Java bool stored in Java Boolean \p j_boolean. -bool -j_boolean_to_bool(JNIEnv* env, jobject j_boolean); +bool_to_j_boolean_class(JNIEnv* env, const bool value); //! Returns the Java int stored in Java Integer \p j_integer. jint 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 9db9a17..e4c7f55 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 @@ -424,12 +424,12 @@ m4_define(`ppl_@CLASS@_wrap_assign_code', ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ public native void wrap_assign(Variables_Set vars, - Bounded_Integer_Type_Width w, - Bounded_Integer_Type_Representation r, - Bounded_Integer_Type_Overflow o, - Constraint_System cs, - Integer complexity_threshold, - Boolean wrap_individually); + Bounded_Integer_Type_Width w, + Bounded_Integer_Type_Representation r, + Bounded_Integer_Type_Overflow o, + Constraint_System cs, + long complexity_threshold, + boolean wrap_individually); ') @@ -501,8 +501,7 @@ m4_define(`ppl_@CLASS@_remove_higher_space_dimensions_code', `dnl ___END_OF_FILE___ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ - public native void remove_higher_space_dimensions(long - new_dimension); + public native void remove_higher_space_dimensions(long new_dimension); ')

1 0

[GIT] ppl/ppl(master): Corrected a couple of typos.
by Enea Zaffanella 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: 2f76ad9a2a440a69fa861bb67784da771e1310fa URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f76ad9a2a44… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Apr 5 15:54:51 2010 +0200 Corrected a couple of typos. --- src/checked_float.inlines.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 7e18eb4..a32b8ab 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -824,7 +824,7 @@ assign_float_mpz(T& to, const mpz_class& _from, Rounding_Dir dir) exponent - Float<T>::Binary::MANTISSA_BITS); else mpz_mul_2exp(mantissa, from, Float<T>::Binary::MANTISSA_BITS - exponent); - Float<T> f(to); + Float<T> f; f.u.binary.build(sign < 0, mantissa, exponent); mpz_clear(mantissa); to = f.value(); @@ -898,7 +898,7 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) // Denormalized. exponent = Float<T>::Binary::EXPONENT_MIN - 1; } - Float<T> f(to); + Float<T> f; f.u.binary.build(sign < 0, mantissa, exponent); mpz_clear(mantissa); to = f.value();

1 0