Termination functions renamed in non-C++ interfaces.

6 files changed, 66 insertions, 66 deletions

diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4
index 53841ad93..ec9efcaa8 100644
--- a/interfaces/C/ppl_interface_generator_c_cc_code.m4
+++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4
@@ -1156,10 +1156,10 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `dnl
 int
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 (ppl_const_@CLASS@_t pset) try {
   const @TOPOLOGY@@CPP_CLASS@& ppset
     = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset));
@@ -1169,10 +1169,10 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `dnl
 int
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 (ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after) try {
   const @TOPOLOGY@@CPP_CLASS@& ppset_before
     = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_before));
@@ -1184,9 +1184,9 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `int
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 (ppl_const_@CLASS@_t pset,
  ppl_Generator_t point) try {
   const @TOPOLOGY@@CPP_CLASS@& ppset
@@ -1199,9 +1199,9 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `int
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 (ppl_const_@CLASS@_t pset_before,
  ppl_const_@CLASS@_t pset_after,
  ppl_Generator_t point) try {
@@ -1219,9 +1219,9 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `int
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 (ppl_const_@CLASS@_t pset,
  ppl_Polyhedron_t ph) try {
   const @TOPOLOGY@@CPP_CLASS@& ppset
@@ -1235,9 +1235,9 @@ CATCH_ALL
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `int
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 (ppl_const_@CLASS@_t pset_before,
  ppl_const_@CLASS@_t pset_after,
  ppl_Polyhedron_t ph) try {
diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4
index 0b2443e38..c793a5ea4 100644
--- a/interfaces/C/ppl_interface_generator_c_h_code.m4
+++ b/interfaces/C/ppl_interface_generator_c_h_code.m4
@@ -34,60 +34,60 @@ dnl There is no code at present for these procedures in the C interface.
 dnl Remove the macro if its definition is added.
 dnl
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 PPL_PROTO((ppl_const_@CLASS@_t pset));
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 PPL_PROTO((ppl_const_@CLASS@_t pset_before, ppl_const_@CLASS@_t pset_after));
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 PPL_PROTO((ppl_const_@CLASS@_t pset,
            ppl_Generator_t point));
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 PPL_PROTO((ppl_const_@CLASS@_t pset_before,
            ppl_const_@CLASS@_t pset_after,
            ppl_Generator_t point));
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
 PPL_PROTO((ppl_const_@CLASS@_t pset,
            ppl_Polyhedron_t ph));
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
 `dnl
 /*! \relates ppl_@CLASS@_tag */
 int
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
 PPL_PROTO((ppl_const_@CLASS@_t pset_before,
            ppl_const_@CLASS@_t pset_after,
            ppl_Polyhedron_t ph));
diff --git a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4
index c77e27bdb..2137ba32e 100644
--- a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4
+++ b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4
@@ -44,11 +44,11 @@ ppl_new_@TOPOLOGY@@CLASS@_recycle_@BUILD_REPRESENT@s +simple,
 ppl_assign_@TOPOLOGY@@CLASS@_from_@TOPOLOGY@@CLASS@ +simple,
 ppl_@CLASS@_add_recycled_@CLASS_REPRESENT@s +simple,
 ppl_@CLASS@_wrap_assign +simple,
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@ +simple,
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@ +simple,
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@ +simple,
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2 +simple,
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2 +simple,
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2 +simple,
+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,
 )
 ')
diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4
index 2a28c8976..41351301c 100644
--- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4
+++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4
@@ -1228,11 +1228,11 @@ m4_define(`ppl_@CLASS@_bounded_@AFFIMAGE@_code',
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+  ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
   (Prolog_term_ref t_pset) {
-  static const char* where = "ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/1";
+  static const char* where = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/1";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset, where);
     PPL_CHECK(pset);
@@ -1244,12 +1244,12 @@ m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
   (Prolog_term_ref t_pset_before, Prolog_term_ref t_pset_after) {
   static const char* where
-      = "ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/2";
+      = "ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/2";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset_before
        = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset_before, where);
@@ -1266,13 +1266,13 @@ m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+  ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
   (Prolog_term_ref t_pset,
    Prolog_term_ref t_g) {
   static const char* where
-     = "ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/2";
+     = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset, where);
     Generator gg(point());
@@ -1287,14 +1287,14 @@ m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_co
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
   (Prolog_term_ref t_pset_before,
    Prolog_term_ref t_pset_after,
    Prolog_term_ref t_g) {
   static const char* where
-     = "ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/3";
+     = "ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset_before
        = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset_before, where);
@@ -1314,13 +1314,13 @@ m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_
 }
 
 ')
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+  ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
   (Prolog_term_ref t_pset,
    Prolog_term_ref t_ph) {
   static const char* where =
-      "ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/2";
+      "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@/2";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset, where);
     PPL_CHECK(pset);
@@ -1342,14 +1342,14 @@ m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_c
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
   (Prolog_term_ref t_pset_before,
    Prolog_term_ref t_pset_after,
    Prolog_term_ref t_ph) {
   static const char* where =
-      "ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/3";
+      "ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2/3";
   try {
     @TOPOLOGY@@CPP_CLASS@* pset_before
        = term_to_handle<@TOPOLOGY@@CPP_CLASS@ >(t_pset_before, where);
diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
index ef2611f86..21d226cd1 100644
--- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
+++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4
@@ -511,48 +511,48 @@ m4_define(`ppl_@CLASS@_@MEMBYTES@_code',
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@(Prolog_term_ref t_pset);
+  ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(Prolog_term_ref t_pset);
 
 ')
 
-m4_define(`ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
      (Prolog_term_ref t_pset_before,
       Prolog_term_ref t_pset_after);
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+  ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
      (Prolog_term_ref t_pset,
       Prolog_term_ref t_g);
 
 ')
 
-m4_define(`ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
      (Prolog_term_ref t_pset_before,
       Prolog_term_ref t_pset_after,
       Prolog_term_ref t_g);
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@
+  ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@
      (Prolog_term_ref t_pset,
       Prolog_term_ref t_ph);
 
 ')
 
-m4_define(`ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2_code',
+m4_define(`ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2_code',
   `extern "C" Prolog_foreign_return_type
-  ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2
+  ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2
      (Prolog_term_ref t_pset_before,
       Prolog_term_ref t_pset_after,
       Prolog_term_ref t_ph);
diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
index 8ac21d1dc..685844f7e 100644
--- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
+++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4
@@ -87,11 +87,11 @@ ppl_MIP_Problem_ascii_dump/1`'dnl
 
 m4_define(`m4_procedure_list',
   `m4_echo_unquoted(`m4_common_procedure_list',
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/1 +simple,
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/2 +simple,
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@/2 +simple,
-ppl_termination_test_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/2 +simple,
-ppl_one_affine_ranking_function_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/3 +simple,
-ppl_all_affine_ranking_functions_@TOPOLOGY@@CLASS@_@TERMINATION_ID@_2/3 +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,
 )
 ')