May 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added missing full stops.
by Roberto Bagnara 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: cad1f47f089bfddbbb0df15890d04e633a466c1c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cad1f47f089b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 4 15:16:39 2009 +0200 Added missing full stops. --- src/Grid.defs.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Grid.defs.hh b/src/Grid.defs.hh index 9e69132..865827c 100644 --- a/src/Grid.defs.hh +++ b/src/Grid.defs.hh @@ -367,13 +367,13 @@ public: /*! \brief Returns true indicating that this domain has methods that - can recycle congruences + can recycle congruences. */ static bool can_recycle_congruence_systems(); /*! \brief Returns true indicating that this domain has methods that - can recycle constraints + can recycle constraints. */ static bool can_recycle_constraint_systems();

1 0

[GIT] ppl/ppl(master): Documented recent changes in the Java interface.
by Enea Zaffanella 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: 3ba2322b9b323b0c25dfb9004bfb67bc89e21fd4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3ba2322b9b32… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon May 4 13:51:56 2009 +0200 Documented recent changes in the Java interface. --- NEWS | 7 ++ interfaces/Java/README.java | 30 ++++++++-- .../Parma_Polyhedra_Library.java | 62 ++++++++++++++------ 3 files changed, 76 insertions(+), 23 deletions(-) diff --git a/NEWS b/NEWS index cc6ecb8..90125e6 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,13 @@ o When the PPL has been configured with procedure checks that the FPU can indeed be controlled and fails if that is not the case. +o The Java interface has to be explicitly initialized before use by + calling static method Parma_Polyhedra_Library.initialize_library(). + Initialization makes more explicit the exact point where PPL + floating point rounding mode is set; it also allows for the caching + of Java classes and field/method IDs, thereby reducing the overhead + of native method callbacks. + Deprecated and removed methods ------------------------------ diff --git a/interfaces/Java/README.java b/interfaces/Java/README.java index 9e2848c..e5ef557 100644 --- a/interfaces/Java/README.java +++ b/interfaces/Java/README.java @@ -17,10 +17,30 @@ by issuing a command like: $ java -classpath .:<PPL prefix>/<libdir>/ppl/ppl_java.jar My_Test -Note that the source code in My_Test.java should take care of loading -the PPL interface library, by calling `System.load' and passing the -full path of the dynamic shared object. For instance, on a Linux machine -and assuming <PPL prefix>=/usr/local/, the call will be something like: +Note that the source code in My_Test.java should take care of: - System.load("/usr/local/lib/ppl/libppl_java.so"); +a) Load the PPL interface library, by calling `System.load' and + passing the full path of the dynamic shared object. For instance, + on a Linux machine and assuming <PPL prefix>=/usr/local/, the call + will be something like: + System.load("/usr/local/lib/ppl/libppl_java.so"); + +b) Make sure that only the intended version(s) of the library has been + loaded, e.g., by calling static method + + Parma_Polyhedra_Library.version(); + +c) Starting from PPL version 0.11, before calling any other method from + other PPL package classes, initialize the Java interface by calling + the static method + + Parma_Polyhedra_Library.initialize_library(); + + When done using the library, finalize it by calling the static method + + Parma_Polyhedra_Library.finalize_library(); + + After finalization no other method of the library may be used (except + for those in class Parma_Polyhedra_Library), unless the library + is re-initialized by calling initialize_library(). diff --git a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java index 1a2b891..f12be27 100644 --- a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java +++ b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java @@ -45,6 +45,33 @@ site: http://www.cs.unipr.it/ppl/ . */ Here is a list of notes with general information and advice on the use of the Java interface. + - When the Parma Polyhedra Library is configured, it will automatically + test for the existence of the Java system (unless configuration options + are passed to disable the build of the Java interface; + see configuration option <code>--enable-interfaces</code>). + If Java is correctly installed in a standard location, things will be + arranged so that the Java interface is built and installed + (see configuration option <code>--with-java</code> if you need to + specify a non-standard location for the Java system). + + - The Java interface files are all installed in the directory + \c prefix/lib/ppl. Since this includes shared and + dynamically loaded libraries, you must make your dynamic + linker/loader aware of this fact. If you use a GNU/Linux system, + try the commands <CODE>man ld.so</CODE> and <CODE>man ldconfig</CODE> + for more information. + + - Any application using the PPL should: + - Load the PPL interface library by calling <code>System.load</code> + and passing the full path of the dynamic shared object; + - Make sure that only the intended version(s) of the library has + been loaded, e.g., by calling static method <code>version()</code> + in class \c parma_polyhedra_library.Parma_Polyhedra_Library; + - Starting from version 0.11, initialize the interface by calling + static method <code>initialize_library()</code>; + when all library work is done, finalize the interface by calling + <code>finalize_library()</code>. + - The numerical abstract domains available to the Java user as Java classes consist of the simple domains, powersets of a simple domain and products @@ -77,14 +104,10 @@ site: http://www.cs.unipr.it/ppl/ . */ - In the following, any of the above numerical abstract domains is called a PPL domain and any element of a PPL domain is called a PPL object. - - The Java interface files are all installed in the directory - \c prefix/lib/ppl. Since this includes shared and - dynamically loaded libraries, you must make your dynamic - linker/loader aware of this fact. If you use a GNU/Linux system, - try the commands <CODE>man ld.so</CODE> and <CODE>man ldconfig</CODE> - for more information. + - A Java program can create a new object for a PPL domain by using the constructors for the class corresponding to the domain. + - For a PPL object with space dimension \p k, the identifiers used for the PPL variables must lie between 0 and \f$k-1\f$ and correspond to the indices of the @@ -96,22 +119,13 @@ site: http://www.cs.unipr.it/ppl/ . */ should follow all the (space) dimension-compatibility rules stated in Section \extref{representation, Representations of Convex Polyhedra} of the main PPL user manual. + - As explained above, a polyhedron has a fixed topology C or NNC, that is determined at the time of its initialization. All subsequent operations on the polyhedron must respect all the topological compatibility rules stated in Section \extref{representation, Representations of Convex Polyhedra} of the main PPL user manual. - - Any application using the PPL should make sure that only the - intended version(s) of the library are ever used. - - When the Parma Polyhedra Library is configured, it will automatically - test for the existence of the Java system (unless configuration options - are passed to disable the build of the Java interface; - see configuration option <code>--enable-interfaces</code>). - If Java is correctly installed in a standard location, things will be - arranged so that the Java interface is built and installed - (see configuration option <code>--with-java</code> if you need to - specify a non-standard location for the Java system). */ /* \mainpage */ @@ -130,10 +144,22 @@ public class Parma_Polyhedra_Library { //! \name Library initialization and finalization //@{ - //! Initializes the library. + /*! \brief + Initializes the Parma Polyhedra Library. + + This method must be called after loading the library and + before calling any other method from any other PPL package class. + */ public static native void initialize_library(); - //! Finalizes the library. + /*! \brief + Finalizes the Parma Polyhedra Library. + + This method must be called when work with the library is done. + After finalization, no other library method can be called + (except those in class Parma_Polyhedra_Library), unless the library + is re-initialized by calling <code>initialize_library()</code>. + */ public static native void finalize_library(); //@} // Library initialization and finalization

1 0

[GIT] ppl/ppl(master): Removed obsolete comments about minimization.
by Roberto Bagnara 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: f31f10f742cd42fe5abefa3dc780067dd13aca03 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f31f10f742cd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 4 11:46:50 2009 +0200 Removed obsolete comments about minimization. --- src/Polyhedron.defs.hh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/Polyhedron.defs.hh b/src/Polyhedron.defs.hh index 2386897..247c5fa 100644 --- a/src/Polyhedron.defs.hh +++ b/src/Polyhedron.defs.hh @@ -1004,7 +1004,6 @@ public: /*! \brief Assigns to \p *this the intersection of \p *this and \p y. - The result is not guaranteed to be minimized. \exception std::invalid_argument Thrown if \p *this and \p y are topology-incompatible or @@ -1014,7 +1013,6 @@ public: /*! \brief Assigns to \p *this the poly-hull of \p *this and \p y. - The result is not guaranteed to be minimized. \exception std::invalid_argument Thrown if \p *this and \p y are topology-incompatible or @@ -1028,7 +1026,7 @@ public: /*! \brief Assigns to \p *this the \ref Convex_Polyhedral_Difference "poly-difference" - of \p *this and \p y. The result is not guaranteed to be minimized. + of \p *this and \p y. \exception std::invalid_argument Thrown if \p *this and \p y are topology-incompatible or

1 0

[GIT] ppl/ppl(master): Fixed some comments.
by Roberto Bagnara 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: 8e981dad7a2b38028438bfffa721f53df435a99c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8e981dad7a2b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 4 11:44:41 2009 +0200 Fixed some comments. --- src/Affine_Space.defs.hh | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Affine_Space.defs.hh b/src/Affine_Space.defs.hh index 0e3ac3b..5752497 100644 --- a/src/Affine_Space.defs.hh +++ b/src/Affine_Space.defs.hh @@ -570,7 +570,8 @@ public: /*! \brief Returns \f$0\f$, if \p *this is empty; otherwise, returns - the \ref Affine_Space_Affine_Dimension "affine dimension" of \p *this. + \ref Affine_Independence_and_Affine_Dimension "affine dimension" + of \p *this. */ dimension_type affine_dimension() const; @@ -1070,11 +1071,8 @@ public: bool upper_bound_assign_if_exact(const Affine_Space& y); /*! \brief - Assigns to \p *this the \ref Affine_Space_Difference "affine space-difference" of - \p *this and \p y. - - The affine space difference between affine spaces x and y is the smallest affine space - containing all the points from x and y that are only in x. + Assigns to \p *this the \ref Convex_Polyhedral_Difference + "poly-difference" of \p *this and \p y. \exception std::invalid_argument Thrown if \p *this and \p y are dimension-incompatible. @@ -1093,10 +1091,10 @@ public: bool simplify_using_context_assign(const Affine_Space& y); /*! \brief - Assigns to \p *this the \ref Affine_Space_Affine_Transformation - "affine image" of \p - *this under the function mapping variable \p var to the affine - expression specified by \p expr and \p denominator. + Assigns to \p *this the + \ref Single_Update_Affine_Functions "affine image" + of \p *this under the function mapping variable \p var to the + affine expression specified by \p expr and \p denominator. \param var The variable to which the affine expression is assigned;

1 0

[GIT] ppl/ppl(master): Marked the tests that are expected to fail with 8-bit coefficients.
by Roberto Bagnara 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: ea296d657de6512f5150e2a01a17e7b0599dbb1c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ea296d657de6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon May 4 10:31:42 2009 +0200 Marked the tests that are expected to fail with 8-bit coefficients. --- tests/Polyhedron/wrap1.cc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Polyhedron/wrap1.cc b/tests/Polyhedron/wrap1.cc index d0fff88..d0d0892 100644 --- a/tests/Polyhedron/wrap1.cc +++ b/tests/Polyhedron/wrap1.cc @@ -435,17 +435,17 @@ test14() { BEGIN_MAIN DO_TEST_F16(test01); - DO_TEST(test02); - DO_TEST(test03); - DO_TEST(test04); + DO_TEST_F8(test02); + DO_TEST_F8(test03); + DO_TEST_F8(test04); DO_TEST_F16(test05); DO_TEST_F16(test06); DO_TEST_F16(test07); - DO_TEST(test08); - DO_TEST(test09); + DO_TEST_F8(test08); + DO_TEST_F8(test09); DO_TEST_F16(test10); - DO_TEST(test11); - DO_TEST(test12); + DO_TEST_F8(test11); + DO_TEST_F8(test12); DO_TEST_F16(test13); - DO_TEST(test14); + DO_TEST_F8(test14); END_MAIN

1 0

[GIT] ppl/ppl(master): Check for NaNs only when debugging.
by Roberto Bagnara 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: 7f8b88c139b3e7babdb53d586493e9239f873446 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7f8b88c139b3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun May 3 22:25:43 2009 +0200 Check for NaNs only when debugging. --- src/BD_Shape.defs.hh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 2ab5448..165f0eb 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -404,7 +404,11 @@ private: The (extended) numeric type of the inhomogeneous term of the inequalities defining a BDS. */ +#ifndef NDEBUG typedef Checked_Number<T, Extended_Number_Policy> N; +#else + typedef Checked_Number<T, WRD_Extended_Number_Policy> N; +#endif public: //! The numeric base type upon which bounded differences are built.

2 2

[GIT] ppl/ppl(master): Documented a systematic assumption about the C interface opaque pointers.
by Enea Zaffanella 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: bae7441bfe49f3edf01238bb9cf09c654903456d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bae7441bfe49… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon May 4 09:21:15 2009 +0200 Documented a systematic assumption about the C interface opaque pointers. --- interfaces/C/ppl_c_header.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 5394555..e37b0ca 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -64,6 +64,15 @@ are that (1) applications do not depend on the internals of the library (these may change from release to release), and (2) the interface invariants can be thoroughly checked (by the access functions). +\note +All functions taking as input argument an opaque pointer datatype assume +that such an argument is actually referring to a valid PPL object. +For instance, a function with an argument having type +<code>ppl_MIP_Problem_t</code> will expect a valid MIP_Problem object, +previously initialized by calling, e.g., <code>ppl_new_MIP_Problem</code>. +If that is not the case (e.g., if a null pointer is passed in), +the behavior is undefined. + The PPL's C interface is initialized by means of the <CODE>ppl_initialize</CODE> function. This function must be called before using any other interface of the library.

1 0

ppl_io_asprint_* behavior for null pointers?
by Basile STARYNKEVITCH 04 May '09

04 May '09

Hello All and Roberto & Enea. May I suggest that all the ppl_io_asprint_* C functions in ppl_c.h & libppl_c.so accept a null pointer as the PPL thing? More precisely, I was expecting char* s = 0; Polyhedron_t poly= NULL; ppl_io_asprint_Polyhedron(&s,poly); would not crash, but it does crash. I was supposing it would either leave s as it was, or fill it will a null pointer, an empty string, or eg a string like "{null polyhedron}" or just "*null*". I was not expecting it to crash. Of course, one could imagine that this does not happen. As a case in point, under Linux or GNU libc, a printf("%s\n", (char*)NULL); output (null). And I know that it "should" crash according to Posix or C standard lawyers (IIRC, it did crash under older versions of Sun Solaris). A simpler for you solution would be to document explicitly that ppl_io_asprint_Polyhedron expects a proper Polyhedron_t pointer (not a null pointer). The documentation http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-c-interface-0.10.2-h… states that int ppl_io_asprint_Polyhedron <http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-c-interface-0.10.2-h…> (char **strp, ppl_const_Polyhedron_t <http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-c-interface-0.10.2-h…> x) Prints |x| to a malloc-allocated string, a pointer to which is returned via |strp|. You could at least say: Prints |x| to a malloc-allocated string, a pointer to which is returned via |strp|. Both x and strp should be proper pointers (undefined behavior if either is nil). Selfishly, I would prefer that the documentation explicitly says for instance Prints |x| to a malloc-allocated string, a pointer to which is returned via |strp|. Does nothing if either strp or x is a nil pointer. or Prints |x| to a malloc-allocated string, a pointer to which is returned via |strp|. Does nothing if strp is nil. If x is nil, return via strp an strdup-ed string duplicating "{null polyhedron}" and of course that the function behave as documented in the bizarre case when strp or x are nil. Please accept my apologies for using your ppl_io_asprint_Polyhedron <http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-c-interface-0.10.2-h…> function in such a bizarre situation. I have the habit of initializing all my pointers to nil, and I do know (and do code) that ppl_Polyhedron_t is a pointer to some opaque structure tagged ppl_Polyhedron_tag. <http://www.cs.unipr.it/ppl/Documentation/user/ppl-user-c-interface-0.10.2-h…> BTW, I was suprized to read the tag word in this context in your documentation. for me, ppl_Polyhedron_tag is the name (not a tag) of an opaque (or private) struct-ure, not its tag : I tend to associate tags to discriminated unions, or to magic like the Tag_hd macro of <caml/mlvalues.h>. But I would expect the ppl_Polyhedron_tag identifier to stay, since the documentation mentions it! [So for me, a tag is known at runtime, while a name is for compile-time]. Still, a very big thanks for PPL. You definitely should be proud of it. Regards. PS. Totally unrelated, but you might be interested: J.Pitrat's latest book http://www.iste.co.uk/index.php?f=x&ACTION=View&id=257 "Artificial Beings - conscience of a conscious machine" ISBN: 97818482211018 explain a bit an interesting approach to constraint satisfaction problems. I enjoyed reading this book. -- Basile STARYNKEVITCH http://starynkevitch.net/Basile/ email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359 8, rue de la Faiencerie, 92340 Bourg La Reine, France *** opinions {are only mines, sont seulement les miennes} ***

2 1

[GIT] ppl/ppl(master): Fixed a couple of comments for BD and octagonal shapes.
by Enea Zaffanella 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: d6c67069f18540f2ea3cb2547810e1055a8f7872 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d6c67069f185… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon May 4 08:07:36 2009 +0200 Fixed a couple of comments for BD and octagonal shapes. When adding constraints/congruences, an exception is thrown if they cannot be accurately represented. --- src/BD_Shape.defs.hh | 17 ++++++++--------- src/Octagonal_Shape.defs.hh | 14 ++++++++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 165f0eb..d65ecfe 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -467,10 +467,7 @@ public: The BDS inherits the space dimension of \p cs. \param cs - A system of constraints: constraints that are not - \ref Bounded_Difference_Shapes "bounded differences" - are ignored (even though they may have contributed - to the space dimension). + A system of BD constraints. \exception std::invalid_argument Thrown if \p cs contains a constraint which is not optimally supported @@ -483,7 +480,11 @@ public: The BDS inherits the space dimension of \p cgs \param cgs - A system of congruences: some elements may be safely ignored. + A system of congruences. + + \exception std::invalid_argument + Thrown if \p cgs contains congruences which are not optimally + supported by the BD shape domain. */ explicit BD_Shape(const Congruence_System& cgs); @@ -839,8 +840,7 @@ public: defining \p *this. \param c - The constraint to be added. If it is not a bounded difference, it - will be simply ignored. + The constraint to be added. \exception std::invalid_argument Thrown if \p *this and constraint \p c are dimension-incompatible, @@ -865,8 +865,7 @@ public: defining \p *this. \param cs - The constraints that will be added. Constraints that are not bounded - differences will be simply ignored. + The constraints that will be added. \exception std::invalid_argument Thrown if \p *this and \p cs are dimension-incompatible, diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index 83456e9..8bdd491 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -477,13 +477,11 @@ public: The OS inherits the space dimension of \p cs. \param cs - A system of constraints: constraints that are not - \ref Octagonal_Shapes "octagonal constraints" - are ignored (even though they may have contributed - to the space dimension). + A system of octagonal constraints. \exception std::invalid_argument - Thrown if the system of constraints \p cs contains strict inequalities. + Thrown if \p cs contains a constraint which is not optimally supported + by the Octagonal shape domain. */ explicit Octagonal_Shape(const Constraint_System& cs); @@ -492,7 +490,11 @@ public: The OS inherits the space dimension of \p cgs \param cgs - A system of congruences: some elements may be safely ignored. + A system of congruences. + + \exception std::invalid_argument + Thrown if \p cgs contains a congruence which is not optimally supported + by the Octagonal shape domain. */ explicit Octagonal_Shape(const Congruence_System& cgs);

1 0

[GIT] ppl/ppl(master): Cached Java method IDs for class parma_polyhedra_library/Pair.
by Enea Zaffanella 04 May '09

04 May '09

Module: ppl/ppl Branch: master Commit: 1806a003f1aede19f069ed2884f0a133669e987b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1806a003f1ae… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon May 4 07:53:27 2009 +0200 Cached Java method IDs for class parma_polyhedra_library/Pair. --- interfaces/Java/jni/ppl_java_common.cc | 25 +++++------------ interfaces/Java/jni/ppl_java_common.defs.hh | 4 +++ interfaces/Java/jni/ppl_java_common.inlines.hh | 28 +++++++++---------- interfaces/Java/jni/ppl_java_globals.cc | 13 +++++++++ .../Java/parma_polyhedra_library/Makefile.am | 4 ++- interfaces/Java/parma_polyhedra_library/Pair.java | 5 +++ 6 files changed, 45 insertions(+), 34 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index 5e127bc..895f1a4 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -60,6 +60,7 @@ Java_Class_Cache::Java_Class_Cache() { Linear_Expression_Variable = NULL; MIP_Problem_Status = NULL; Optimization_Mode = NULL; + Pair = NULL; Poly_Con_Relation = NULL; Poly_Gen_Relation = NULL; PPL_Object = NULL; @@ -124,6 +125,7 @@ Java_Class_Cache::init_cache(JNIEnv* env) { "parma_polyhedra_library/MIP_Problem_Status"); init_cache(env, Optimization_Mode, "parma_polyhedra_library/Optimization_Mode"); + init_cache(env, Pair, "parma_polyhedra_library/Pair"); init_cache(env, Poly_Con_Relation, "parma_polyhedra_library/Poly_Con_Relation"); init_cache(env, Poly_Gen_Relation, @@ -173,6 +175,7 @@ Java_Class_Cache::clear_cache(JNIEnv* env) { clear_cache(env, Linear_Expression_Variable); clear_cache(env, MIP_Problem_Status); clear_cache(env, Optimization_Mode); + clear_cache(env, Pair); clear_cache(env, Poly_Con_Relation); clear_cache(env, Poly_Gen_Relation); clear_cache(env, PPL_Object); @@ -742,46 +745,32 @@ set_generator(JNIEnv* env, jobject dst, jobject src) { void set_pair_element(JNIEnv* env, jobject dst_pair, int arg, jobject src) { - const char* field_name; switch (arg) { case 0: - field_name = "first"; + env->SetObjectField(dst_pair, cached_FMIDs.Pair_first_ID, src); break; case 1: - field_name = "second"; + env->SetObjectField(dst_pair, cached_FMIDs.Pair_second_ID, src); break; default: assert(false); throw std::runtime_error("PPL Java interface internal error: " "pair value not allowed"); } - jclass pair_class = env->FindClass("parma_polyhedra_library/Pair"); - CHECK_RESULT_ASSERT(env, pair_class); - jfieldID fID = env->GetFieldID(pair_class, field_name, "Ljava/lang/Object;"); - CHECK_RESULT_ASSERT(env, fID); - env->SetObjectField(dst_pair, fID, src); } jobject get_pair_element(JNIEnv* env, int arg, jobject j_pair) { - const char* field_name; switch (arg) { case 0: - field_name = "first"; - break; + return env->GetObjectField(j_pair, cached_FMIDs.Pair_first_ID); case 1: - field_name = "second"; - break; + return env->GetObjectField(j_pair, cached_FMIDs.Pair_second_ID); default: assert(false); throw std::runtime_error("PPL Java interface internal error: " "pair value not allowed"); } - jclass pair_class = env->FindClass("parma_polyhedra_library/Pair"); - CHECK_RESULT_ASSERT(env, pair_class); - jfieldID fID = env->GetFieldID(pair_class, field_name, "Ljava/lang/Object;"); - CHECK_RESULT_ASSERT(env, fID); - return env->GetObjectField(j_pair, fID); } jobject diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index a3d1c6e..1d66c20 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -167,6 +167,7 @@ public: jclass Linear_Expression_Variable; jclass MIP_Problem_Status; jclass Optimization_Mode; + jclass Pair; jclass Poly_Con_Relation; jclass Poly_Gen_Relation; jclass PPL_Object; @@ -289,6 +290,9 @@ struct Java_FMID_Cache { jfieldID Optimization_Mode_MAXIMIZATION_ID; jfieldID Optimization_Mode_MINIMIZATION_ID; jmethodID Optimization_Mode_ordinal_ID; + // Pair. + jfieldID Pair_first_ID; + jfieldID Pair_second_ID; // Poly_Con_Relation and Poly_Gen_Relation. jmethodID Poly_Con_Relation_init_ID; jmethodID Poly_Gen_Relation_init_ID; diff --git a/interfaces/Java/jni/ppl_java_common.inlines.hh b/interfaces/Java/jni/ppl_java_common.inlines.hh index 3bdf57a..286d438 100644 --- a/interfaces/Java/jni/ppl_java_common.inlines.hh +++ b/interfaces/Java/jni/ppl_java_common.inlines.hh @@ -244,11 +244,10 @@ Partial_Function::Partial_Function(jobject j_p_func, JNIEnv* env) inline bool Partial_Function::has_empty_codomain() const { - jclass j_partial_function_class - = env->FindClass("parma_polyhedra_library/Partial_Function"); - CHECK_RESULT_ASSERT(env, j_partial_function_class); + jclass j_p_func_class = env->GetObjectClass(j_p_func); + CHECK_RESULT_ASSERT(env, j_p_func_class); jmethodID j_has_empty_codomain_id - = env->GetMethodID(j_partial_function_class, "has_empty_codomain", "()Z"); + = env->GetMethodID(j_p_func_class, "has_empty_codomain", "()Z"); CHECK_RESULT_ASSERT(env, j_has_empty_codomain_id); bool ret = env->CallBooleanMethod(j_p_func, j_has_empty_codomain_id); CHECK_EXCEPTION_THROW(env); @@ -257,11 +256,10 @@ Partial_Function::has_empty_codomain() const { inline dimension_type Partial_Function::max_in_codomain() const { - jclass j_partial_function_class - = env->FindClass("parma_polyhedra_library/Partial_Function"); - CHECK_RESULT_ASSERT(env, j_partial_function_class); + jclass j_p_func_class = env->GetObjectClass(j_p_func); + CHECK_RESULT_ASSERT(env, j_p_func_class); jmethodID j_max_in_codomain_id - = env->GetMethodID(j_partial_function_class, "max_in_codomain", "()J"); + = env->GetMethodID(j_p_func_class, "max_in_codomain", "()J"); CHECK_RESULT_ASSERT(env, j_max_in_codomain_id); jlong value = env->CallLongMethod(j_p_func, j_max_in_codomain_id); CHECK_EXCEPTION_THROW(env); @@ -270,21 +268,21 @@ Partial_Function::max_in_codomain() const { inline bool Partial_Function::maps(dimension_type i, dimension_type& j) const { - jclass j_partial_function_class - = env->FindClass("parma_polyhedra_library/Partial_Function"); - CHECK_RESULT_ASSERT(env, j_partial_function_class); + jclass j_p_func_class = env->GetObjectClass(j_p_func); + CHECK_RESULT_ASSERT(env, j_p_func_class); jobject coeff = j_long_to_j_long_class(env, 0); jobject new_by_ref = env->NewObject(cached_classes.By_Reference, cached_FMIDs.By_Reference_init_ID, coeff); CHECK_RESULT_THROW(env, new_by_ref); jmethodID j_maps_id - = env->GetMethodID(j_partial_function_class, "maps", - "(Ljava/lang/Long;Lparma_polyhedra_library/By_Reference;)Z"); + = env->GetMethodID(j_p_func_class, "maps", + "(Ljava/lang/Long;" + "Lparma_polyhedra_library/By_Reference;)Z"); CHECK_RESULT_ASSERT(env, j_maps_id); jboolean b = env->CallBooleanMethod(j_p_func, j_maps_id, - j_long_to_j_long_class(env, i), - new_by_ref); + j_long_to_j_long_class(env, i), + new_by_ref); CHECK_EXCEPTION_THROW(env); if (b) { jobject long_value = get_by_reference(env, new_by_ref); diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index f3f3177..e073fed 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -46,6 +46,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "parma_polyhedra_library_MIP_Problem.h" #include "parma_polyhedra_library_MIP_Problem_Status.h" #include "parma_polyhedra_library_Optimization_Mode.h" +#include "parma_polyhedra_library_Pair.h" #include "parma_polyhedra_library_Parma_Polyhedra_Library.h" #include "parma_polyhedra_library_Poly_Con_Relation.h" #include "parma_polyhedra_library_Poly_Gen_Relation.h" @@ -487,6 +488,18 @@ Java_parma_1polyhedra_1library_Optimization_1Mode_initIDs } JNIEXPORT void JNICALL +Java_parma_1polyhedra_1library_Pair_initIDs +(JNIEnv* env, jclass j_pair_class) { + jfieldID fID; + fID = env->GetFieldID(j_pair_class, "first", "Ljava/lang/Object;"); + CHECK_RESULT_ASSERT(env, fID); + cached_FMIDs.Pair_first_ID = fID; + fID = env->GetFieldID(j_pair_class, "second", "Ljava/lang/Object;"); + CHECK_RESULT_ASSERT(env, fID); + cached_FMIDs.Pair_second_ID = fID; +} + +JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_Poly_1Con_1Relation_initIDs (JNIEnv* env, jclass j_poly_con_relation_class) { jmethodID mID; diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index efe1e18..65444da 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -58,6 +58,7 @@ parma_polyhedra_library.Linear_Expression_Variable \ parma_polyhedra_library.MIP_Problem \ parma_polyhedra_library.MIP_Problem_Status \ parma_polyhedra_library.Optimization_Mode \ +parma_polyhedra_library.Pair \ parma_polyhedra_library.Parma_Polyhedra_Library \ parma_polyhedra_library.Poly_Con_Relation \ parma_polyhedra_library.Poly_Gen_Relation \ @@ -92,6 +93,7 @@ parma_polyhedra_library_Linear_Expression_Variable.h \ parma_polyhedra_library_MIP_Problem.h \ parma_polyhedra_library_MIP_Problem_Status.h \ parma_polyhedra_library_Optimization_Mode.h \ +parma_polyhedra_library_Pair.h \ parma_polyhedra_library_Parma_Polyhedra_Library.h \ parma_polyhedra_library_Poly_Con_Relation.h \ parma_polyhedra_library_Poly_Gen_Relation.h \ @@ -232,8 +234,8 @@ MIP_Problem.class \ MIP_Problem_Status.class \ Optimization_Mode.class \ Overflow_Error_Exception.class \ -Parma_Polyhedra_Library.class \ Pair.class \ +Parma_Polyhedra_Library.class \ Partial_Function.class \ Poly_Con_Relation.class \ Poly_Gen_Relation.class \ diff --git a/interfaces/Java/parma_polyhedra_library/Pair.java b/interfaces/Java/parma_polyhedra_library/Pair.java index 649d3f9..3682e37 100644 --- a/interfaces/Java/parma_polyhedra_library/Pair.java +++ b/interfaces/Java/parma_polyhedra_library/Pair.java @@ -43,4 +43,9 @@ public class Pair<K, V> { public V getSecond() { return second; } + + private static native void initIDs(); + static { + initIDs(); + } }

1 0