- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed problems in the Artificial_Parameter(_Sequence ) interface.
by Enea Zaffanella 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: 9690f45d94004ab77af0b5b3b7c679cedf807f54 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9690f45d9400… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 19:24:41 2010 +0200 Fixed problems in the Artificial_Parameter(_Sequence) interface. --- interfaces/Java/jni/ppl_java_common.cc | 24 ++---------- interfaces/Java/jni/ppl_java_common.defs.hh | 10 +---- interfaces/Java/jni/ppl_java_globals.cc | 39 ++++++-------------- .../Artificial_Parameter.java | 20 ++++++++++ interfaces/Java/tests/PIP_Problem_test1.java | 4 +- 5 files changed, 40 insertions(+), 57 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index f09bc6d..306bbdd 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -1213,33 +1213,17 @@ build_java_congruence_system(JNIEnv* env, const Congruence_System& cgs) { } jobject -build_java_artificial_parameter(JNIEnv* env, const PIP_Tree_Node::Artificial_Parameter& art) { +build_java_artificial_parameter +(JNIEnv* env, const PIP_Tree_Node::Artificial_Parameter& art) { + jobject j_le = build_linear_expression(env, art); jobject j_den = build_java_coeff(env, art.denominator()); - jobject j_art = build_linear_expression(env, art); jobject ret = env->NewObject(cached_classes.Artificial_Parameter, cached_FMIDs.Artificial_Parameter_init_ID, - j_art, j_den); + j_le, j_den); CHECK_RESULT_THROW(env, ret); return ret; } -jobject -build_java_artificial_parameter_sequence(JNIEnv* env, const PIP_Tree_Node::Artificial_Parameter_Sequence& aps) { - jobject j_aps = env->NewObject(cached_classes.Artificial_Parameter_Sequence, - cached_FMIDs.Artificial_Parameter_Sequence_init_ID); - CHECK_RESULT_THROW(env, j_aps); - for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator v_begin - = aps.begin(), - v_end = aps.end(); v_begin != v_end; ++v_begin) { - jobject j_aps = build_java_artificial_parameter(env, *v_begin); - env->CallBooleanMethod(j_aps, - cached_FMIDs.Artificial_Parameter_Sequence_add_ID, - j_aps); - CHECK_EXCEPTION_THROW(env); - } - return j_aps; -} - } // namespace Java } // namespace Interfaces diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index 618f48e..f1ca59d 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -726,7 +726,8 @@ build_java_constraint(JNIEnv* env, const Constraint& c); from C++ Artificial_Parameter \p ap. */ jobject -build_java_artificial_parameter(JNIEnv* env, const PIP_Tree_Node::Artificial_Parameter& ap); +build_java_artificial_parameter(JNIEnv* env, + const PIP_Tree_Node::Artificial_Parameter& ap); /*! \brief Builds a Java parma_polyhedra_library::Congruence @@ -757,13 +758,6 @@ jobject build_java_constraint_system(JNIEnv* env, const Constraint_System& cs); /*! \brief - Builds a Java parma_polyhedra_library::Artificial_Parameter - from C++ Artificial_Parameter \p ap. -*/ -jobject -build_java_artificial_parameter(JNIEnv* env, - const PIP_Tree_Node::Artificial_Parameter& ap); -/*! \brief Builds a Java parma_polyhedra_library::Artificial_Parameter_Sequence from C++ Artificial_Parameter_Sequence \p aps. */ diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index b2e3dbc..d701ef1 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -23,7 +23,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "ppl_java_common.defs.hh" #include "parma_polyhedra_library_Artificial_Parameter.h" #include "parma_polyhedra_library_Artificial_Parameter_Sequence.h" -#include "parma_polyhedra_library_Artificial_Parameter_Sequence_Iterator.h" #include "parma_polyhedra_library_Bounded_Integer_Type_Overflow.h" #include "parma_polyhedra_library_Bounded_Integer_Type_Representation.h" #include "parma_polyhedra_library_Bounded_Integer_Type_Width.h" @@ -1969,20 +1968,19 @@ Java_parma_1polyhedra_1library_PIP_1Tree_1Node_number_1of_1artificials JNIEXPORT jobject JNICALL Java_parma_1polyhedra_1library_PIP_1Tree_1Node_artificials -(JNIEnv* env, jobject j_this_pip_problem) { +(JNIEnv* env, jobject j_this_pip_node) { try { jobject j_arts = env->NewObject(cached_classes.Artificial_Parameter_Sequence, cached_FMIDs.Artificial_Parameter_Sequence_init_ID); CHECK_RESULT_RETURN(env, j_arts, 0); - PIP_Tree_Node* pip - = reinterpret_cast<PIP_Tree_Node*>(get_ptr(env, j_this_pip_problem)); - for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator arts_it - = pip->art_parameter_begin(), arts_end = pip->art_parameter_end(); - arts_it != arts_end; - ++arts_it) { - jobject j_art = build_java_artificial_parameter(env, *arts_it); + const PIP_Tree_Node* pip_node + = reinterpret_cast<const PIP_Tree_Node*>(get_ptr(env, j_this_pip_node)); + for (PIP_Tree_Node::Artificial_Parameter_Sequence::const_iterator + i = pip_node->art_parameter_begin(), + i_end = pip_node->art_parameter_end(); i != i_end; ++i) { + jobject j_art = build_java_artificial_parameter(env, *i); env->CallBooleanMethod(j_arts, cached_FMIDs.Artificial_Parameter_Sequence_add_ID, j_art); @@ -2019,14 +2017,14 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Artificial_1Parameter_initIDs (JNIEnv* env, jclass j_artificial_parameter_class) { jfieldID fID; - fID = env->GetFieldID(j_artificial_parameter_class, "den", - "Lparma_polyhedra_library/Coefficient;"); - CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Artificial_Parameter_den_ID = fID; fID = env->GetFieldID(j_artificial_parameter_class, "le", "Lparma_polyhedra_library/Linear_Expression;"); CHECK_RESULT_ASSERT(env, fID); cached_FMIDs.Artificial_Parameter_le_ID = fID; + fID = env->GetFieldID(j_artificial_parameter_class, "den", + "Lparma_polyhedra_library/Coefficient;"); + CHECK_RESULT_ASSERT(env, fID); + cached_FMIDs.Artificial_Parameter_den_ID = fID; jmethodID mID; mID = env->GetMethodID(j_artificial_parameter_class, "<init>", "(Lparma_polyhedra_library/Linear_Expression;" @@ -2042,21 +2040,8 @@ Java_parma_1polyhedra_1library_Artificial_1Parameter_1Sequence_initIDs jmethodID mID; mID = env->GetMethodID(j_aps_class, "<init>", "()V"); CHECK_RESULT_ASSERT(env, mID); - cached_FMIDs.Artificial_Parameter_init_ID = mID; + cached_FMIDs.Artificial_Parameter_Sequence_init_ID = mID; mID = env->GetMethodID(j_aps_class, "add", "(Ljava/lang/Object;)Z"); CHECK_RESULT_ASSERT(env, mID); cached_FMIDs.Artificial_Parameter_Sequence_add_ID = mID; - // NOTE: initialize the iterator method IDs common to all *_System classes. - mID = env->GetMethodID(j_aps_class, "iterator", - "()Ljava/util/Iterator;"); - CHECK_RESULT_ASSERT(env, mID); - cached_FMIDs.System_iterator_ID = mID; - mID = env->GetMethodID(cached_classes.Iterator, "hasNext", "()Z"); - CHECK_RESULT_ASSERT(env, mID); - cached_FMIDs.System_Iterator_has_next_ID = mID; - assert(cached_classes.Iterator != NULL); - mID = env->GetMethodID(cached_classes.Iterator, "next", - "()Ljava/lang/Object;"); - CHECK_RESULT_ASSERT(env, mID); - cached_FMIDs.System_Iterator_next_ID = mID; } diff --git a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter.java b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter.java index 0f917c3..347b4f4 100644 --- a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter.java +++ b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter.java @@ -54,6 +54,15 @@ public class Artificial_Parameter { private Coefficient den; /*! \brief + Builds an artificial parameter from a linear expression + and a denominator. + */ + public Artificial_Parameter(Linear_Expression e, Coefficient d) { + le = e.clone(); + den = new Coefficient(d); + } + + /*! \brief Returns the linear expression in artificial parameter \p this. */ public Linear_Expression linear_expression() { @@ -66,4 +75,15 @@ public class Artificial_Parameter { public Coefficient denominator() { return den; } + + //! Returns an ascii formatted internal representation of \p this. + public native String ascii_dump(); + + //! Returns a string representation of \p this. + public native String toString(); + + private static native void initIDs(); + static { + initIDs(); + } } diff --git a/interfaces/Java/tests/PIP_Problem_test1.java b/interfaces/Java/tests/PIP_Problem_test1.java index 9eac94c..99c7399 100644 --- a/interfaces/Java/tests/PIP_Problem_test1.java +++ b/interfaces/Java/tests/PIP_Problem_test1.java @@ -270,8 +270,8 @@ static { return false; PIP_Tree_Node ptree1 = pip1.solution(); long num_of_arts1 = ptree1.number_of_artificials(); -// Artificial_Parameter_Sequence arts1 = ptree1.artificials(); - ok = (ptree1.OK() && (num_of_arts1 == 0)); + Artificial_Parameter_Sequence arts1 = ptree1.artificials(); + ok = ptree1.OK() && num_of_arts1 == 0 && arts1.size() == 0; if (!ok) return false; PIP_Solution_Node psol1 = ptree1.as_solution();

1 0

[GIT] ppl/ppl(master): Several improvements and bug fixes.
by Patricia Hill 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: f107b625cb25255644e8cbf4397f7bbde3c529a9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f107b625cb25… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 31 15:12:20 2010 +0100 Several improvements and bug fixes. Removed unwanted iterator class for Artificial_Parameter_Sequence. --- interfaces/Java/jni/ppl_java_common.cc | 11 + interfaces/Java/jni/ppl_java_common.defs.hh | 9 + interfaces/Java/jni/ppl_java_globals.cc | 285 ++++---------------- .../Artificial_Parameter.java | 25 +- .../Artificial_Parameter_Sequence.java | 6 + .../Artificial_Parameter_Sequence_Iterator.java | 57 ---- .../Java/parma_polyhedra_library/Makefile.am | 4 - .../parma_polyhedra_library/PIP_Tree_Node.java | 24 +-- interfaces/Java/tests/PIP_Problem_test1.java | 27 +- 9 files changed, 104 insertions(+), 344 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f107b625…

1 0

[GIT] ppl/ppl(master): Several improvements and bug fixes.
by Patricia Hill 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: 29ad27fd3fe8ca74d1329d11f7c1cb8891f0260c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=29ad27fd3fe8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 31 10:05:58 2010 +0100 Several improvements and bug fixes. More tests for the Java inmterface added. Commented lines in test indicate where code needs fixing. --- interfaces/Java/jni/ppl_java_globals.cc | 82 ++++++++++++++------ .../parma_polyhedra_library/PIP_Decision_Node.java | 2 +- .../parma_polyhedra_library/PIP_Solution_Node.java | 4 +- interfaces/Java/tests/PIP_Problem_test1.java | 80 +++++++++++++++++++- 4 files changed, 139 insertions(+), 29 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=29ad27fd…

1 0

[GIT] ppl/ppl(master): Updated with news of the new reduction operator for
by Patricia Hill 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: f99e22d0ea9e89030e2cb33c95808d73828a7c82 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f99e22d0ea9e… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 31 07:30:09 2010 +0100 Updated with news of the new reduction operator for partially reduced products and the new frequency operator. Removed a TODO item concerning the interfaces and termination methods. --- NEWS | 16 ++++++++++++++++ TODO | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index eea5229..835744d 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,22 @@ o New methods return true if and only if `*this' is 0, and if and only if all the homogeneous terms of `*this' are 0, respectively. +o For the PPL semantic objects, other than the Pointset_Powerset and + Partially_Reduced Product, there is a new method: + + bool frequency(const Linear_Expression& expr, + Coefficient& freq_n, Coefficient& freq_d, + Coefficient& val_n, Coefficient& val_d) + + This operator computes both the "frequency" (f = freq_n/freq_d) + and a value (v = val_n/val_d) closest to zero so that every point + in the object satisfies the congruence (expr %= v) / f. + +o New reduction operator "Shape_Preserving_Reduction" has been added to + the Partially_Reduced_Product abstraction. + This operator is aimed at the product of a grid and a shape domain; + allowing the bounds of the shape to shrink to the touch the points + of the grid, such that the new bounds are parallel to the old bounds. Deprecated and removed methods ------------------------------ diff --git a/TODO b/TODO index db3904f..ddebb7f 100644 --- a/TODO +++ b/TODO @@ -2,9 +2,6 @@ Enhancements for PPL 0.11 ========================= -- Interface Linear_Expression::is_zero() - and Linear_Expression::all_homogeneous_terms_are_zero() - 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

1 0

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

31 Mar '10

Module: ppl/ppl Branch: master Commit: ee2502ed96080ec87fdf94e05153f49acf2a020f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ee2502ed9608… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Mar 31 09:22:16 2010 +0400 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index e8c0fbc..d56c885 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.11pre17], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre18], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Completed removal of Constraint_System_Iterator.
by Enea Zaffanella 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 3fadce8abb10c931f1b4988a75e52316986387de URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3fadce8abb10… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 01:27:08 2010 +0200 Completed removal of Constraint_System_Iterator. --- interfaces/Java/jni/ppl_java_globals.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 2318a75..100a91d 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -34,7 +34,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "parma_polyhedra_library_Congruence_System.h" #include "parma_polyhedra_library_Constraint.h" #include "parma_polyhedra_library_Constraint_System.h" -#include "parma_polyhedra_library_Constraint_System_Iterator.h" #include "parma_polyhedra_library_Degenerate_Element.h" #include "parma_polyhedra_library_Generator.h" #include "parma_polyhedra_library_Generator_System.h"

1 0

[GIT] ppl/ppl(master): Fixed assign_all_inequalities_approximation for shapes.
by Enea Zaffanella 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 43ec65852330b6023cf957b25db0c72398ad3de7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=43ec65852330… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 01:21:14 2010 +0200 Fixed assign_all_inequalities_approximation for shapes. --- src/termination.cc | 27 +++++++++++++++++++++++++ src/termination.templates.hh | 44 +++++------------------------------------ 2 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/termination.cc b/src/termination.cc index bfadb64..3ba1213 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -31,6 +31,33 @@ namespace Implementation { namespace Termination { +void +assign_all_inequalities_approximation(const Constraint_System& cs_in, + Constraint_System& cs_out) { + if (cs_in.has_strict_inequalities() || cs_in.has_equalities()) { + // Here we have some strict inequality and/or equality constraints: + // translate them into non-strict inequality constraints. + for (Constraint_System::const_iterator i = cs_in.begin(), + i_end = cs_in.end(); i != i_end; ++i) { + const Constraint& c = *i; + if (c.is_equality()) { + // Insert the two corresponding opposing inequalities. + cs_out.insert(Linear_Expression(c) >= 0); + cs_out.insert(Linear_Expression(c) <= 0); + } + else if (c.is_strict_inequality()) + // Insert the non-strict approximation. + cs_out.insert(Linear_Expression(c) >= 0); + else + // Insert as is. + cs_out.insert(c); + } + } + else + // No strict inequality and no equality constraints. + cs_out = cs_in; +} + template <> void assign_all_inequalities_approximation(const C_Polyhedron& ph, diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 79abb37..f60573c 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -132,33 +132,15 @@ output_function_PR(std::ostream& s, const Variable& v) { } #endif -template <typename PSET> void +assign_all_inequalities_approximation(const Constraint_System& cs_in, + Constraint_System& cs_out); + +template <typename PSET> +inline void assign_all_inequalities_approximation(const PSET& pset, Constraint_System& cs) { - const Constraint_System& pset_cs = pset.minimized_constraints(); - if (pset_cs.has_strict_inequalities() || pset_cs.has_equalities()) { - // Here we have some strict inequality and/or equality constraints: - // translate them into non-strict inequality constraints. - for (Constraint_System::const_iterator i = pset_cs.begin(), - i_end = pset_cs.end(); i != i_end; ++i) { - const Constraint& c = *i; - if (c.is_equality()) { - // Insert the two corresponding opposing inequalities. - cs.insert(Linear_Expression(c) >= 0); - cs.insert(Linear_Expression(c) <= 0); - } - else if (c.is_strict_inequality()) - // Insert the non-strict approximation. - cs.insert(Linear_Expression(c) >= 0); - else - // Insert as is. - cs.insert(c); - } - } - else - // No strict inequality and no equality constraints. - cs = pset_cs; + assign_all_inequalities_approximation(pset.minimized_constraints(), cs); } template <> @@ -166,20 +148,6 @@ void assign_all_inequalities_approximation(const C_Polyhedron& ph, Constraint_System& cs); -template <typename T> -void -assign_all_inequalities_approximation(const BD_Shape<T>& bds, - Constraint_System& cs) { - cs = bds.minimized_constraints(); -} - -template <typename T> -void -assign_all_inequalities_approximation(const Octagonal_Shape<T>& ocs, - Constraint_System& cs) { - cs = ocs.minimized_constraints(); -} - void shift_unprimed_variables(Constraint_System& cs);

1 0

[GIT] ppl/ppl(master): Interfaced quasi_ranking procedures to C.
by Enea Zaffanella 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 5ad56622a3e233351d32c3bf0b8c534c6aced280 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5ad56622a3e2… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 01:20:12 2010 +0200 Interfaced quasi_ranking procedures to C. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 37 +++++++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 23 +++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 7aa78e5..d0e6174 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -1325,6 +1325,43 @@ CATCH_ALL ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`int +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ +(ppl_const_@CLASS@_t pset, + ppl_Polyhedron_t ph_decreasing, + ppl_Polyhedron_t ph_bounded) try { + const @TOPOLOGY@@CPP_CLASS@& ppset + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset)); + all_affine_quasi_ranking_functions_MS(ppset, + *static_cast<C_Polyhedron*>(to_nonconst(ph_decreasing)), + *static_cast<C_Polyhedron*>(to_nonconst(ph_bounded))); + return 0; +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`int +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 +(ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Polyhedron_t ph_decreasing, + ppl_Polyhedron_t ph_bounded) try { + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_before)); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *static_cast<const @TOPOLOGY@@CPP_CLASS@*>(to_const(pset_after)); + all_affine_quasi_ranking_functions_MS_2(ppset_before, ppset_after, + *static_cast<C_Polyhedron*>(to_nonconst(ph_decreasing)), + *static_cast<C_Polyhedron*>(to_nonconst(ph_bounded))); + return 0; +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `int ppl_@CLASS@_wrap_assign diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4 index 4d9f379..6eadb9e 100644 --- a/interfaces/C/ppl_interface_generator_c_h_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_h_code.m4 @@ -94,6 +94,29 @@ PPL_PROTO((ppl_const_@CLASS@_t pset_before, ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ +PPL_PROTO((ppl_const_@CLASS@_t pset, + ppl_Polyhedron_t ph_decreasing, + ppl_Polyhedron_t ph_bounded)); + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 +PPL_PROTO((ppl_const_@CLASS@_t pset_before, + ppl_const_@CLASS@_t pset_after, + ppl_Polyhedron_t ph_decreasing, + ppl_Polyhedron_t ph_bounded)); + +') + m4_define(`ppl_@CLASS@_linear_@PARTITION@_code', `dnl /*! \relates ppl_@CLASS@_tag */

1 0

[GIT] ppl/ppl(master): Fixed problem with PIP_Problem constructor from a sequence of
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 332b5c15d91382bba60d1e8bbe15e4ca89af2da4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=332b5c15d913… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 20:19:10 2010 +0100 Fixed problem with PIP_Problem constructor from a sequence of constraints. Added code for testing this. As there is no need for the class Constraint_System_Iterator, Constraint_System_Iterator.java is removed. --- interfaces/Java/jni/ppl_java_globals.cc | 168 ++++---------------- .../Constraint_System_Iterator.java | 60 ------- .../Java/parma_polyhedra_library/Makefile.am | 4 - .../Java/parma_polyhedra_library/PIP_Problem.java | 14 +- interfaces/Java/tests/PIP_Problem_test1.java | 20 +++ 5 files changed, 54 insertions(+), 212 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=332b5c15…

1 0

[GIT] ppl/ppl(master): Some tests for some of the new PIP_Problem methods added.
by Patricia Hill 30 Mar '10

30 Mar '10

Module: ppl/ppl Branch: master Commit: 2f02e4d79ecdcef883129e68f71545fa82020ee7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f02e4d79ecd… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Tue Mar 30 17:41:39 2010 +0100 Some tests for some of the new PIP_Problem methods added. Various bugs fixed. --- interfaces/Java/jni/ppl_java_common.cc | 2 +- interfaces/Java/jni/ppl_java_globals.cc | 42 ++++- .../Constraint_System_Iterator.java | 3 + .../Java/parma_polyhedra_library/PIP_Problem.java | 13 +- interfaces/Java/tests/Makefile.am | 3 + interfaces/Java/tests/PIP_Problem_test1.java | 211 ++++++++++++++++++++ 6 files changed, 264 insertions(+), 10 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2f02e4d7…

1 0