March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(termination): Implemented and fixed termination utilities with two input abstractions.
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 2fb912684fddca80a1f5aa37e8fdf10c0ffff23c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fb912684fdd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 14:50:42 2010 +0400 Implemented and fixed termination utilities with two input abstractions. --- src/termination.cc | 102 +++++++++++++++++++++++++++-- src/termination.templates.hh | 52 +++++++++++---- tests/Polyhedron/termination1.cc | 132 +++++++++++++++++++++++++++++++++++++- 3 files changed, 261 insertions(+), 25 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2fb91268…

1 0

[GIT] ppl/ppl(termination): Code formatting fixed.
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 56f9f111da40d4d19c6ebe616cd6393c0b8007f7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=56f9f111da40… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 14:50:01 2010 +0400 Code formatting fixed. --- src/assert.hh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assert.hh b/src/assert.hh index e1cfb58..4a83ae2 100644 --- a/src/assert.hh +++ b/src/assert.hh @@ -38,12 +38,12 @@ site: http://www.cs.unipr.it/ppl/ . */ #if !PPL_DEBUG_PPL_ASSERT #define PPL_ASSERT(cond__) assert(cond__) #else -#define PPL_ASSERT(cond__) \ - do { \ - Parma_Polyhedra_Library::Weightwatch_Traits::Threshold \ - old_weight__ = \ - Parma_Polyhedra_Library::Weightwatch_Traits::weight; \ - assert(cond__); \ +#define PPL_ASSERT(cond__) \ + do { \ + Parma_Polyhedra_Library::Weightwatch_Traits::Threshold \ + old_weight__ \ + = Parma_Polyhedra_Library::Weightwatch_Traits::weight; \ + assert(cond__); \ assert(old_weight__ == Parma_Polyhedra_Library::Weightwatch_Traits::weight && \ "PPL_ASSERT_HEAVY have to be used here"); \ } while(0)

1 0

[GIT] ppl/ppl(termination): Added a test (based on test10 in termination1. cc in the
by Patricia Hill 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 02ffc8f4e65bbb1a1c1c3eb5cd6c746216f32c32 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=02ffc8f4e65b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 17 07:46:03 2010 +0000 Added a test (based on test10 in termination1.cc in the tests/Polyhedron directory) for termination_test_MS/1 and termination_test_PR/1. --- interfaces/Prolog/tests/pl_check.pl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index 499b270..a29bb23 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -1817,6 +1817,24 @@ ok(T) :- ppl_delete_Polyhedron(P3), ppl_delete_Polyhedron(P4). +% Tests ppl_Polyhedron_termination_test_MS/2, +% ppl_Polyhedron_termination_test_PR/2. +termination_test :- + termination_test(c), termination_test(nnc). + +termination_test(T) :- + make_vars(4, [A, B, C, D]), + clean_ppl_new_Polyhedron_from_constraints(T, + [A - C >= 0, + -A + C >= 0; + -B + D >= 1; + B >= 0; + A >= 1], P1), + ppl_Polyhedron_termination_test_MS(P1), + ppl_Polyhedron_termination_test_PR(P1), + !, + ppl_delete_Polyhedron(P1). + %%%%%%%%%%%%%%%%%%%%%%%%% Polyhedron Bounding Values %%%%%%%%%%%%%%%%%%%%%%% % Tests ppl_Polyhedron_bounds_from_above/2. @@ -3254,6 +3272,8 @@ group_predicates(check_polyhedron, ppl_Polyhedron_strictly_contains_Polyhedron/2, ppl_Polyhedron_is_disjoint_from_Polyhedron/2, ppl_Polyhedron_equals_Polyhedron/2, + ppl_Polyhedron_termination_test_MS/2, + ppl_Polyhedron_termination_test_PR/2, ppl_Polyhedron_OK/1 ]).

1 0

[GIT] ppl/ppl(termination): Added termination_test functions ending with " _2".
by Patricia Hill 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: ec57f6b3e45d9035b7a43411ddb9e46e2bb1799b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ec57f6b3e45d… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 17 07:32:57 2010 +0000 Added termination_test functions ending with "_2". --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 49 ++++++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 30 ++++++++++++ ...l_interface_generator_c_procedure_generators.m4 | 3 + 3 files changed, 82 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 738f80b..08e6c81 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -1168,6 +1168,19 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_2_code', +`dnl +int +ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 +(ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after) try { + const @CPP_CLASS@& ppset_before = *to_const(pset_before); + const @CPP_CLASS@& ppset_after = *to_const(pset_after); + return termination_test_@TERMINATION_ID@_2(ppset_before, ppset_after); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `int ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ @@ -1182,6 +1195,24 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2_code', +`int +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2 +(ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Generator_t point) try { + const @CPP_CLASS@& ppset_before = *to_const(pset_before); + const @CPP_CLASS@& ppset_after = *to_const(pset_after); + Generator& ppoint = *to_nonconst(point); + bool ok = one_affine_ranking_function_@TERMINATION_ID@_2(ppset_before, + ppset_after, + ppoint); + return ok ? 1 : 0; +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `int ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ @@ -1197,6 +1228,24 @@ CATCH_ALL ') +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2_code', +`int +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2 +(ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Polyhedron_t ph) try { + const @CPP_CLASS@& ppset_before = *to_const(pset_before); + const @CPP_CLASS@& ppset_after = *to_const(pset_after); + all_affine_ranking_functions_@TERMINATION_ID@_2(ppset_before, + ppset_after, + *static_cast<C_Polyhedron*> + (to_nonconst(ph))); + return 0; +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `int ppl_@CLASS@_wrap_assign diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4 index cc96ffc..b8ccb1c 100644 --- a/interfaces/C/ppl_interface_generator_c_h_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_h_code.m4 @@ -43,6 +43,15 @@ PPL_PROTO((ppl_const_@CLASS@_t pset)); ') +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_2_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 +PPL_PROTO((ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after)); + +') + m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `dnl /*! \relates ppl_@CLASS@_tag */ @@ -53,6 +62,17 @@ PPL_PROTO((ppl_const_@CLASS@_t pset, ') +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2 +PPL_PROTO((ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Generator_t point)); + +') + m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `dnl /*! \relates ppl_@CLASS@_tag */ @@ -63,6 +83,16 @@ PPL_PROTO((ppl_const_@CLASS@_t pset, ') +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2 +PPL_PROTO((ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Polyhedron_t ph)); + +') m4_define(`ppl_@CLASS@_linear_@PARTITION@_code', `dnl diff --git a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 index fba9565..3cd9115 100644 --- a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 +++ b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 @@ -47,5 +47,8 @@ ppl_@CLASS@_wrap_assign +simple, ppl_@CLASS@_termination_test_@TERMINATION_ID@ +simple, ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ +simple, ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ +simple, +ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 +simple, +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2 +simple, +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2 +simple, ) ')

1 0

[GIT] ppl/ppl(termination): Fixed some cut and paste typos.
by Patricia Hill 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 38e738d30f668cf23619238309917a49f03634e6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38e738d30f66… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 17 07:17:59 2010 +0000 Fixed some cut and paste typos. --- .../ppl_interface_generator_prolog_cc_code.m4 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 647d722..46d0316 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1249,7 +1249,7 @@ m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_2_code', ppl_@CLASS@_termination_test_@TERMINATION_ID@_2 (Prolog_term_ref t_pset_before, Prolog_term_ref t_pset_after) { static const char* where - = "ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/1"; + = "ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/2"; try { @CPP_CLASS@* pset_before = term_to_handle<@CPP_CLASS@ >(t_pset_before, where); @@ -1293,7 +1293,7 @@ m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2_code', Prolog_term_ref t_pset_after, Prolog_term_ref t_g) { static const char* where - = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/2"; + = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/3"; try { @CPP_CLASS@* pset_before = term_to_handle<@CPP_CLASS@ >(t_pset_before, where); @@ -1347,7 +1347,7 @@ m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2_code', Prolog_term_ref t_pset_after, Prolog_term_ref t_ph) { static const char* where = - "ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/2"; + "ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/3"; try { @CPP_CLASS@* pset_before = term_to_handle<@CPP_CLASS@ >(t_pset_before, where);

1 0

[GIT] ppl/ppl(termination): Arities fixed.
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: be095b01fae73a572c6775bf6e5c8a428b41b3d6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be095b01fae7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 10:35:22 2010 +0400 Arities fixed. --- ...erface_generator_prolog_procedure_generators.m4 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 29d0d6f..ab877ee 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -90,8 +90,8 @@ m4_define(`m4_procedure_list', ppl_@CLASS@_termination_test_@TERMINATION_ID@/1 +simple, ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2 +simple, ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@/2 +simple, -ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/1 +simple, -ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/2 +simple, -ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/2 +simple, +ppl_@CLASS@_termination_test_@TERMINATION_ID@_2/2 +simple, +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_2/3 +simple, +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_2/3 +simple, ) ')

1 0

[GIT] ppl/ppl(master): Allow for the various numeric types in frequency1.cc
by Patricia Hill 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: master Commit: 445fe36196ddb18dcce6d19a43890c1dbc669ae6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=445fe36196dd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 13:11:21 2010 +0000 Allow for the various numeric types in frequency1.cc --- tests/Octagonal_Shape/frequency1.cc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 02a8754..0a2d2aa 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -178,8 +178,8 @@ test08() { Variable C(2); TOctagonal_Shape os(3); - os.add_constraint(2*A - 2*B == 1); - os.add_constraint(3*C == 2); + os.add_constraint(2*A - 2*B == 2); + os.add_constraint(2*C == 2); os.add_constraint(B <= 2); Coefficient num; @@ -188,7 +188,7 @@ test08() { Coefficient vald; bool ok = (os.frequency(Linear_Expression(A - B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 13 && vald == 6); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(os, "*** os ***"); nout << "valn " << valn << ", vald " << vald << endl; @@ -202,8 +202,8 @@ test09() { Variable C(2); TOctagonal_Shape os(3); - os.add_constraint(2*A - 2*B == 1); - os.add_constraint(2*C == 1); + os.add_constraint(2*A - 2*B == 2); + os.add_constraint(2*C == 2); os.add_constraint(B <= 2); Coefficient num; @@ -212,7 +212,7 @@ test09() { Coefficient vald; bool ok = (os.frequency(Linear_Expression(A - B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 2 && vald == 1); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(os, "*** os ***"); nout << "valn " << valn << ", vald " << vald << endl; @@ -226,8 +226,8 @@ test10() { Variable C(2); TOctagonal_Shape os(3); - os.add_constraint(2*A + 2*B == 1); - os.add_constraint(2*C == 1); + os.add_constraint(2*A + 2*B == 2); + os.add_constraint(2*C == 2); os.add_constraint(B <= 2); Coefficient num; @@ -236,7 +236,7 @@ test10() { Coefficient vald; bool ok = (os.frequency(Linear_Expression(A + B + C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 2 && vald == 1); + && num == 0 && den == 1 && valn == 3 && vald == 1); print_constraints(os, "*** os ***"); nout << "valn " << valn << ", vald " << vald << endl; @@ -250,8 +250,8 @@ test11() { Variable C(2); TOctagonal_Shape os(3); - os.add_constraint(2*A + 2*B == 1); - os.add_constraint(B - C == 1); + os.add_constraint(2*A + 2*B == 2); + os.add_constraint(B - C == 2); os.add_constraint(B <= 2); Coefficient num; @@ -260,7 +260,7 @@ test11() { Coefficient vald; bool ok = (os.frequency(Linear_Expression(A - B + 2*C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == -1 && vald == 2); + && num == 0 && den == 1 && valn == -2 && vald == 1); print_constraints(os, "*** os ***"); nout << "valn " << valn << ", vald " << vald << endl; @@ -274,7 +274,7 @@ test12() { Variable C(2); TOctagonal_Shape os(3); - os.add_constraint(2*A - 2*B == 1); + os.add_constraint(2*A - 2*B == 2); os.add_constraint(B + C == 1); os.add_constraint(B <= 2); @@ -284,7 +284,7 @@ test12() { Coefficient vald; bool ok = (os.frequency(Linear_Expression(A + B + 2*C + 1), num, den, valn, vald) - && num == 0 && den == 1 && valn == 7 && vald == 2); + && num == 0 && den == 1 && valn == 4 && vald == 1); print_constraints(os, "*** os ***"); nout << "valn " << valn << ", vald " << vald << endl; @@ -301,7 +301,7 @@ BEGIN_MAIN DO_TEST(test05); DO_TEST(test06); DO_TEST(test07); - DO_TEST(test08); + DO_TEST_F64_MAY_OVERFLOW_IF_INEXACT(test08, TOctagonal_Shape); DO_TEST(test09); DO_TEST(test10); DO_TEST(test11);

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node::Tableau: optimize scale( ) method for sparse matrices.
by Marco Poletti 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 742786aa3e321f73f0494b8293ede324b8edf5fe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=742786aa3e32… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Mar 16 13:46:20 2010 +0100 PIP_Solution_Node::Tableau: optimize scale() method for sparse matrices. --- src/PIP_Tree.cc | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index e448c5b..5cd9ad0 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1557,12 +1557,20 @@ PIP_Solution_Node::Tableau::normalize() { void PIP_Solution_Node::Tableau::scale(Coefficient_traits::const_reference ratio) { for (dimension_type i = s.num_rows(); i-- > 0; ) { - matrix_row_reference_type s_i = s[i]; - for (dimension_type j = s.num_columns(); j-- > 0; ) - s_i[j] *= ratio; - matrix_row_reference_type t_i = t[i]; - for (dimension_type j = t.num_columns(); j-- > 0; ) - t_i[j] *= ratio; + { + matrix_row_reference_type s_i = s[i]; + matrix_row_iterator j = s_i.begin(); + matrix_row_iterator j_end = s_i.end(); + for ( ; j!=j_end; ++j) + (*j).second *= ratio; + } + { + matrix_row_reference_type t_i = t[i]; + matrix_row_iterator j = t_i.begin(); + matrix_row_iterator j_end = t_i.end(); + for ( ; j!=j_end; ++j) + (*j).second *= ratio; + } } denom *= ratio; }

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node: fix regression in solve( ), partially reverting commit d7f564.
by Marco Poletti 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: d043b85fec828b0bc79f711703c3e2298354e08d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d043b85fec82… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Mar 16 13:44:05 2010 +0100 PIP_Solution_Node: fix regression in solve(), partially reverting commit d7f564. --- src/PIP_Tree.cc | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 469386f..e448c5b 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2781,20 +2781,16 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, if (s_pivot_pj != pivot_den) { for (dimension_type i = num_rows; i-- > 0; ) { matrix_row_reference_type s_i = tableau.s[i]; - matrix_row_iterator itr = s_i.find(pj); - if (itr != s_i.end()) { - Coefficient& s_i_pj = (*itr).second; - product = s_i_pj * pivot_den; - if (product % s_pivot_pj != 0) { - // As above, perform matrix scaling. - gcd_assign(gcd, product, s_pivot_pj); - exact_div_assign(scale_factor, s_pivot_pj, gcd); - tableau.scale(scale_factor); - product *= scale_factor; - } - PPL_ASSERT(product % s_pivot_pj == 0); - exact_div_assign(s_i_pj, product, s_pivot_pj); + product = s_i[pj] * pivot_den; + if (product % s_pivot_pj != 0) { + // As above, perform matrix scaling. + gcd_assign(gcd, product, s_pivot_pj); + exact_div_assign(scale_factor, s_pivot_pj, gcd); + tableau.scale(scale_factor); + product *= scale_factor; } + PPL_ASSERT(product % s_pivot_pj == 0); + exact_div_assign(s_i[pj], product, s_pivot_pj); } }

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node: fix regression in generate_cut() introduced by commit 65bee8.
by Marco Poletti 16 Mar '10

16 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 080fe74341d5bd372763bf2f7af0271a81aa5a07 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=080fe74341d5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 15 23:32:43 2010 +0100 PIP_Solution_Node: fix regression in generate_cut() introduced by commit 65bee8. --- src/PIP_Tree.cc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index d977181..469386f 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -3184,9 +3184,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, Variables_Set::const_iterator p_j = parameters.begin(); matrix_const_row_const_iterator j = row_t.lower_bound(1); matrix_const_row_const_iterator j_end = row_t.end(); - dimension_type last_index; - if (j!=j_end) - last_index = (*j).first; + dimension_type last_index = 1; for ( ; j!=j_end; ++j) { mod_assign(mod, (*j).second, den); if (mod != 0) {

1 0