March 2010 - PPL-devel - BUGSENG Mailman

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

17 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a00898c0ddf… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 18:06:38 2010 +0100 Unlimited_Sparse_Row: define flag PPL_SPARSE_BACKEND_SLOW_INSERTIONS for the std::vector-based backend and document its meaning. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16390dec7361… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 17:52:25 2010 +0100 Unlimited_Sparse_Row_Std_Vector_Backend: fix swap_vector_chunks(), now the std::vector-based sparse matrices work with PIP. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b5bde4c03b86… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 17:45:20 2010 +0100 MIP_Problem: optimize OK() method for sparse matrices. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0074eda84863… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 17:13:39 2010 +0100 MIP_Problem: only check for out-of-bounds during debug in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cb83e275a530… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 17:08:03 2010 +0100 MIP_Problem: use find_create() when needed in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=369dbcb1b718… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 17:03:17 2010 +0100 MIP_Problem: use find_create() instead of operator[] in process_pending_constraints(). It is faster when using sparse matrices. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0ca8bcf51636… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 16:53:28 2010 +0100 MIP_Problem: optimize method process_pending_constraints() for sparse matrices. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=43f20ce4aedc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 17 15:04:52 2010 +0100 MIP_Problem: optimize method process_pending_constraints() for std::vector-based sparse matrices.

1 0

[GIT] ppl/ppl(termination): Define PROLOG_TRACK_ALLOCATION to 1 to make a few bugs evident.
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 6939662599fe07c6a70003ef215bff8b2b015bc3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6939662599fe… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 20:44:53 2010 +0400 Define PROLOG_TRACK_ALLOCATION to 1 to make a few bugs evident. --- interfaces/Prolog/ppl_prolog_common.defs.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index 33af32d..3457029 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -37,7 +37,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <iostream> #ifndef PROLOG_TRACK_ALLOCATION -#define PROLOG_TRACK_ALLOCATION 0 +#define PROLOG_TRACK_ALLOCATION 1 #endif #ifndef NOISY_PROLOG_TRACK_ALLOCATION #define NOISY_PROLOG_TRACK_ALLOCATION 0

1 0

[GIT] ppl/ppl(termination): C and Prolog interfaces for the termination utility functions renamed and fixed .
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 2d0e260671a9f99b2ff8c6aaeb58d3bd41953e2c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d0e260671a9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 20:36:04 2010 +0400 C and Prolog interfaces for the termination utility functions renamed and fixed. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 33 +++++----- interfaces/C/ppl_interface_generator_c_h_code.m4 | 24 ++++---- ...l_interface_generator_c_procedure_generators.m4 | 12 ++-- .../ppl_interface_generator_prolog_cc_code.m4 | 66 ++++++++++---------- .../ppl_interface_generator_prolog_hh_code.m4 | 24 ++++---- ...erface_generator_prolog_procedure_generators.m4 | 12 ++-- interfaces/Prolog/tests/pl_check.pl | 26 +++++--- 7 files changed, 104 insertions(+), 93 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2d0e2606…

1 0

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

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 344cb0aca8ae7cb17820f75389480cac3d61b999 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=344cb0aca8ae… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 19:59:54 2010 +0400 Kludge removed. --- src/Polyhedron.defs.hh | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 0568c2a..8981831 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -52,10 +52,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <vector> #include <iosfwd> -// FIXME: this is only needed to access the copy constructor of -// class Polyhedron from the termination utility functions. -#include "C_Polyhedron.types.hh" - namespace Parma_Polyhedra_Library { namespace IO_Operators { @@ -2572,17 +2568,6 @@ private: friend class Parma_Polyhedra_Library::BHRZ03_Certificate; friend class Parma_Polyhedra_Library::H79_Certificate; - // FIXME: these are only needed to access the copy constructor of - // class Polyhedron. - template <typename PSET> - friend bool termination_test_PR(const PSET& pset); - template <typename PSET> - friend bool one_affine_ranking_function_PR(const PSET& pset, - Generator& mu); - template <typename PSET> - friend void all_affine_ranking_functions_PR(const PSET& pset, - C_Polyhedron& mu_space); - protected: #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief

1 0

[GIT] ppl/ppl(termination): Version number bumped.
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 3f0858faa24609e957a1eb5dddb832f68766d4fe URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f0858faa246… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 19:58:24 2010 +0400 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 5c177f4..6909a88 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre14], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre15], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

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

17 Mar '10

Module: ppl/ppl Branch: termination Commit: d6ba16bc72f64aae8474331a12a839dbbb06d859 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d6ba16bc72f6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 18:46:27 2010 +0400 Completed fill_constraint_system_PR(). --- src/termination.cc | 4 ++ src/termination.templates.hh | 2 +- tests/Polyhedron/termination1.cc | 60 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/src/termination.cc b/src/termination.cc index 4e0a710..2a8f96e 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -323,6 +323,10 @@ fill_constraint_system_PR(const Constraint_System& cs_before, le_out += c_i.inhomogeneous_term()*Variable(row_index); } + // Add the nonpositivity constraints for u_1, u_2 and u_3. + for (dimension_type i = s + 2*r; i-- > 0; ) + cs_out.insert(Variable(i) <= 0); + // FIXME: iterate backwards once the debuggin phase is over. //for (dimension_type j = 2*n; j-- > 0; ) for (dimension_type j = 0; j < 2*n; ++j) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 247a587..d352a72 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,7 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "BD_Shape.defs.hh" #include "Octagonal_Shape.defs.hh" -#define PRINT_DEBUG_INFO 0 +#define PRINT_DEBUG_INFO 1 #if PRINT_DEBUG_INFO #include <iostream> diff --git a/tests/Polyhedron/termination1.cc b/tests/Polyhedron/termination1.cc index e169729..92a902b 100644 --- a/tests/Polyhedron/termination1.cc +++ b/tests/Polyhedron/termination1.cc @@ -364,6 +364,62 @@ test14() { } +bool +test15() { + Variable xp1(0); + Variable x1(1); + C_Polyhedron ph(2); + ph.add_constraint(x1 >= 3); + ph.add_constraint(xp1 >= 1); + + return !termination_test_MS(ph); +} + +bool +test16() { + Variable xp1(0); + Variable x1(1); + C_Polyhedron ph(2); + ph.add_constraint(x1 >= 3); + ph.add_constraint(xp1 >= 1); + + return !termination_test_PR(ph); +} + +bool +test17() { + Variable xp1(0); + Variable xp2(1); + Variable x1(2); + Variable x2(3); + C_Polyhedron ph(4); + ph.add_constraint(x1 >= 1); + ph.add_constraint(x2 >= 1); + ph.add_constraint(x1 - x2 <= -1); + ph.add_constraint(xp1 >= 1); + ph.add_constraint(xp2 >= 1); + ph.add_constraint(x1 == xp1); + + return !termination_test_MS(ph); +} + +bool +test18() { + Variable xp1(0); + Variable xp2(1); + Variable x1(2); + Variable x2(3); + C_Polyhedron ph(4); + ph.add_constraint(x1 >= 1); + ph.add_constraint(x2 >= 1); + ph.add_constraint(x1 - x2 <= -1); + ph.add_constraint(xp1 >= 1); + ph.add_constraint(xp2 >= 1); + ph.add_constraint(x1 == xp1); + + return !termination_test_PR(ph); +} + } // namespace BEGIN_MAIN @@ -381,4 +437,8 @@ BEGIN_MAIN DO_TEST(test12); DO_TEST(test13); DO_TEST(test14); + DO_TEST(test15); + DO_TEST(test16); + DO_TEST(test17); + DO_TEST(test18); END_MAIN

1 0

[GIT] ppl/ppl(termination): Kludge to allow the proof-of-concept implementation of the PR functions to compile .
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: 9a8b57ac7306894b762f36a6c2f08283243369b5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a8b57ac7306… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 15:56:17 2010 +0400 Kludge to allow the proof-of-concept implementation of the PR functions to compile. --- src/Polyhedron.defs.hh | 15 +++++++++++ src/termination.templates.hh | 51 ++++++++++++++++++++------------------ tests/Polyhedron/termination1.cc | 2 +- 3 files changed, 43 insertions(+), 25 deletions(-) diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 8981831..0568c2a 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -52,6 +52,10 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <vector> #include <iosfwd> +// FIXME: this is only needed to access the copy constructor of +// class Polyhedron from the termination utility functions. +#include "C_Polyhedron.types.hh" + namespace Parma_Polyhedra_Library { namespace IO_Operators { @@ -2568,6 +2572,17 @@ private: friend class Parma_Polyhedra_Library::BHRZ03_Certificate; friend class Parma_Polyhedra_Library::H79_Certificate; + // FIXME: these are only needed to access the copy constructor of + // class Polyhedron. + template <typename PSET> + friend bool termination_test_PR(const PSET& pset); + template <typename PSET> + friend bool one_affine_ranking_function_PR(const PSET& pset, + Generator& mu); + template <typename PSET> + friend void all_affine_ranking_functions_PR(const PSET& pset, + C_Polyhedron& mu_space); + protected: #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief diff --git a/src/termination.templates.hh b/src/termination.templates.hh index d59bcb6..247a587 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -398,23 +398,6 @@ termination_test_PR(const PSET& pset_after) { template <typename PSET> bool -one_affine_ranking_function_PR(const PSET& pset, Generator& mu) { - const dimension_type space_dim = pset.space_dimension(); - if (space_dim % 2 != 0) { - std::ostringstream s; - s << "PPL::one_affine_ranking_function_PR(pset):\n" - "pset.space_dimension() == " << space_dim - << " is odd."; - throw std::invalid_argument(s.str()); - } - - used(mu); - throw std::runtime_error("PPL::one_affine_ranking_function_PR()" - " not yet implemented."); -} - -template <typename PSET> -bool one_affine_ranking_function_PR_2(const PSET& pset_before, const PSET& pset_after, Generator& mu) { @@ -438,20 +421,23 @@ one_affine_ranking_function_PR_2(const PSET& pset_before, } template <typename PSET> -void -all_affine_ranking_functions_PR(const PSET& pset, C_Polyhedron& mu_space) { - const dimension_type space_dim = pset.space_dimension(); +bool +one_affine_ranking_function_PR(const PSET& pset_after, Generator& mu) { + const dimension_type space_dim = pset_after.space_dimension(); if (space_dim % 2 != 0) { std::ostringstream s; - s << "PPL::all_affine_ranking_functions_PR(pset):\n" + s << "PPL::one_affine_ranking_function_PR(pset):\n" "pset.space_dimension() == " << space_dim << " is odd."; throw std::invalid_argument(s.str()); } - used(mu_space); - throw std::runtime_error("PPL::all_affine_ranking_functions_PR()" - " not yet implemented."); + // FIXME: this may be inefficient. + PSET pset_before(pset_after); + Variables_Set primed_variables(Variable(0), Variable(space_dim/2 - 1)); + pset_before.remove_space_dimensions(primed_variables); + return one_affine_ranking_function_PR_2(pset_before, pset_after, mu); + } template <typename PSET> @@ -475,6 +461,23 @@ all_affine_ranking_functions_PR_2(const PSET& pset_before, " not yet implemented."); } +template <typename PSET> +void +all_affine_ranking_functions_PR(const PSET& pset, C_Polyhedron& mu_space) { + const dimension_type space_dim = pset.space_dimension(); + if (space_dim % 2 != 0) { + std::ostringstream s; + s << "PPL::all_affine_ranking_functions_PR(pset):\n" + "pset.space_dimension() == " << space_dim + << " is odd."; + throw std::invalid_argument(s.str()); + } + + used(mu_space); + throw std::runtime_error("PPL::all_affine_ranking_functions_PR()" + " not yet implemented."); +} + } // namespace Parma_Polyhedra_Library #endif // !defined(PPL_termination_templates_hh) diff --git a/tests/Polyhedron/termination1.cc b/tests/Polyhedron/termination1.cc index f843ab6..e169729 100644 --- a/tests/Polyhedron/termination1.cc +++ b/tests/Polyhedron/termination1.cc @@ -371,7 +371,7 @@ BEGIN_MAIN DO_TEST(test02); DO_TEST(test03); //DO_TEST(test04); - //DO_TEST(test05); + DO_TEST(test05); DO_TEST(test06); //DO_TEST(test07); DO_TEST(test08);

1 0

[GIT] ppl/ppl(master): Fixed some typos for code related to the wrap_assign java interface.
by Patricia Hill 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: master Commit: 4d0a50e95c3b824a41f403cecd9d2ee9af92b5f6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d0a50e95c3b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 17 11:30:48 2010 +0000 Fixed some typos for code related to the wrap_assign java interface. --- interfaces/Java/jni/ppl_java_common.defs.hh | 6 +++--- .../Java/parma_polyhedra_library/Makefile.am | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index eb9abcb..4529470 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -496,7 +496,7 @@ build_cxx_bounded_width(JNIEnv* env, jobject j_bounded_width); /*! \brief Builds a Java parma_polyhedra_library::Bounded_Integer_Type_Overflow - from C++ MIP_Problem::Bounded_Integer_Type_Overflow \p bounded_overflow. + from C++ Bounded_Integer_Type_Overflow \p bounded_overflow. */ jobject build_java_bounded_overflow @@ -504,7 +504,7 @@ build_java_bounded_overflow /*! \brief Builds a Java parma_polyhedra_library::Bounded_Integer_Type_Representation - from C++ MIP_Problem::Bounded_Integer_Type_Representation \p bounded_rep. + from C++ Bounded_Integer_Type_Representation \p bounded_rep. */ jobject build_java_bounded_representation @@ -512,7 +512,7 @@ build_java_bounded_representation /*! \brief Builds a Java parma_polyhedra_library::Bounded_Integer_Type_Width - from C++ MIP_Problem::Bounded_Integer_Type_Width \p bounded_width. + from C++ Bounded_Integer_Type_Width \p bounded_width. */ jobject build_java_bounded_width diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 8e54256..a120f0c 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -212,6 +212,9 @@ $(fixed_java_cxx_headers_sources) \ java_classes.stamp \ java_cxx_headers.stamp \ source_generation.stamp \ +Bounded_Integer_Type_Overflow.class \ +Bounded_Integer_Type_Representation.class \ +Bounded_Integer_Type_Width.class \ By_Reference.class \ Coefficient.class \ Complexity_Class.class \

1 0

[GIT] ppl/ppl(master): Added implementation code for Java interface for wrap_assign.
by Patricia Hill 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: master Commit: 2fca7306fd2f0ec3e47b7bafbafc04ac63b73920 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fca7306fd2f… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 16 19:25:00 2010 +0000 Added implementation code for Java interface for wrap_assign. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 24 ++++ interfaces/Java/jni/ppl_java_common.cc | 135 ++++++++++++++++++++ interfaces/Java/jni/ppl_java_common.defs.hh | 69 ++++++++++ interfaces/Java/jni/ppl_java_globals.cc | 72 ++++++++++- .../Bounded_Integer_Type_Width.java | 10 +- ...l_interface_generator_java_classes_java_code.m4 | 2 +- 6 files changed, 305 insertions(+), 7 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2fca7306…

1 0

[GIT] ppl/ppl(termination): Temporarily implemented termination_test_PR() in terms of termination_test_PR_2().
by Roberto Bagnara 17 Mar '10

17 Mar '10

Module: ppl/ppl Branch: termination Commit: a6c37d8cca269ec38fcc936477d1f21725cfb1ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a6c37d8cca26… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 17 15:11:07 2010 +0400 Temporarily implemented termination_test_PR() in terms of termination_test_PR_2(). --- src/termination.templates.hh | 37 ++++++++++++++++++++----------------- tests/Polyhedron/termination1.cc | 28 ++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index b42cdc0..d59bcb6 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,7 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "BD_Shape.defs.hh" #include "Octagonal_Shape.defs.hh" -#define PRINT_DEBUG_INFO 1 +#define PRINT_DEBUG_INFO 0 #if PRINT_DEBUG_INFO #include <iostream> @@ -357,22 +357,6 @@ all_affine_ranking_functions_MS_2(const PSET& pset_before, template <typename PSET> bool -termination_test_PR(const PSET& pset) { - const dimension_type space_dim = pset.space_dimension(); - if (space_dim % 2 != 0) { - std::ostringstream s; - s << "PPL::termination_test_PR(pset):\n" - "pset.space_dimension() == " << space_dim - << " is odd."; - throw std::invalid_argument(s.str()); - } - - throw std::runtime_error("PPL::termination_test_PR()" - " not yet implemented."); -} - -template <typename PSET> -bool termination_test_PR_2(const PSET& pset_before, const PSET& pset_after) { const dimension_type before_space_dim = pset_before.space_dimension(); const dimension_type after_space_dim = pset_after.space_dimension(); @@ -395,6 +379,25 @@ termination_test_PR_2(const PSET& pset_before, const PSET& pset_after) { template <typename PSET> bool +termination_test_PR(const PSET& pset_after) { + const dimension_type space_dim = pset_after.space_dimension(); + if (space_dim % 2 != 0) { + std::ostringstream s; + s << "PPL::termination_test_PR(pset):\n" + "pset.space_dimension() == " << space_dim + << " is odd."; + throw std::invalid_argument(s.str()); + } + + // FIXME: this may be inefficient. + PSET pset_before(pset_after); + Variables_Set primed_variables(Variable(0), Variable(space_dim/2 - 1)); + pset_before.remove_space_dimensions(primed_variables); + return termination_test_PR_2(pset_before, pset_after); +} + +template <typename PSET> +bool one_affine_ranking_function_PR(const PSET& pset, Generator& mu) { const dimension_type space_dim = pset.space_dimension(); if (space_dim % 2 != 0) { diff --git a/tests/Polyhedron/termination1.cc b/tests/Polyhedron/termination1.cc index b096391..f843ab6 100644 --- a/tests/Polyhedron/termination1.cc +++ b/tests/Polyhedron/termination1.cc @@ -300,7 +300,8 @@ test12() { { Variable x1(0); Variable x2(1); - // ph_before is universe. + ph_before.add_constraint(x1 >= 1); + ph_before.add_constraint(x2 <= 0); } C_Polyhedron ph_after(4); @@ -312,9 +313,7 @@ test12() { Variable xp2(1); ph_after.add_constraint(xp2 == 1); - ph_after.add_constraint(x1 >= 1); ph_after.add_constraint(x1 - xp1 >= 1); - ph_after.add_constraint(x2 <= 0); } return termination_test_MS_2(ph_before, ph_after); @@ -345,6 +344,26 @@ test13() { return termination_test_PR_2(ph_before, ph_after); } +bool +test14() { + C_Polyhedron ph(4); + { + Variable x1(2); + Variable x2(3); + + Variable xp1(0); + Variable xp2(1); + + ph.add_constraint(xp2 == 1); + ph.add_constraint(x1 >= 1); + ph.add_constraint(x1 - xp1 >= 1); + ph.add_constraint(x2 <= 0); + } + + return termination_test_PR(ph); +} + + } // namespace BEGIN_MAIN @@ -356,9 +375,10 @@ BEGIN_MAIN DO_TEST(test06); //DO_TEST(test07); DO_TEST(test08); - DO_TEST_F(test09); + DO_TEST(test09); DO_TEST(test10); DO_TEST(test11); DO_TEST(test12); DO_TEST(test13); + DO_TEST(test14); END_MAIN

1 0