March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added a couple of tests using the big parameter.
by François Galea 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: master Commit: ae2b90afc196deace10b7035dea30d9872d7b8b3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae2b90afc196… Author: François Galea <francois.galea(a)uvsq.fr> Date: Fri Mar 19 07:44:11 2010 +0100 Added a couple of tests using the big parameter. --- tests/PIP_Problem/pipproblem1.cc | 55 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index e361a7b..438663e 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -702,6 +702,59 @@ test23() { return ok; } +bool +test24() { + // Minimization problem, using the big parameter trick to allow the + // variables to be negative. + Variable x(0); + Variable y(1); + Variable p(2); + Variable M(3); + Variables_Set params(p, M); + + Constraint_System cs; + cs.insert(y - M >= -2*x + 2*M - 4); // y >= -2*x - 4 + cs.insert(2*y - 2*M <= x - M + 2*p); // 2*y <= x + 2*p + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + pip.set_big_parameter_dimension(3); // M is the big parameter + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + + return ok; +} + +bool +test25() { + // Lexicographical maximization, using variable substitution. + Variable x(0); + Variable y(1); + Variable p(2); + Variable M(3); + Variables_Set params(p, M); + + Constraint_System cs; + cs.insert(M - y >= 2*M - 2*x - 4); // y >= 2*x - 4 + cs.insert(M - y <= -M + x + p); // y <= -x + p + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + pip.set_big_parameter_dimension(3); // M is the big parameter + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + + return ok; +} + } // namespace BEGIN_MAIN @@ -728,4 +781,6 @@ BEGIN_MAIN DO_TEST_F8(test21); DO_TEST_F8(test22); DO_TEST_F8(test23); + DO_TEST(test24); + DO_TEST(test25); END_MAIN

1 0

[GIT] ppl/ppl(termination): Updated the first item for TODO and removed code for
by Patricia Hill 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: termination Commit: a55e13a59c2877379aa61686371696e30dbabcd1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a55e13a59c28… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Mar 19 13:37:34 2010 +0000 Updated the first item for TODO and removed code for linear expression is_zero() and all_homogeneous_terms_are_zero() from the Prolog interface. --- TODO | 2 +- ...l_interface_generator_java_classes_java_code.m4 | 9 +++++++ ...nterface_generator_java_procedure_generators.m4 | 8 +++++- interfaces/Prolog/ppl_prolog_common.cc | 24 -------------------- interfaces/Prolog/ppl_prolog_common.defs.hh | 6 ----- 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/TODO b/TODO index 1b37708..db3904f 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,7 @@ Enhancements for PPL 0.11 - Interface Linear_Expression::is_zero() and Linear_Expression::all_homogeneous_terms_are_zero() - for all the non-C++ interfaces. + for the Java and Ocaml interfaces. - Handle std::logic_error (now thrown in case watchdogs are not available) in all the interfaces. - Make all the *affine*image() methods uniform as far as the 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 d3131a1..4b97dc1 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 @@ -651,3 +651,12 @@ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ @CLASS@ q, By_Reference<Boolean> finite); ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ + public native boolean + termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ arg); + +') diff --git a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 index 5033b8f..2bd99f5 100644 --- a/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 +++ b/interfaces/Java/ppl_interface_generator_java_procedure_generators.m4 @@ -43,5 +43,11 @@ m4_define(`m4_procedure_list', ppl_free_@CLASS@/1 +all, ppl_@CLASS@_hashcode/2 +all -box, ppl_@CLASS@_string/1 +all, -ppl_@CLASS@_wrap_assign/8 +simple)dnl +ppl_@CLASS@_wrap_assign/8 +simple, +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/1 +simple, +ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2 +simple, +ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2 +simple, +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/2 +simple, +ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3 +simple, +ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3 +simple,)dnl ') diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index 19c666f..5a186e8 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -1704,30 +1704,6 @@ ppl_Coefficient_max(Prolog_term_ref t_max) { } extern "C" Prolog_foreign_return_type -ppl_Linear_Expression_is_zero(Prolog_term_ref t_le_expr) { - static const char* where = "ppl_Linear_Expression_is_zero/1"; - try { - Linear_Expression le_expr = build_linear_expression(t_le_expr, where); - if (le_expr.is_zero()) - return PROLOG_SUCCESS; - } - CATCH_ALL; -} - -extern "C" Prolog_foreign_return_type -ppl_Linear_Expression_all_homogeneous_terms_are_zero(Prolog_term_ref t_le_expr) -{ - static const char* where - = "ppl_Linear_Expression_all_homogeneous_terms_are_zero/1"; - try { - Linear_Expression le_expr = build_linear_expression(t_le_expr, where); - if (le_expr.all_homogeneous_terms_are_zero()) - return PROLOG_SUCCESS; - } - CATCH_ALL; -} - -extern "C" Prolog_foreign_return_type ppl_new_MIP_Problem_from_space_dimension (Prolog_term_ref t_nd, Prolog_term_ref t_mip) { static const char* where = "ppl_MIP_Problem_from_space_dimension/2"; diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index 3511064..33af32d 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -719,12 +719,6 @@ extern "C" Prolog_foreign_return_type ppl_Coefficient_max(Prolog_term_ref t_max); extern "C" Prolog_foreign_return_type -ppl_Linear_Expression_is_zero(Prolog_term_ref t_bool); - -extern "C" Prolog_foreign_return_type -ppl_Linear_Expression_all_homogeneous_terms_are_zero(Prolog_term_ref t_bool); - -extern "C" Prolog_foreign_return_type ppl_new_MIP_Problem_from_space_dimension (Prolog_term_ref t_nd, Prolog_term_ref t_mip);

1 0

[GIT] ppl/ppl(sparse_matrices): Sparse_Row, Sparse_Row_Reference: add assign() and assign_if_nonzero() methods.
by Marco Poletti 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 1654fd3c804e0f72c0e34b00a88673ad5c44e593 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1654fd3c804e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Mar 19 20:22:55 2010 +0100 Sparse_Row, Sparse_Row_Reference: add assign() and assign_if_nonzero() methods. --- src/Sparse_Row.defs.hh | 18 ++++++++++++++++++ src/Sparse_Row.inlines.hh | 25 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/src/Sparse_Row.defs.hh b/src/Sparse_Row.defs.hh index 9b85c68..2dbfd9b 100644 --- a/src/Sparse_Row.defs.hh +++ b/src/Sparse_Row.defs.hh @@ -140,6 +140,15 @@ public: //! lower_bound(i). Coefficient& operator[](const dimension_type i); + //! After this call, get(i) == x. + //! This is slower than <CODE>if (x != 0) find_create(i,x);</CODE> because + //! it needs to check whether the element with index i is zero. + void assign(dimension_type i, const Coefficient& x); + + //! Equivalent to <CODE>if (x != 0) find_create(i, x);</CODE>, provided + //! for convenience. This is faster than assign(i, x). + void assign_if_nonzero(dimension_type i, const Coefficient& x); + //! Equivalent to get(), provided for convenience. const Coefficient& operator[](const dimension_type i) const; @@ -299,6 +308,15 @@ public: //! lower_bound(i). Coefficient& operator[](const dimension_type i); + //! After this call, get(i) == x. + //! This is slower than <CODE>if (x != 0) find_create(i,x);</CODE> because + //! it needs to check whether the element with index i is zero. + void assign(dimension_type i, const Coefficient& x); + + //! Equivalent to <CODE>if (x != 0) find_create(i, x);</CODE>, provided + //! for convenience. This is faster than assign(i, x). + void assign_if_nonzero(dimension_type i, const Coefficient& x); + //! Equivalent to get(), provided for convenience. const Coefficient& operator[](const dimension_type i) const; diff --git a/src/Sparse_Row.inlines.hh b/src/Sparse_Row.inlines.hh index 5323e04..12adf4d 100644 --- a/src/Sparse_Row.inlines.hh +++ b/src/Sparse_Row.inlines.hh @@ -154,6 +154,18 @@ Sparse_Row::operator[](const dimension_type i) { return row[i]; } +inline void +Sparse_Row::assign(dimension_type i, const Coefficient& x) { + PPL_ASSERT(i < size_); + row.assign(i,x); +} + +inline void +Sparse_Row::assign_if_nonzero(dimension_type i, const Coefficient& x) { + PPL_ASSERT(i < size_); + row.assign_if_nonzero(i,x); +} + inline const Coefficient& Sparse_Row::operator[](const dimension_type i) const { return get(i); @@ -446,6 +458,19 @@ Sparse_Row_Reference::operator[](const dimension_type i) { return row[i]; } +inline void +Sparse_Row_Reference::assign(dimension_type i, const Coefficient& x) { + PPL_ASSERT(i < size_); + row.assign(i,x); +} + +inline void +Sparse_Row_Reference::assign_if_nonzero(dimension_type i, + const Coefficient& x) { + PPL_ASSERT(i < size_); + row.assign_if_nonzero(i,x); +} + inline const Coefficient& Sparse_Row_Reference::operator[](const dimension_type i) const { return get(i);

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row: add assign() and assign_if_nonzero() methods.
by Marco Poletti 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 289da761a94ccf596815acf3e7bd489421415321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=289da761a94c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Mar 19 20:22:24 2010 +0100 Unlimited_Sparse_Row: add assign() and assign_if_nonzero() methods. --- src/Unlimited_Sparse_Row.defs.hh | 9 +++++++++ src/Unlimited_Sparse_Row.inlines.hh | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/Unlimited_Sparse_Row.defs.hh b/src/Unlimited_Sparse_Row.defs.hh index d263411..5d7f49d 100644 --- a/src/Unlimited_Sparse_Row.defs.hh +++ b/src/Unlimited_Sparse_Row.defs.hh @@ -243,6 +243,15 @@ public: */ void normalize(); + //! After this call, get(i) == x. + //! This is slower than <CODE>if (x != 0) find_create(i,x);</CODE> because + //! it needs to check whether the element with index i is zero. + void assign(dimension_type i, const Coefficient& x); + + //! Equivalent to <CODE>if (x != 0) find_create(i, x);</CODE>, provided + //! for convenience. This is faster than assign(i, x). + void assign_if_nonzero(dimension_type i, const Coefficient& x); + //! For read-only access it's better to use get(), that avoids allocating //! space for zeroes. Both methods are O(n). //! If i was not previously stored, or reset(i) was called, this operation diff --git a/src/Unlimited_Sparse_Row.inlines.hh b/src/Unlimited_Sparse_Row.inlines.hh index 08a09b1..b860435 100644 --- a/src/Unlimited_Sparse_Row.inlines.hh +++ b/src/Unlimited_Sparse_Row.inlines.hh @@ -123,6 +123,20 @@ Unlimited_Sparse_Row::reset_after(dimension_type i) { PPL_ASSERT(OK()); } +inline void +Unlimited_Sparse_Row::assign(dimension_type i, const Coefficient& x) { + dangerous_iterator itr = lower_bound_dangerous(i); + if (x != 0 || (itr != end_dangerous() && (*itr).first == i)) + find_create(i, x, itr); +} + +inline void +Unlimited_Sparse_Row +::assign_if_nonzero(dimension_type i, const Coefficient& x) { + if (x != 0) + find_create(i, x); +} + inline Coefficient& Unlimited_Sparse_Row::operator[](const dimension_type i) { dangerous_iterator itr = lower_bound_dangerous(i);

1 0

[GIT] ppl/ppl(sparse_matrices): Fixes build: fixed typos.
by Marco Poletti 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 78650f59b21b4c4ce6e7131368e1cb7292af7fa2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=78650f59b21b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Mar 19 19:09:46 2010 +0100 Fixes build: fixed typos. --- src/PIP_Tree.cc | 2 +- src/Unlimited_Sparse_Row.inlines.hh | 2 +- ...Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 77831e4..2cd3578 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -3251,7 +3251,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, mod_assign(mod, (*j).second, den); if (mod != 0) { const dimension_type j_index = (*j).first; - itr1 = ctx1.find_create(j_index den); + itr1 = ctx1.find_create(j_index, den); (*itr1).second -= mod; itr2 = ctx2.find_create(j_index, (*itr1).second); neg_assign((*itr2).second); diff --git a/src/Unlimited_Sparse_Row.inlines.hh b/src/Unlimited_Sparse_Row.inlines.hh index 150b048..08a09b1 100644 --- a/src/Unlimited_Sparse_Row.inlines.hh +++ b/src/Unlimited_Sparse_Row.inlines.hh @@ -353,7 +353,7 @@ Unlimited_Sparse_Row::find(const dimension_type k, const_iterator itr1) const { inline Unlimited_Sparse_Row::const_iterator Unlimited_Sparse_Row -::lower_bound(const dimension_type k const_iterator itr1) const { +::lower_bound(const dimension_type k, const_iterator itr1) const { return data.lower_bound(k, itr1); } diff --git a/src/Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh b/src/Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh index b1f0937..a479672 100644 --- a/src/Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh +++ b/src/Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh @@ -91,7 +91,7 @@ public: iterator lower_bound(const dimension_type c, iterator itr); //! Looks for an element with key c, assuming it is in [itr,end()) . - const_iterator find(const dimension_type c const_iterator itr) const; + const_iterator find(const dimension_type c, const_iterator itr) const; //! Lower bound of key c, assuming it is in [itr,end()) . const_iterator lower_bound(const dimension_type c, const_iterator itr) const;

1 0

[GIT] ppl/ppl(master): Added formatting conventions to the STANDARDS file.
by Marco Poletti 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: master Commit: aa6aa7c819518ebc0b37e18aafbbfcdaddba1016 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa6aa7c81951… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Mar 19 19:00:12 2010 +0100 Added formatting conventions to the STANDARDS file. --- STANDARDS | 121 +++++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 77 insertions(+), 44 deletions(-) diff --git a/STANDARDS b/STANDARDS index e0096c7..a8a1552 100644 --- a/STANDARDS +++ b/STANDARDS @@ -95,28 +95,6 @@ Macros should be used only if really needed (in many cases, macros can be replaced by inline functions). -Length of source lines ----------------------- - -Avoid, when possible, source lines longer than 78 characters. - - -Trailing whitespace -------------------- - -Always avoid trailing whitespace. -If you use Emacs, then all the trailing whitespace in the current -buffer can be removed by using the command - - M-x delete-trailing-whitespace - -If you keep inserting trailing whitespace when coding, then you may -want to put the following two lines in your .emacs: - -;; Show trailing whitespace. -(setq-default show-trailing-whitespace t) - - Block closures -------------- @@ -147,28 +125,6 @@ extern "C" { #endif // !defined(PPL_Class_defs_hh) -Namespace indentation ---------------------- - -The entire library is in its own namespace. We sometimes specialize -std::swap() and std::iter_swap(). Other namespaces may be involved -but only in restricted contexts. Therefore, we have unindented -namespace-level declarations, thus saving some precious horizontal -space. For example: - -namespace Parma_Polyhedra_Library { - -non-empty lines here start at column 0; - -} // namespace Parma_Polyhedra_Library - -If you use Emacs, you may want to put the following two lines in your -.emacs: - -;; Disable indentation when in namespace blocks. -(c-set-offset 'innamespace 0) - - Negation -------- @@ -199,6 +155,83 @@ instead of assert(sys.num_rows()); +Formatting Conventions +====================== + +Indent each level using two spaces. +Insert a space: after each comma, before and after each operator, after +if/do/while keywords. As an exception to this rule, spaces can be omitted near +arithmetic multiplication and division operator, if they would harm +readability. +Don't insert spaces between the name of a function and the following +parenthesis. +Braces should be cuddled on the preceding/following line. +Avoid, when possible, source lines longer than 78 characters. +In a function declaration, the return type of a function and the modifiers +must be placed alone in one line. +In pointer and reference types, the * and & characters should be followed, but +not preceded, by a space. + +This is bad: + +inline void C::f(int *x,int y) +{ +if( x!=0 ) +{ + int &z=y; + foo (x / 2+y * 3,z/bar(5)); +} +} + +This is good: + +inline void +C::f(int* x, int y) { + if (x != 0) { + int& z = y; + foo(x/2 + y*3, z / bar(5)); + } +} + + +Namespace indentation +--------------------- + +The entire library is in its own namespace. We sometimes specialize +std::swap() and std::iter_swap(). Other namespaces may be involved +but only in restricted contexts. Therefore, we have unindented +namespace-level declarations, thus saving some precious horizontal +space. For example: + +namespace Parma_Polyhedra_Library { + +non-empty lines here start at column 0; + +} // namespace Parma_Polyhedra_Library + +If you use Emacs, you may want to put the following two lines in your +.emacs: + +;; Disable indentation when in namespace blocks. +(c-set-offset 'innamespace 0) + + +Trailing whitespace +------------------- + +Always avoid trailing whitespace. +If you use Emacs, then all the trailing whitespace in the current +buffer can be removed by using the command + + M-x delete-trailing-whitespace + +If you keep inserting trailing whitespace when coding, then you may +want to put the following two lines in your .emacs: + +;; Show trailing whitespace. +(setq-default show-trailing-whitespace t) + + Standards for Structuring the Source Code in Files ==================================================

1 0

[GIT] ppl/ppl(sparse_matrices): Improved code indentation and readability.
by Marco Poletti 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: f4fd0ff232619ccc6349f3e719606b59e9def69b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f4fd0ff23261… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Mar 19 18:55:26 2010 +0100 Improved code indentation and readability. --- src/Dense_Matrix.cc | 5 +- src/Dense_Row.cc | 4 +- src/Dense_Row.defs.hh | 30 ++-- src/Dense_Row.inlines.hh | 70 ++++---- src/MIP_Problem.cc | 87 +++++----- src/MIP_Problem.defs.hh | 5 +- src/PIP_Problem.cc | 10 +- src/PIP_Tree.cc | 181 ++++++++++---------- src/Sparse_Matrix.cc | 24 ++-- src/Sparse_Matrix.defs.hh | 6 +- src/Sparse_Matrix.inlines.hh | 36 ++-- src/Sparse_Row.defs.hh | 64 ++++---- src/Sparse_Row.inlines.hh | 136 +++++++-------- src/Unlimited_Sparse_Row.cc | 28 ++-- src/Unlimited_Sparse_Row.defs.hh | 68 ++++---- src/Unlimited_Sparse_Row.inlines.hh | 128 +++++++------- src/Unlimited_Sparse_Row_Custom_Slist_Backend.cc | 10 +- ...limited_Sparse_Row_Custom_Slist_Backend.defs.hh | 42 +++--- ...ited_Sparse_Row_Custom_Slist_Backend.inlines.hh | 107 ++++++------ src/Unlimited_Sparse_Row_Std_List_Backend.cc | 8 +- src/Unlimited_Sparse_Row_Std_List_Backend.defs.hh | 33 ++-- ...nlimited_Sparse_Row_Std_List_Backend.inlines.hh | 94 +++++----- src/Unlimited_Sparse_Row_Std_Vector_Backend.cc | 18 +- ...Unlimited_Sparse_Row_Std_Vector_Backend.defs.hh | 37 ++-- ...imited_Sparse_Row_Std_Vector_Backend.inlines.hh | 102 ++++++------ 25 files changed, 670 insertions(+), 663 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f4fd0ff2…

1 0

[GIT] ppl/ppl(master): As in previous commit - ensure initialization of variables.
by Patricia Hill 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: master Commit: 5911ab1fcc1919d4fd1411018c4bd58fcd36a1dd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5911ab1fcc19… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Mar 19 09:47:59 2010 +0000 As in previous commit - ensure initialization of variables. --- src/BD_Shape.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index d0dcc78..663ff36 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -806,7 +806,7 @@ BD_Shape<T>::frequency(const Linear_Expression& expr, // Boolean to keep track of a variable `v' in expression `le'. // If we can replace `v' by an expression using variables other // than `v' and are already in `le', then this is set to true. - bool constant_v; + bool constant_v = false; PPL_DIRTY_TEMP_COEFFICIENT(val_den); val_den = 1;

1 0

[GIT] ppl/ppl(master): Missing variable initialization added.
by Patricia Hill 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: master Commit: 9da0e46c90e0eb2d8d0b6e0e54cfd81e793a851d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9da0e46c90e0… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Mar 19 09:13:09 2010 +0000 Missing variable initialization added. --- src/Octagonal_Shape.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 49c0dc3..d0034a7 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -1324,7 +1324,7 @@ Octagonal_Shape<T>::frequency(const Linear_Expression& expr, // Boolean to keep track of a variable `v' in expression `le'. // If we can replace `v' by an expression using variables other // than `v' and are already in `le', then this is set to true. - bool constant_v; + bool constant_v = false; typedef typename OR_Matrix<N>::const_row_iterator Row_Iterator; typedef typename OR_Matrix<N>::const_row_reference_type Row_Reference;

1 0

[GIT] ppl/ppl(master): Improved documentation for frequency().
by Patricia Hill 19 Mar '10

19 Mar '10

Module: ppl/ppl Branch: master Commit: 4c45d375b4eced85f65931946464d71f9041cc29 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4c45d375b4ec… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Mar 19 08:53:12 2010 +0000 Improved documentation for frequency(). --- src/Grid.defs.hh | 12 +++++++++--- src/Polyhedron.defs.hh | 15 ++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index 59e840f..32d671b 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -863,8 +863,14 @@ public: /*! \brief Returns <CODE>true</CODE> if and only if \p *this is not empty and - \p expr is discrete in \p *this, in which case the maximum frequency - and the value for \p expr that is closest to zero are computed. + \p expr intersects with \p *this and \p *this is discrete on the hyperplane + defined by \p expr, in which case the frequency of \p *this + and the infimum value for \p expr for a point in \p *this are computed. + + If <CODE>true</CODE> is returned then the frequency of a grid \f$\cP\f$ + with respect to a linear expression \f$e\f$ is the modulus + \f$m\f$ such that all the points of the grid \f$\cP\f$ satisfy + the congruence \f$e \%= c \pmod{m}\f$ for some value \f$c\f$. \param expr The linear expression for which the frequency is needed; @@ -876,7 +882,7 @@ public: The denominator of the maximum frequency of \p expr; \param val_n - The numerator of a value of \p expr at a point in the grid + The numerator of them value of \p expr at a point in the grid that is closest to zero; \param val_d diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 52f6bb2..e4c54b2 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -765,9 +765,10 @@ public: Generator& g) const; /*! \brief - Returns <CODE>true</CODE> if and only if \p *this is not empty and - \p expr is discrete in \p *this, in which case the maximum frequency - and the value for \p expr that is closest to zero are computed. + Returns <CODE>true</CODE> if and only if \p *this intersects with + the hyperplane defined by \p expr at a single point; in which case + the frequency of \p *this and the infimum value for \p expr for a + point in \p *this are computed. \param expr The linear expression for which the frequency is needed; @@ -789,9 +790,13 @@ public: \exception std::invalid_argument Thrown if \p expr and \p *this are dimension-incompatible. - If \p *this is empty or \p expr can take any real number in \p *this, - <CODE>false</CODE> is returned and \p freq_n, \p freq_d, + If \p expr has no value in \p *this or can take more than one value + in \p *this, <CODE>false</CODE> is returned and \p freq_n, \p freq_d, \p val_n and \p val_d are left untouched. + If \p expr has a unique value in \p *this, then + the frequency of a polyhedron \f$\cP\f$ with respect to a linear expression + \f$e\f$ is \f$0\f$ and the value is given by \p val_n and \p val_d. + */ bool frequency(const Linear_Expression& expr, Coefficient& freq_n, Coefficient& freq_d,

1 0