- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): Dense_Row: added two-argument assign() and assign_if_nonzero().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 4f2763f9ea5ea650b2c68773eaa41d09375788ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4f2763f9ea5e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:35:10 2010 +0100 Dense_Row: added two-argument assign() and assign_if_nonzero(). --- src/Dense_Row.defs.hh | 8 ++++++++ src/Dense_Row.inlines.hh | 11 +++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index 895499c..ba04ad7 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -225,6 +225,14 @@ public: */ void normalize(); + //! After this call, get(i) == x. + //! Provided for compatibility with Sparse_Row. + void assign(dimension_type i, const Coefficient& x); + + //! Equivalent to <CODE>if (x != 0) find_create(i, x);</CODE>, provided + //! for convenience. Provided for compatibility with Sparse_Row. + void assign_if_nonzero(dimension_type i, const Coefficient& x); + PPL_OUTPUT_DECLARATIONS /*! \brief diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index 895111c..28152ce 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -250,6 +250,17 @@ Dense_Row::normalize() { } inline void +Dense_Row::assign(dimension_type i, const Coefficient& x) { + (*this)[i] = x; +} + +inline void +Dense_Row::assign_if_nonzero(dimension_type i, const Coefficient& x) { + if (x != 0) + (*this)[i] = x; +} + +inline void Dense_Row::ascii_dump(std::ostream& s) const { row.ascii_dump(s); }

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: add an optimized version of sub_assign() for sparse backends with slow insertions.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 9ffce899fb3f1f0a87af578413d80b762009dfb6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ffce899fb3f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:23:32 2010 +0100 PIP_Tree.cc: add an optimized version of sub_assign() for sparse backends with slow insertions. --- src/PIP_Tree.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index cbe6925..d1b5dcd 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -200,6 +200,8 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, #endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) +#ifndef PPL_SPARSE_BACKEND_SLOW_INSERTIONS + // Compute x -= y inline void sub_assign(PIP_Tree_Node::matrix_row_reference_type x, @@ -284,6 +286,74 @@ sub_assign(PIP_Tree_Node::matrix_row_reference_type x, } } +#else // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + +// Compute x -= y +inline void +sub_assign(PIP_Tree_Node::matrix_row_reference_type x, + PIP_Tree_Node::matrix_row_const_reference_type y) { + PIP_Tree_Node::matrix_row_copy_type row(x.size()); + PIP_Tree_Node::matrix_row_copy_iterator itr = row.end(); + PIP_Tree_Node::matrix_row_const_iterator i = x.begin(); + PIP_Tree_Node::matrix_row_const_iterator i_end = x.end(); + PIP_Tree_Node::matrix_const_row_const_iterator j = y.begin(); + PIP_Tree_Node::matrix_const_row_const_iterator j_end = y.end(); + if (i == i_end && j == j_end) + return; + if (j == j_end + || (i != i_end && (*i).first < (*j).first)) { + itr = row.find_create(*i); + ++i; + } else + if (i == i_end + || (j != j_end && (*i).first > (*j).first)) { + itr = row.find_create(*j); + neg_assign((*itr).second); + ++j; + } else { + PPL_ASSERT(i != i_end); + PPL_ASSERT(j != j_end); + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*i); + (*itr).second -= (*j).second; + ++i; + ++j; + } + PPL_ASSERT(itr != row.end()); + while (i != i_end && j != j_end) { + if ((*i).first < (*j).first) { + itr = row.find_create(*i,itr); + ++i; + } else { + if ((*i).first > (*j).first) { + itr = row.find_create(*j,itr); + neg_assign((*itr).second); + ++j; + } else { + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*i,itr); + (*itr).second -= (*j).second; + ++i; + ++j; + } + } + } + while (i != i_end) { + itr = row.find_create(*i,itr); + ++i; + } + PPL_ASSERT(i == i_end); + while (j != j_end) { + itr = row.find_create(*j,itr); + neg_assign((*itr).second); + ++j; + } + PPL_ASSERT(j == j_end); + std::swap(row,x); +} + +#endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + // Merge constraint system to a Matrix-form context such as x = x U y void merge_assign(PIP_Tree_Node::matrix_type& x,

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: fix optimized version of add_mul_assign_row().
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: cc3261c876763af7a2ff7df334e35b1a978b889f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cc3261c87676… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:22:36 2010 +0100 PIP_Tree.cc: fix optimized version of add_mul_assign_row(). --- src/PIP_Tree.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index f55a4e7..cbe6925 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -150,7 +150,7 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, ++i; } else if (i == i_end - || (j != j_end && (*i).first < (*j).first)) { + || (j != j_end && (*i).first > (*j).first)) { itr = row.find_create(*j); (*itr).second *= c; ++j;

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: add an optimized version of add_mul_assign_row() for sparse backends with slow insertions.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: e52cabe4d862e6b82bb5e8055435eed58797e202 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e52cabe4d862… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 21:14:00 2010 +0100 PIP_Tree.cc: add an optimized version of add_mul_assign_row() for sparse backends with slow insertions. --- src/PIP_Tree.cc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 2cd3578..f55a4e7 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -42,6 +42,8 @@ mod_assign(Coefficient& z, z += y; } +#ifndef PPL_SPARSE_BACKEND_SLOW_INSERTIONS + // Compute x += c * y inline void add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, @@ -127,6 +129,77 @@ add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, } } +#else // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + +// Compute x += c * y +inline void +add_mul_assign_row(PIP_Tree_Node::matrix_row_reference_type x, + Coefficient_traits::const_reference c, + PIP_Tree_Node::matrix_row_const_reference_type y) { + PIP_Tree_Node::matrix_row_copy_type row(x.size()); + PIP_Tree_Node::matrix_row_copy_iterator itr = row.end(); + PIP_Tree_Node::matrix_row_const_iterator i = x.begin(); + PIP_Tree_Node::matrix_row_const_iterator i_end = x.end(); + PIP_Tree_Node::matrix_const_row_const_iterator j = y.begin(); + PIP_Tree_Node::matrix_const_row_const_iterator j_end = y.end(); + if (i == i_end && j == j_end) + return; + if (j == j_end + || (i != i_end && (*i).first < (*j).first)) { + itr = row.find_create(*i); + ++i; + } else + if (i == i_end + || (j != j_end && (*i).first < (*j).first)) { + itr = row.find_create(*j); + (*itr).second *= c; + ++j; + } else { + PPL_ASSERT(i != i_end); + PPL_ASSERT(j != j_end); + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*j); + (*itr).second *= c; + (*itr).second += (*i).second; + ++i; + ++j; + } + PPL_ASSERT(itr != row.end()); + while (i != i_end && j != j_end) { + if ((*i).first < (*j).first) { + itr = row.find_create(*i,itr); + ++i; + } else { + if ((*i).first > (*j).first) { + itr = row.find_create(*j,itr); + (*itr).second *= c; + ++j; + } else { + PPL_ASSERT((*i).first == (*j).first); + itr = row.find_create(*j,itr); + (*itr).second *= c; + (*itr).second += (*i).second; + ++i; + ++j; + } + } + } + while (i != i_end) { + itr = row.find_create(*i,itr); + ++i; + } + PPL_ASSERT(i == i_end); + while (j != j_end) { + itr = row.find_create(*j,itr); + (*itr).second *= c; + ++j; + } + PPL_ASSERT(j == j_end); + std::swap(row,x); +} + +#endif // !defined(PPL_SPARSE_BACKEND_SLOW_INSERTIONS) + // Compute x -= y inline void sub_assign(PIP_Tree_Node::matrix_row_reference_type x,

1 0

[GIT] ppl/ppl(sparse_matrices): Indentation fixes.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: d03e637794519c09824b92e0ebcab88f0e208893 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d03e63779451… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:34:04 2010 +0100 Indentation fixes. --- src/PIP_Problem.cc | 18 +++++++++--------- src/PIP_Problem.templates.hh | 5 ++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index c24e57c..3c6f9ca 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -610,9 +610,9 @@ PPL::PIP_Problem } if (should_throw) throw std::length_error("PPL::PIP_Problem::" - "add_space_dimensions_and_embed(m_v, m_p):\n" - "adding m_v+m_p new space dimensions exceeds " - "the maximum allowed space dimension."); + "add_space_dimensions_and_embed(m_v, m_p):\n" + "adding m_v+m_p new space dimensions exceeds " + "the maximum allowed space dimension."); // First add PIP variables ... external_space_dim += m_vars; // ... then add PIP parameters. @@ -631,9 +631,9 @@ PPL::PIP_Problem ::add_to_parameter_space_dimensions(const Variables_Set& p_vars) { if (p_vars.space_dimension() > external_space_dim) throw std::invalid_argument("PPL::PIP_Problem::" - "add_to_parameter_space_dimension(p_vars):\n" - "*this and p_vars are dimension " - "incompatible."); + "add_to_parameter_space_dimension(p_vars):\n" + "*this and p_vars are dimension " + "incompatible."); const dimension_type original_size = parameters.size(); parameters.insert(p_vars.begin(), p_vars.end()); // Do not allow to turn variables into parameters. @@ -641,8 +641,8 @@ PPL::PIP_Problem end = p_vars.end(); p != end; ++p) { if (*p < internal_space_dim) { throw std::invalid_argument("PPL::PIP_Problem::" - "add_to_parameter_space_dimension(p_vars):" - "p_vars contain variable indices."); + "add_to_parameter_space_dimension(p_vars):" + "p_vars contain variable indices."); } } @@ -725,7 +725,7 @@ PPL::PIP_Problem::external_memory_in_bytes() const { // Adding the external memory for `input_cs'. n += input_cs.capacity() * sizeof(Constraint); for (const_iterator i = input_cs.begin(), - i_end = input_cs.end(); i != i_end; ++i) + i_end = input_cs.end(); i != i_end; ++i) n += (i->external_memory_in_bytes()); // FIXME: Adding the external memory for `parameters'. n += parameters.size() * sizeof(dimension_type); diff --git a/src/PIP_Problem.templates.hh b/src/PIP_Problem.templates.hh index 9faa49d..4781182 100644 --- a/src/PIP_Problem.templates.hh +++ b/src/PIP_Problem.templates.hh @@ -29,9 +29,8 @@ namespace Parma_Polyhedra_Library { template <typename In> PIP_Problem::PIP_Problem(dimension_type dim, - In first, - In last, - const Variables_Set& p_vars) + In first, In last, + const Variables_Set& p_vars) : external_space_dim(dim), internal_space_dim(0), status(PARTIALLY_SATISFIABLE),

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Problem: fix border-case in solve() method.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: ae3a65ca5a53cf39b74b95b5450e7c52c5ccc5d4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae3a65ca5a53… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:31:34 2010 +0100 PIP_Problem: fix border-case in solve() method. --- src/PIP_Problem.cc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 5bb4ed4..c24e57c 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -183,8 +183,10 @@ PPL::PIP_Problem::solve() const { ++i; break; } - } else + } else { continue_looping = false; + break; + } } if (continue_looping) { for ( ; pi != param_end; ++pi, ++i) {

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem: indentation fixes.
by Marco Poletti 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 6a0581c0733ca545f6812e01bd70ded9a03ee093 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6a0581c0733c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 22 14:20:35 2010 +0100 MIP_Problem: indentation fixes. --- src/MIP_Problem.templates.hh | 104 +++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/MIP_Problem.templates.hh b/src/MIP_Problem.templates.hh index 2dc137d..2a15b10 100644 --- a/src/MIP_Problem.templates.hh +++ b/src/MIP_Problem.templates.hh @@ -29,11 +29,10 @@ namespace Parma_Polyhedra_Library { template <typename In> MIP_Problem::MIP_Problem(const dimension_type dim, - In first, - In last, - const Variables_Set& int_vars, - const Linear_Expression& obj, - const Optimization_Mode mode) + In first, In last, + const Variables_Set& int_vars, + const Linear_Expression& obj, + const Optimization_Mode mode) : external_space_dim(dim), internal_space_dim(0), tableau(), @@ -61,47 +60,47 @@ MIP_Problem::MIP_Problem(const dimension_type dim, throw std::invalid_argument(s.str()); } - // Check for space dimension overflow. - if (dim > max_space_dimension()) - throw std::length_error("PPL::MIP_Problem:: MIP_Problem(dim, first, " - "last, int_vars, obj, mode):\n" - "dim exceeds the maximum allowed" - "space dimension."); - // Check the objective function. - if (obj.space_dimension() > dim) { - std::ostringstream s; - s << "PPL::MIP_Problem::MIP_Problem(dim, first, last," - << "int_vars, obj, mode):\n" - << "obj.space_dimension() == "<< obj.space_dimension() - << " exceeds d == "<< dim << "."; - throw std::invalid_argument(s.str()); - } - // Check the constraints. - for (In i = first; i != last; ++i) { - if (i->is_strict_inequality()) - throw std::invalid_argument("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, int_vars," - "obj, mode):\nrange [first, last) contains" - "a strict inequality constraint."); - if (i->space_dimension() > dim) { - std::ostringstream s; - s << "PPL::MIP_Problem::" - << "MIP_Problem(dim, first, last, int_vars, obj, mode):\n" - << "range [first, last) contains a constraint having space" - << "dimension == " << i->space_dimension() << " that exceeds" - "this->space_dimension == " << dim << "."; - throw std::invalid_argument(s.str()); - } - input_cs.push_back(*i); - } - PPL_ASSERT(OK()); + // Check for space dimension overflow. + if (dim > max_space_dimension()) + throw std::length_error("PPL::MIP_Problem:: MIP_Problem(dim, first, " + "last, int_vars, obj, mode):\n" + "dim exceeds the maximum allowed" + "space dimension."); + // Check the objective function. + if (obj.space_dimension() > dim) { + std::ostringstream s; + s << "PPL::MIP_Problem::MIP_Problem(dim, first, last," + << "int_vars, obj, mode):\n" + << "obj.space_dimension() == "<< obj.space_dimension() + << " exceeds d == "<< dim << "."; + throw std::invalid_argument(s.str()); + } + // Check the constraints. + for (In i = first; i != last; ++i) { + if (i->is_strict_inequality()) + throw std::invalid_argument("PPL::MIP_Problem::" + "MIP_Problem(dim, first, last, int_vars," + "obj, mode):\nrange [first, last) contains" + "a strict inequality constraint."); + if (i->space_dimension() > dim) { + std::ostringstream s; + s << "PPL::MIP_Problem::" + << "MIP_Problem(dim, first, last, int_vars, obj, mode):\n" + << "range [first, last) contains a constraint having space" + << "dimension == " << i->space_dimension() << " that exceeds" + "this->space_dimension == " << dim << "."; + throw std::invalid_argument(s.str()); + } + input_cs.push_back(*i); + } + PPL_ASSERT(OK()); } template <typename In> MIP_Problem::MIP_Problem(dimension_type dim, - In first, In last, - const Linear_Expression& obj, - Optimization_Mode mode) + In first, In last, + const Linear_Expression& obj, + Optimization_Mode mode) : external_space_dim(dim), internal_space_dim(0), tableau(), @@ -120,9 +119,9 @@ MIP_Problem::MIP_Problem(dimension_type dim, // Check for space dimension overflow. if (dim > max_space_dimension()) throw std::length_error("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, obj, mode):\n" - "dim exceeds the maximum allowed space " - "dimension."); + "MIP_Problem(dim, first, last, obj, mode):\n" + "dim exceeds the maximum allowed space " + "dimension."); // Check the objective function. if (obj.space_dimension() > dim) { std::ostringstream s; @@ -136,16 +135,17 @@ MIP_Problem::MIP_Problem(dimension_type dim, for (In i = first; i != last; ++i) { if (i->is_strict_inequality()) throw std::invalid_argument("PPL::MIP_Problem::" - "MIP_Problem(dim, first, last, obj, mode):\n" - "range [first, last) contains a strict " - "inequality constraint."); + "MIP_Problem(dim, first, last, obj, mode):" + "\n" + "range [first, last) contains a strict " + "inequality constraint."); if (i->space_dimension() > dim) { std::ostringstream s; s << "PPL::MIP_Problem::" - << "MIP_Problem(dim, first, last, obj, mode):\n" - << "range [first, last) contains a constraint having space" - << "dimension" << " == " << i->space_dimension() << " that exceeds" - "this->space_dimension == " << dim << "."; + << "MIP_Problem(dim, first, last, obj, mode):\n" + << "range [first, last) contains a constraint having space" + << "dimension" << " == " << i->space_dimension() << " that exceeds" + "this->space_dimension == " << dim << "."; throw std::invalid_argument(s.str()); } input_cs.push_back(*i);

1 0

[GIT] ppl/ppl(termination): Code, unintensionally added by previous commit, removed..
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: cfc36c700221dee64e736641692897791d7ce698 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cfc36c700221… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 17:13:14 2010 +0000 Code, unintensionally added by previous commit, removed.. --- .../Java/parma_polyhedra_library/Makefile.am | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 942ac77..199344b 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -164,10 +164,6 @@ all_java_sources = \ $(fixed_java_sources) \ $(required_instantiations_java_sources) -all_java_cxx_headers = \ -$(fixed_java_cxx_headers) \ -$(required_instantiations_java_cxx_headers) - # NOTE: Fake_Class_for_Doxygen.java should be added here. EXTRA_DIST = \ $(interface_generator_files) \

1 0

[GIT] ppl/ppl(termination): Finished adding code for the java interface to the termination methods.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: e8da5d7cae86912ab7c15708324f2d0b01338d82 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e8da5d7cae86… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 16:47:17 2010 +0000 Finished adding code for the java interface to the termination methods. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 138 ++++++++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 10 +- ...l_interface_generator_java_classes_java_code.m4 | 42 ++++++- 3 files changed, 187 insertions(+), 3 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 dcc850b..8714619 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 @@ -1303,3 +1303,141 @@ Java_parma_1polyhedra_1library_termination_1test_1MS_1@TOPOLOGY@1@CLASS@ return 0; } ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_termination_1test_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ +(JNIEnv* env, jclass, jobject j_p) { + try { + @TOPOLOGY@@CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + return termination_test_@TERMINATION_ID@(*p_ptr); + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_termination_1test_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 +(JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after) { + try { + @TOPOLOGY@@CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + return termination_test_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after); + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_one_1affine_1ranking_1function_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ +(JNIEnv* env, jclass, jobject j_p, jobject j_g) { + try { + @TOPOLOGY@@CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + Generator g(point()); + if (one_affine_ranking_function_@TERMINATION_ID@(*p_ptr, g)) { + jobject j_g_result = build_java_generator(env, g);; + set_generator(env, j_g, j_g_result); + return true; + } + return false; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_one_1affine_1ranking_1function_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 +(JNIEnv* env, jclass, jobject j_p_before, jobject j_g_after) { + try { + @TOPOLOGY@@CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + Generator g(point()); + if (one_affine_ranking_function_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after, g)) { + jobject j_g_result = build_java_generator(env, g);; + set_generator(env, j_g, j_g_result); + return true; + } + return false; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_all_1affine_1ranking_1functions_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@ +(JNIEnv* env, jclass, jobject j_p, jobject j_ph) { + try { + @TOPOLOGY@@CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@(*p_ptr, *ph) { + set_ptr(env, j_p, *ph); + return true; + } + CATCH_ALL; + return 0; +} + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_all_1affine_1ranking_1functions_1@TERMINATION_ID@_1@TOPOLOGY@1@CLASS@_12 +(JNIEnv* env, jclass, jobject j_p_before, jobject j_p_after, jobject j_ph) { + try { + @TOPOLOGY@@CLASS@* p_ptr_before + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_before)); + @TOPOLOGY@@CLASS@* p_ptr_after + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p_after)); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@_2(*p_ptr_before, *p_ptr_after, *ph) { + set_ptr(env, j_p, *ph); + return true; + } + CATCH_ALL; + return 0; +} + +') diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 20f8389..942ac77 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -67,6 +67,7 @@ parma_polyhedra_library.Poly_Con_Relation \ parma_polyhedra_library.Poly_Gen_Relation \ parma_polyhedra_library.PPL_Object \ parma_polyhedra_library.Relation_Symbol \ +parma_polyhedra_library.Termination \ parma_polyhedra_library.Variable \ parma_polyhedra_library.Variables_Set @@ -105,6 +106,7 @@ parma_polyhedra_library_Poly_Con_Relation.h \ parma_polyhedra_library_Poly_Gen_Relation.h \ parma_polyhedra_library_PPL_Object.h \ parma_polyhedra_library_Relation_Symbol.h \ +parma_polyhedra_library_Termination.h \ parma_polyhedra_library_Variable.h \ parma_polyhedra_library_Variables_Set.h @@ -153,14 +155,18 @@ $(srcdir)/Poly_Gen_Relation.java \ $(srcdir)/PPL_Object.java \ $(srcdir)/Relation_Symbol.java \ $(srcdir)/Timeout_Exception.java \ +$(builddir)/Termination.java \ $(srcdir)/Variable.java \ $(srcdir)/Variables_Set.java # NOTE: do _NOT_ add Fake_Class_for_Doxygen.java to this list. all_java_sources = \ $(fixed_java_sources) \ -$(required_instantiations_java_sources) \ -Termination.java +$(required_instantiations_java_sources) + +all_java_cxx_headers = \ +$(fixed_java_cxx_headers) \ +$(required_instantiations_java_cxx_headers) # NOTE: Fake_Class_for_Doxygen.java should be added here. EXTRA_DIST = \ 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 295ed7f..e83cada 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 @@ -657,5 +657,45 @@ m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', ___END_OF_FILE___ ___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ public static native boolean - ppl_termination_test_MS_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p); + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p); +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after); +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p, Generator g); +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after, Generator g); +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p, Polyhedron ph); +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(@TOPOLOGY@@CLASS@ p_before, @TOPOLOGY@@CLASS@ p_after, Polyhedron ph); ')

1 0

[GIT] ppl/ppl(termination): Added OCaml interface code for the 6 new termination methods.
by Patricia Hill 22 Mar '10

22 Mar '10

Module: ppl/ppl Branch: termination Commit: c8799e410088e03c76f449184780d572822cb177 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c8799e410088… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 22 14:54:42 2010 +0000 Added OCaml interface code for the 6 new termination methods. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 121 ++++++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 47 ++++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 35 ++++++ ...terface_generator_ocaml_procedure_generators.m4 | 13 ++- 4 files changed, 215 insertions(+), 1 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index 356b65a..3900367 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -1204,3 +1204,124 @@ ppl_@CLASS@_approximate_@PARTITION@(value ph1, value ph2) try { CATCH_ALL ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(value pset) try { + CAMLparam1(pset); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + CAMLreturn(Val_bool(termination_test_@TERMINATION_ID@(ppset))); +} +CATCH_ALL + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2(value pset_before, + value pset_after) + try { + CAMLparam2(pset_before, pset_after); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_before))); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_after))); + CAMLreturn(Val_bool(termination_test_@TERMINATION_ID@_2(ppset_before, + ppset_after))); +} +CATCH_ALL + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ + (value pset) + try { + CAMLparam1(pset); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + Generator g(point()); + bool ppl_return_value = one_affine_ranking_function_@TERMINATION_ID@ + (ppset, g); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, build_ocaml_generator(g)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 + (value pset_before, value pset_after) + try { + CAMLparam2(pset_before, pset_after); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_before))); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_after))); + Generator g(point()); + bool ppl_return_value = one_affine_ranking_function_@TERMINATION_ID@_2 + (ppset_before, ppset_after, g); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, Val_bool(ppl_return_value)); + Store_field(caml_return_value, 1, build_ocaml_generator(g)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ + (value pset) + try { + CAMLparam1(pset); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@(ppset, *ph); + CAMLreturn(unregistered_value_p_Polyhedron(*ph)); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 + (value pset_before, value pset_after) + try { + CAMLparam2(pset_before, pset_after); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_before))); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_after))); + @A_TERMINATION_ID@Polyhedron* ph = new @A_TERMINATION_ID@Polyhedron(); + all_affine_ranking_functions_@TERMINATION_ID@_2(ppset_before, ppset_after, *ph); + CAMLreturn(unregistered_value_p_Polyhedron(*ph)); +} +CATCH_ALL + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 index 0617f89..0642842 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -546,3 +546,50 @@ external ppl_@CLASS@_@MAXMIN@: = "ppl_@CLASS@_@MAXMIN@" ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool + = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool * linear_generator + = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool * linear_generator + = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron + = "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron + = "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2" + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index 014d876..acb05a4 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -480,3 +480,38 @@ val ppl_@CLASS@_approximate_@PARTITION@: @!CLASS@ * pointset_powerset_grid * bool ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> bool * linear_generator + +') + +m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> bool * linear_generator + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron + +') + +m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron + +') diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index 0e39dcb..8b8ff38 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -40,4 +40,15 @@ dnl in the ppl_interface_generator_*_code.m4 file. dnl The <name> must be exactly as written here. dnl -m4_define(`m4_procedure_list', `m4_common_procedure_list') +m4_define(`m4_procedure_list', + `m4_echo_unquoted(ppl_new_@CLASS@_iterator +pointset_powerset, +`m4_common_procedure_list', +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, +ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, +ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, +ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, +ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, +ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, +) +') +

1 0