May 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed rounding.
by Abramo Bagnara 15 May '09

15 May '09

Module: ppl/ppl Branch: master Commit: d3d07f461687f3bd4e6f381be5b52c77eb12f938 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3d07f461687… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 14:50:43 2009 +0200 Fixed rounding. --- src/checked_int.inlines.hh | 11 ++++------- src/checked_mpz.inlines.hh | 14 +++++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/checked_int.inlines.hh b/src/checked_int.inlines.hh index fa8939b..8b9e75c 100644 --- a/src/checked_int.inlines.hh +++ b/src/checked_int.inlines.hh @@ -499,15 +499,12 @@ assign_int_float(To& to, const From from, Rounding_Dir dir) { if (CHECK_P(To_Policy::check_overflow, (from > Extended_Int<To_Policy, To>::max))) return set_pos_overflow_int<To_Policy>(to, dir); #endif - From i_from = rint(from); - to = To(i_from); if (round_not_requested(dir)) { - if (round_direct(ROUND_UP)) - return V_LE; - if (round_direct(ROUND_DOWN)) - return V_GE; + to = from; return V_LGE; } + From i_from = rint(from); + to = i_from; if (from == i_from) return V_EQ; if (round_direct(ROUND_UP)) @@ -516,7 +513,7 @@ assign_int_float(To& to, const From from, Rounding_Dir dir) { return round_gt_int<To_Policy>(to, dir); if (from < i_from) return round_lt_int<To_Policy>(to, dir); - else if (from > i_from) + if (from > i_from) return round_gt_int<To_Policy>(to, dir); } diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 0785e76..765a848 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -268,13 +268,17 @@ assign_mpz_float(mpz_class& to, const From from, Rounding_Dir dir) { to = from; return V_LGE; } - From n = rint(from); - to = n; - if (from == n) + From i_from = rint(from); + to = i_from; + if (from == i_from) return V_EQ; - if (from < 0) + if (round_direct(ROUND_UP)) return round_lt_mpz<To_Policy>(to, dir); - else + if (round_direct(ROUND_DOWN)) + return round_gt_mpz<To_Policy>(to, dir); + if (from < i_from) + return round_lt_mpz<To_Policy>(to, dir); + if (from > i_from) return round_gt_mpz<To_Policy>(to, dir); }

1 0

[GIT] ppl/ppl(master): Changed the specification of wrap_assign().
by Roberto Bagnara 15 May '09

15 May '09

Module: ppl/ppl Branch: master Commit: cf2bebf45a8c1a6b97ea2881242303f1e4532727 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cf2bebf45a8c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri May 15 14:30:05 2009 +0200 Changed the specification of wrap_assign(). If `*pcs' depends on variables not in `vars', the behavior is undefined. We perform only the quick test on space dimensions. In debugging mode we will check the condition thoroughly. --- src/BD_Shape.defs.hh | 23 +++++---- src/BD_Shape.templates.hh | 3 +- src/Octagonal_Shape.defs.hh | 23 +++++---- src/Octagonal_Shape.templates.hh | 3 +- src/Polyhedron.defs.hh | 23 +++++---- src/Polyhedron_public.cc | 6 ++- src/wrap_assign.hh | 21 +++++--- tests/Polyhedron/wrap1.cc | 102 +++++++++++++++++++++++++++++++++++--- 8 files changed, 153 insertions(+), 51 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=cf2bebf4…

1 0

[GIT] ppl/ppl(master): New commits
by Roberto Bagnara 15 May '09

15 May '09

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2cfd68c04c05… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 12:43:48 2009 +0200 Simplified a rounded assignment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b4760ed2114… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 12:30:24 2009 +0200 Permits to low level code to take benefits from knowing that result will be exact. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=68daf755d6f7… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 11:32:00 2009 +0200 Test fails with an overflow using 8 bit coefficients. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=96e74efed2e2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 10:28:35 2009 +0200 Enable DEBUG_ROUND_NOT_NEEDED when assertions are enabled. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7c0a202b6d04… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 10:29:49 2009 +0200 Two tests fail with an overflow using 8 bit coefficients. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d9773ebdcd9… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 10:09:52 2009 +0200 Improved comment for ROUND_NOT_NEEDED. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a28345ddb5a9… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Fri May 15 09:47:21 2009 +0200 Fixed DEBUG_ROUND_NOT_NEEDED.

1 0

[50984] ppl Lint Report
by noreply＠macports.org 15 May '09

15 May '09

Portfile: ppl Warning: Line 22 seems to hardcode the version number, consider using ${version} instead Error: Missing required variable: platforms

2 1

[GIT] ppl/w3ppl(master): BagnaraHZ09 will be published in Formal Methods in System Design.
by Roberto Bagnara 15 May '09

15 May '09

Module: ppl/w3ppl Branch: master Commit: 3bec1b7bd7ff798d4c9d2bda11c132bca96bf323 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=3bec1b7bd7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri May 15 08:15:23 2009 +0200 BagnaraHZ09 will be published in Formal Methods in System Design. --- htdocs/Documentation/ppl.bib | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/Documentation/ppl.bib b/htdocs/Documentation/ppl.bib index 5a52eec..cdf6073 100644 --- a/htdocs/Documentation/ppl.bib +++ b/htdocs/Documentation/ppl.bib @@ -896,12 +896,14 @@ URL = "http://www.cs.unipr.it/ppl/Documentation/BagnaraHZ09TCS.pdf" } -@Unpublished{BagnaraHZ09, +@Article{BagnaraHZ09, Author = "R. Bagnara and P. M. Hill and E. Zaffanella", Title = "Weakly-Relational Shapes for Numeric Abstractions: Improved Algorithms and Proofs of Correctness", + Journal = "Formal Methods in System Design", + Publisher = "Springer-Verlag, Berlin", Year = 2009, - Note = "Submitted for publication", + Note = "To appear.", Abstract = "Weakly-relational numeric constraints provide a compromise between complexity and expressivity that is adequate for several applications in the field of formal

1 0

[GIT] ppl/ppl(master): Let the wrap_assign tests succeed until the specification is clarified.
by Enea Zaffanella 15 May '09

15 May '09

Module: ppl/ppl Branch: master Commit: a6dcbc9846093d8289ba64acb8625f8da6020014 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a6dcbc984609… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri May 15 08:12:34 2009 +0200 Let the wrap_assign tests succeed until the specification is clarified. --- tests/Box/wrap1.cc | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tests/Box/wrap1.cc b/tests/Box/wrap1.cc index f9e757f..d2799bc 100644 --- a/tests/Box/wrap1.cc +++ b/tests/Box/wrap1.cc @@ -40,11 +40,14 @@ test01() { box.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS); + // FIXME. TBox known_result(2); known_result.refine_with_constraint(0 <= x); - known_result.refine_with_constraint(x < 256); + known_result.refine_with_constraint(x <= 255); + // known_result.refine_with_constraint(x < 256); known_result.refine_with_constraint(0 <= y); - known_result.refine_with_constraint(y < 256); + known_result.refine_with_constraint(y <= 255); + // known_result.refine_with_constraint(y < 256); bool ok = (box == known_result); @@ -73,9 +76,11 @@ test02() { box.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS, &cs); + // FIXME. TBox known_result(2); known_result.refine_with_constraint(0 <= x); - known_result.refine_with_constraint(x < 256); + known_result.refine_with_constraint(x <= 255); + // known_result.refine_with_constraint(x < 256); known_result.refine_with_constraint(0 <= y); known_result.refine_with_constraint(y <= 50); @@ -107,9 +112,12 @@ test03() { box.wrap_assign(vars, BITS_8, UNSIGNED, OVERFLOW_WRAPS, &cs); + // FIXME. TBox known_result(2); - known_result.refine_with_constraint(0 <= x); - known_result.refine_with_constraint(x < 256); + known_result.refine_with_constraint(6 <= x); + // known_result.refine_with_constraint(0 <= x); + known_result.refine_with_constraint(x <= 255); + // known_result.refine_with_constraint(x < 256); known_result.refine_with_constraint(0 <= y); known_result.refine_with_constraint(y <= 50);

1 0

[GIT] ppl/ppl(master): Added a note about the use of `assign' helper functions.
by Enea Zaffanella 15 May '09

15 May '09

Module: ppl/ppl Branch: master Commit: 331d2714c64dae5ed9fa556ea69ecc33c19b5f59 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=331d2714c64d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri May 15 08:00:30 2009 +0200 Added a note about the use of `assign' helper functions. --- src/MIP_Problem.cc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 3e6bcab..9e531f0 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -857,6 +857,14 @@ PPL::MIP_Problem::process_pending_constraints() { namespace { +// NOTE: the following two `assign' helper functions are needed to +// handle the assignment of a Coefficient to a double in method +// MIP_Problem::steepest_edge_float_entering_index(). +// We cannot use assign_r(double, Coefficient, Rounding_Dir) as it would +// lead to a compilation error on those platforms (e.g., ARM) where +// controlled floating point rounding is not available (even if the +// rounding mode would be set to ROUND_IGNORE). + inline void assign(double& d, const mpz_class& c) { d = c.get_d();

1 0

[GIT] ppl/ppl(master): When wrapping no variable, do not ignore the optional constraint system.
by Enea Zaffanella 15 May '09

15 May '09

Module: ppl/ppl Branch: master Commit: d286a5a4f475a875c6ca967d699512f5a82a726c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d286a5a4f475… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri May 15 07:46:59 2009 +0200 When wrapping no variable, do not ignore the optional constraint system. --- src/Box.templates.hh | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 3cef96e..e6117a2 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1433,9 +1433,12 @@ Box<ITV>::wrap_assign(const Variables_Set& vars, if (pcs != 0 && pcs->space_dimension() > space_dim) throw_dimension_incompatible("wrap_assign(vars, w, s, o, pcs, ...)", *pcs); - // Wrapping no variable is a no-op. - if (vars.empty()) + // Wrapping no variable only requires refining with *pcs, if any. + if (vars.empty()) { + if (pcs != 0) + pointset.refine_with_constraints(*pcs); return; + } // Dimension-compatibility check. const dimension_type vars_space_dim = vars.space_dimension();

1 0

Re: [PPL-devel] PPL Library capabilities (fwd)
by P M Hill 15 May '09

15 May '09

---------- Forwarded message ---------- Date: Wed, 13 May 2009 12:52:33 +0100 From: Vladimir Koshelev <vedun(a)ispras.ru> To: P M Hill <hill(a)comp.leeds.ac.uk> Subject: Re: [PPL-devel] PPL Library capabilities P M Hill пишет: > On Tue, 5 May 2009, Vladimir Koshelev wrote: > >> Hello. >> >> We have polyhedral representation in our research work and use your >> library(PPL) through Java interface. We have the following problem: >> >> >> >> We have matrix *A(n, m)* with *rank(A)* < *min(n, m).* >> >> Also we have system of equations *Ax = 0*. >> >> We need to find *x = Uy*, where *U* is integer upper triangular matrix, >> *x* is an integer solution of previous system and* y* is a vector of >> arbitrary integer constants. >> >> >> >> Can we solve this problem, using your library(Java interface)? We need >> only integer solutions. > > Dear Vladimir, > > Since you indicate here that you only use equalities and only require > integer solutions, the Grid domain provides almost what you want. > This domain captures any regular lattice of points that can be defined > by a set of linear congruence relations. In particular, equalities are > represented as congruences whose modulus is 0 and non-relational > congruences with modulus 1 can represent the condition that the > variables are integral. > > The congruence representation can be converted to the a (grid) > generator representation which, in the case you describe above where > the initial equalities are homogeneous, will contain the origin point > and a set of parameters whose coefficients are in a triangular form. > > The interface for Grids (for all the supported languages including > Java) is very similar to that for Polyhedra and allows for the > addition of equality constraints using add_constraint() and > add_constraints(). To specify that the variables only take integer > values, you have to add a congruence "X = 0 modulo 1" for each > variable X. > > To obtain the matrix "U", after building the grid, use > minimized_grid_generators() to obtain the grid generator system that > represents this grid where the coefficients of the parameters will > already be in triangular form. > > I include below a simple Java test that builds a grid as indicated > above from equality constraints and integer congruences and then > prints the grid generators. The point is the origin while the > coefficients of the parameters will form the matrix U. > > public static void test00() { > Variable W = new Variable(0); > Variable X = new Variable(1); > Variable Y = new Variable(2); > Variable Z = new Variable(3); > Linear_Expression le_0 > = new Linear_Expression_Coefficient(new Coefficient(0)); > Linear_Expression le_W = new Linear_Expression_Variable(W); > Linear_Expression le_X = new Linear_Expression_Variable(X); > Linear_Expression le_Y = new Linear_Expression_Variable(Y); > Linear_Expression le_Z = new Linear_Expression_Variable(Z); > Linear_Expression lhs1 > = le_W.times(new Coefficient(2)).sum(le_X).subtract(le_Z); > Linear_Expression lhs2 > = le_X.sum(le_Y).subtract(le_Z.times(new Coefficient(5))); > Grid ph = new Grid(4, Degenerate_Element.UNIVERSE); > ph.add_constraint(new Constraint(lhs1, > Relation_Symbol.EQUAL, > le_0)); > ph.add_constraint(new Constraint(lhs2, > Relation_Symbol.EQUAL, > le_0)); > ph.add_congruence(new Congruence(le_W, le_0, new Coefficient(1))); > ph.add_congruence(new Congruence(le_X, le_0, new Coefficient(1))); > ph.add_congruence(new Congruence(le_Y, le_0, new Coefficient(1))); > ph.add_congruence(new Congruence(le_Z, le_0, new Coefficient(1))); > System.out.println(ph.congruences().toString()); > System.out.println(ph.minimized_grid_generators().toString()); > } > > This will print > > 2*A + B - D = 0, B + C - 5*D = 0, A = 0 (mod 1), B = 0 (mod 1), C = 0 > (mod 1), D = 0 (mod 1) > p(0), q(A + 10*C + 2*D), q(B + 4*C + D) > > where p(0) is the origin > and q(...) are the parameters > > Therefore the matrix of coefficients of the parameters in this case is: > 1, 10, 0, 2 > 0, 1, 4, 1 > 0, 0, 0, 0 > 0, 0, 0, 0 > > I guess this is not quite the format you want but if the variables > were read in reverse order, it would be upper triangular. Otherwise a > further matrix operation would be needed to convert it to the right > format. > > This solution uses the grids. If you also need to represent > inequalities, then the grids cannot be used and the above proposal > will not help. > > All the best, > Pat Dear Pat, We need to transform matrix returned by minimized_grid_generators() to another form. To do this we want to get matrix coefficients, but current version of Java interface doesn't give access to low level Linear Expression representaion. It's will be very useful to get direct access to Linear_Expression coefficients include setting and removing. Example : If we have Linear_Expression 4 * A + 5 * B - C - 6, we want to get {4, 5, -1, -6} ( As vector or getter method or another form.) Method which can express one variable in constraint throw others will be useful too. Example : 4 * A + 6 * B - 7 * C = 0 => 4 * A = -6 * B + 7 * C

2 1

[GIT] ppl/ppl(master): Added a few missing accessor methods to Java interface classes.
by Enea Zaffanella 14 May '09

14 May '09

Module: ppl/ppl Branch: master Commit: 2fd333e0c585db16b3bf406fba0475e527ec0655 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2fd333e0c585… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu May 14 23:35:26 2009 +0200 Added a few missing accessor methods to Java interface classes. Affected classes are Congruence, Generator and Grid_Generator. --- interfaces/Java/jni/ppl_java_common.cc | 10 ++++---- interfaces/Java/jni/ppl_java_common.defs.hh | 2 +- interfaces/Java/jni/ppl_java_globals.cc | 4 +- .../Java/parma_polyhedra_library/Congruence.java | 19 +++++++++++++- .../Java/parma_polyhedra_library/Generator.java | 10 +++++++ .../parma_polyhedra_library/Grid_Generator.java | 26 ++++++++++++++++++++ 6 files changed, 61 insertions(+), 10 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 2e29806..d2b9675 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -328,14 +328,14 @@ build_java_poly_con_relation(JNIEnv* env, Poly_Con_Relation& r) { Congruence build_cxx_congruence(JNIEnv* env, jobject j_congruence) { - jobject j_modulus - = env->GetObjectField(j_congruence, cached_FMIDs.Congruence_modulus_ID); + jobject j_mod + = env->GetObjectField(j_congruence, cached_FMIDs.Congruence_mod_ID); jobject j_lhs = env->GetObjectField(j_congruence, cached_FMIDs.Congruence_lhs_ID); jobject j_rhs = env->GetObjectField(j_congruence, cached_FMIDs.Congruence_rhs_ID); PPL_DIRTY_TEMP_COEFFICIENT(ppl_modulus); - ppl_modulus = build_cxx_coeff(env, j_modulus); + ppl_modulus = build_cxx_coeff(env, j_mod); Linear_Expression lhs = build_cxx_linear_expression(env, j_lhs); Linear_Expression rhs = build_cxx_linear_expression(env, j_rhs); return (lhs %= rhs) / ppl_modulus; @@ -831,13 +831,13 @@ build_java_constraint(JNIEnv* env, const Constraint& c) { jobject build_java_congruence(JNIEnv* env, const Congruence& cg) { - jobject j_modulus = build_java_coeff(env, cg.modulus()); + jobject j_mod = build_java_coeff(env, cg.modulus()); jobject j_lhs = build_linear_expression(env, cg); jobject j_rhs = build_java_linear_expression_coefficient(env, -cg.inhomogeneous_term()); jobject ret = env->NewObject(cached_classes.Congruence, cached_FMIDs.Congruence_init_ID, - j_lhs, j_rhs, j_modulus); + j_lhs, j_rhs, j_mod); CHECK_RESULT_THROW(env, ret); return ret; } diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index 4e7020b..6c52441 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -250,7 +250,7 @@ struct Java_FMID_Cache { // Complexity_Class. jmethodID Complexity_Class_ordinal_ID; // Congruence. - jfieldID Congruence_modulus_ID; + jfieldID Congruence_mod_ID; jfieldID Congruence_lhs_ID; jfieldID Congruence_rhs_ID; jmethodID Congruence_init_ID; diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index b6cd4a5..071d4c1 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -135,10 +135,10 @@ JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Congruence_initIDs (JNIEnv* env, jclass j_congruence_class) { jfieldID fID; - fID = env->GetFieldID(j_congruence_class, "modulus", + fID = env->GetFieldID(j_congruence_class, "mod", "Lparma_polyhedra_library/Coefficient;"); CHECK_RESULT_ASSERT(env, fID); - cached_FMIDs.Congruence_modulus_ID = fID; + cached_FMIDs.Congruence_mod_ID = fID; fID = env->GetFieldID(j_congruence_class, "lhs", "Lparma_polyhedra_library/Linear_Expression;"); CHECK_RESULT_ASSERT(env, fID); diff --git a/interfaces/Java/parma_polyhedra_library/Congruence.java b/interfaces/Java/parma_polyhedra_library/Congruence.java index bb67259..b370795 100644 --- a/interfaces/Java/parma_polyhedra_library/Congruence.java +++ b/interfaces/Java/parma_polyhedra_library/Congruence.java @@ -41,7 +41,7 @@ import java.io.IOException; public class Congruence { //! The modulus of the congruence. - protected Coefficient modulus; + protected Coefficient mod; //! The value of the left hand side of \p this. Linear_Expression lhs; @@ -55,11 +55,26 @@ public class Congruence { */ public Congruence(Linear_Expression e1, Linear_Expression e2, Coefficient m) { - modulus = new Coefficient(m); + mod = new Coefficient(m); lhs = e1.clone(); rhs = e2.clone(); } + //! Returns the left hand side of \p this. + public Linear_Expression left_hand_side() { + return lhs; + } + + //! Returns the right hand side of \p this. + public Linear_Expression right_hand_side() { + return rhs; + } + + //! Returns the relation symbol of \p this. + public Coefficient modulus() { + return mod; + } + //! Returns an ascii formatted internal representation of \p this. public native String ascii_dump(); diff --git a/interfaces/Java/parma_polyhedra_library/Generator.java b/interfaces/Java/parma_polyhedra_library/Generator.java index 99a3980..a4e0f8f 100644 --- a/interfaces/Java/parma_polyhedra_library/Generator.java +++ b/interfaces/Java/parma_polyhedra_library/Generator.java @@ -110,6 +110,16 @@ public class Generator { return new Generator(e, Generator_Type.RAY); } + //! Returns the generator type. + public Generator_Type type() { + return gt; + } + + //! Returns the linear expression in \p this. + public Linear_Expression linear_expression() { + return le; + } + //! If \p this is either a point or a closure point, returns its divisor. /*! \exception RuntimeErrorException diff --git a/interfaces/Java/parma_polyhedra_library/Grid_Generator.java b/interfaces/Java/parma_polyhedra_library/Grid_Generator.java index dc5cf33..379082f 100644 --- a/interfaces/Java/parma_polyhedra_library/Grid_Generator.java +++ b/interfaces/Java/parma_polyhedra_library/Grid_Generator.java @@ -24,6 +24,7 @@ package parma_polyhedra_library; import java.io.Writer; import java.io.IOException; +import javax.management.RuntimeErrorException; //! A grid line, parameter or grid point. /*! \ingroup PPL_Java_interface @@ -84,6 +85,31 @@ public class Grid_Generator { return new Grid_Generator(e, d, Grid_Generator_Type.POINT); } + //! Returns the generator type. + public Grid_Generator_Type type() { + return gt; + } + + //! Returns the linear expression in \p this. + public Linear_Expression linear_expression() { + return le; + } + + //! If \p this is either a grid point or a parameter, returns its divisor. + /*! + \exception RuntimeErrorException + Thrown if \p this is a line. + */ + public Coefficient divisor() { + if (this.gt != Grid_Generator_Type.LINE) + return div; + Error cause = new Error("parma_polyhedra_library." + + "Grid_Generator::divisor:\n" + + "this is neither a grid point" + + " nor a parameter."); + throw new RuntimeErrorException(cause); + } + //! Returns an ascii formatted internal representation of \p this. public native String ascii_dump();

1 0