April 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Started caching jclass objects using JNI global references.
by Enea Zaffanella 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: 79dac5cc0b03dec162bdcca40e01828a52371765 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=79dac5cc0b03… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Apr 25 16:34:17 2009 +0200 Started caching jclass objects using JNI global references. Cached other method IDs and optimized helper function build_linear_expression by introducing a new constructor for Linear_Expression_Times. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 21 +- interfaces/Java/jni/ppl_java_common.cc | 305 +++++++++----------- interfaces/Java/jni/ppl_java_common.defs.hh | 69 +++++ interfaces/Java/jni/ppl_java_common.inlines.hh | 81 ++---- interfaces/Java/jni/ppl_java_globals.cc | 127 ++++++--- .../parma_polyhedra_library/Complexity_Class.java | 7 +- .../Degenerate_Element.java | 7 +- .../Linear_Expression_Times.java | 6 + .../Java/parma_polyhedra_library/Makefile.am | 10 +- .../parma_polyhedra_library/Variables_Set.java | 5 + 10 files changed, 359 insertions(+), 279 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=79dac5cc…

1 0

[GIT] ppl/ppl(master): Use the macros OCAMLC, OCAMLOPT and OCAMLLIB.
by Roberto Bagnara 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: 252f8ae1ac62d5d64e22986dacd4cac87b9bb012 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=252f8ae1ac62… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 25 14:49:22 2009 +0200 Use the macros OCAMLC, OCAMLOPT and OCAMLLIB. --- configure.ac | 4 +--- interfaces/OCaml/Makefile.am | 4 +--- interfaces/OCaml/tests/Makefile.am | 12 ++++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 6499ffd..ddcf68c 100644 --- a/configure.ac +++ b/configure.ac @@ -1004,10 +1004,9 @@ then AC_PROG_OCAML if test x"$OCAMLC" != xno then - ocamlc_root=`${OCAMLC} -where` # Check for the bytecode version of ML GMP. AC_MSG_CHECKING([for ML GMP bytecode module gmp.cma]) - if ( test ${mlgmp_dir} = +gmp && test -f ${ocamlc_root}/gmp/gmp.cma ) \ + if ( test ${mlgmp_dir} = +gmp && test -f ${OCAMLLIB}/gmp/gmp.cma ) \ || test -f ${mlgmp_dir}/gmp.cma; then AC_MSG_RESULT(yes) @@ -1513,7 +1512,6 @@ AC_SUBST(required_instantiations_java_cxx_objects) AC_SUBST(required_instantiations_ocaml_cxx_headers) AC_SUBST(required_instantiations_ocaml_cxx_sources) AC_SUBST(required_instantiations_ocaml_cxx_objects) -AC_SUBST(ocamlc_root) AC_SUBST(mlgmp_dir) AC_CONFIG_FILES(Makefile diff --git a/interfaces/OCaml/Makefile.am b/interfaces/OCaml/Makefile.am index 8237afa..af9d893 100644 --- a/interfaces/OCaml/Makefile.am +++ b/interfaces/OCaml/Makefile.am @@ -171,14 +171,12 @@ OCAMLC_COMPILE_FLAGS = \ OCAMLC_LINK_FLAGS = \ `echo " $(extra_libraries) " | $(SED) -e "s/ -R[^ ]*//g" -e "s/ -/ -cclib -/g"` -OCAMLC_ROOT = @ocamlc_root@ - OCAMLOPT_ENV = $(OCAMLC_ENV) OCAMLOPT_COMPILE_FLAGS = $(OCAMLC_COMPILE_FLAGS) OCAMLOPT_LINK_FLAGS = $(OCAMLC_LINK_FLAGS) AM_CPPFLAGS = \ --I$(OCAMLC_ROOT) \ +-I$(OCAMLLIB) \ -I$(top_srcdir)/interfaces \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index e481093..89b5c46 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -96,10 +96,10 @@ PWL_DLOPEN = -dlopen ../../../Watchdog/src/libpwl.la endif BUILD_WATCHDOG_LIBRARY .ml.cmo: - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< .ml.cmx: - $(OCAMLOPT_ENV) ocamlopt -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) $< + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) $< if HAVE_OCAMLC @@ -124,7 +124,7 @@ check_PROGRAMS = $(TESTS) test1_SOURCES = test1.ml test1$(EXEEXT): test1.cmo ../ppl_ocaml.cma - $(OCAMLC_ENV) ocamlc -o $@ \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ \ -cc "$(CXX)" $(OCAMLC_COMPILE_FLAGS) \ $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ ppl_ocaml.cma $< @@ -132,7 +132,7 @@ test1$(EXEEXT): test1.cmo ../ppl_ocaml.cma test1_opt_SOURCES = test1.ml test1_opt$(EXEEXT): test1.cmx ../ppl_ocaml.cmxa - $(OCAMLOPT_ENV) ocamlopt -o $@ \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $< @@ -150,14 +150,14 @@ ppl_ocaml_generated_test.ml: $(interface_generator_dependencies) ppl_ocaml_generated_test$(EXEEXT): \ ppl_ocaml_generated_test.cmo ../ppl_ocaml.cma - $(OCAMLC_ENV) ocamlc -o $@ \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ \ -cc "$(CXX)" $(OCAMLC_COMPILE_FLAGS) \ $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ ppl_ocaml.cma $< ppl_ocaml_generated_test_opt$(EXEEXT): \ ppl_ocaml_generated_test.cmx ../ppl_ocaml.cmxa - $(OCAMLOPT_ENV) ocamlopt -o $@ \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLOPT_LINK_FLAGS) \ ppl_ocaml.cmxa $<

1 0

[GIT] ppl/ppl(master): One obsolete item removed. Other items partially scheduled.
by Roberto Bagnara 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: 9037c88e5adb824dc896eeb3f65d7167d1536063 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9037c88e5adb… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 25 14:48:38 2009 +0200 One obsolete item removed. Other items partially scheduled. --- TODO | 63 +++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 33 insertions(+), 30 deletions(-) diff --git a/TODO b/TODO index 97a262f..c57a6cb 100644 --- a/TODO +++ b/TODO @@ -38,21 +38,6 @@ Enhancements for PPL 0.11 or later versions of the simplex solver. - Complete the implementation of the --enable-check configure option. Explain it in README.configure. -- Make the library thread-safe. -- Find a way to let the GMP and checked-int versions of the PPL coexist - so as to allow using them in the same application. -- Provide methods computing approximations of the integer convex hull - of semantic domains for the case where we are only interested in integral - solutions (as is the case, e.g., in many program analyses). Then - cutting-plane methods (Gomory, Chvatal, ...) allow to shrink polyhedra - still not losing any integral solution. - See http://www.cs.unipr.it/ppl/Documentation/bibliography#NemhauserW88 - Check the work by Kent Andersen and Gerard Cornuejols on - reduce-and-split cuts. -- Consider the addition of "constraint-only" methods (e.g., computing - projections and upper bounds using the MIP solver). -- Consider extending the MIP solver to handle Parametric Integer - Programming. - Ensure the tests in tests/MIP_Problem/* cover every line of code in MIP_Problem.*. - Define functions rem() and remp() to compute the remainder of division @@ -92,6 +77,37 @@ Enhancements for PPL 0.11 or later versions is the one needed by users: in particular, see if it should take as an argument a generator system, instead of an abstract element. - Provide a generic implementation for the `widening with tokens'. +- Implement the extrapolation operators defined in HenzingerH95 + and HenzingerPW01. +- Implement void Polyhedron::envelope_assign(const Polyhedron& y). +- Provide support for strict inequalities in MIP problems. +- Pointset_Powerset and Partially_Reduced_Product domains: + Improve and add to the existing methods for the powerset and product domains + so that they can be subdomains of themselves and of each other; + tidy the tests directories for these domains and ensure the code + with all likely instantiations is fully tested; + add the same functionaity to the C, Java, OCaml and Prolog interfaces. +- Any_Pointset domain: check the interface for lacking or useless methods. + + +Enhancements for PPL 0.12 or later versions +=========================================== + +- Make the library thread-safe. +- Find a way to let the GMP and checked-int versions of the PPL coexist + so as to allow using them in the same application. +- Provide methods computing approximations of the integer convex hull + of semantic domains for the case where we are only interested in integral + solutions (as is the case, e.g., in many program analyses). Then + cutting-plane methods (Gomory, Chvatal, ...) allow to shrink polyhedra + still not losing any integral solution. + See http://www.cs.unipr.it/ppl/Documentation/bibliography#NemhauserW88 + Check the work by Kent Andersen and Gerard Cornuejols on + reduce-and-split cuts. +- Consider the addition of "constraint-only" methods (e.g., computing + projections and upper bounds using the MIP solver). +- Consider extending the MIP solver to handle Parametric Integer + Programming. - In the OK() methods, instead of having all those #ifndef NDEBUG, it is probably worthwhile to use a suitable defined `barf' stream that does the right thing. @@ -99,14 +115,6 @@ Enhancements for PPL 0.11 or later versions "automatically". Consider whether it is worth doing it. - Provide a single, generic implementation to replace all our status classes. -- Implement the extrapolation operators defined in HenzingerH95 - and HenzingerPW01. -- Implement void Polyhedron::envelope_assign(const Polyhedron& y). -- Provide support for strict inequalities in MIP problems. -- See whether, using the techniques described in - ftp://ftp.ifor.math.ethz.ch/pub/fukuda/reports/polyunion001120.ps.gz - we can implement bool poly_hull_assign_if_exact(PH& p, const PH& q), - temporarily in algorithms.hh, more efficiently. - Provide optimized implementations of Polyhedron::expand_dimension() Polyhedron::fold_dimensions(). - Add an implementation of Minkowski addition. Check the algorithm @@ -117,13 +125,7 @@ Enhancements for PPL 0.11 or later versions of convex polytopes. J. Symbolic Comput., 38(4):1261-1272, 2004. -- Pointset_Powerset and Partially_Reduced_Product domains: - Improve and add to the existing methods for the powerset and product domains - so that they can be subdomains of themselves and of each other; - tidy the tests directories for these domains and ensure the code - with all likely instantiations is fully tested; - add the same functionaity to the C, Java, OCaml and Prolog interfaces. -- Any_Pointset domain: check the interface for lacking or useless methods. + Efficiency Issues ================= @@ -137,6 +139,7 @@ Efficiency Issues - Provide a better implementation of computing squares in MIP_Problem's steepest-edge to avoid big numbers. + Debian packaging ================

1 0

[GIT] ppl/ppl(master): DO_TEST_F now produces a more sensible output.
by Roberto Bagnara 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: 5b72ef21ddc5a6e8f055f9e83ea6b19145c0c5fc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b72ef21ddc5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 25 14:07:17 2009 +0200 DO_TEST_F now produces a more sensible output. --- TODO | 2 - tests/ppl_test.hh | 55 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/TODO b/TODO index f8f3a63..97a262f 100644 --- a/TODO +++ b/TODO @@ -17,8 +17,6 @@ Enhancements for PPL 0.11 - Intervals are best instantiated with checked numbers with particular policies: review all the interfaced boxes, augment the testsuite, and update the documentation. -- DO_TEST_F should not cause the output "failed tests" to appear, - but "tests unexpectedly succeeded". - Reduce the number of FIXMEs to no more than 20. - Switch to the latest versions of Autoconf and Automake (in beta test at the time of writing): they provide features we have been looking diff --git a/tests/ppl_test.hh b/tests/ppl_test.hh index 4ee3370..ff7e1eb 100644 --- a/tests/ppl_test.hh +++ b/tests/ppl_test.hh @@ -59,24 +59,33 @@ catch (const std::exception& e) { \ exit(1); \ } -#define BEGIN_MAIN \ -int \ -main() try { \ - set_handlers(); \ - bool succeeded = false; \ - bool overflow = false; \ - std::list<std::string> failed_tests; +#define BEGIN_MAIN \ +int \ +main() try { \ + set_handlers(); \ + bool succeeded = false; \ + bool overflow = false; \ + std::list<std::string> failed_tests; \ + std::list<std::string> unexpectedly_succeeded_tests; #define END_MAIN \ - if (failed_tests.empty()) \ - return 0; \ - else { \ - std::cerr << "failed tests: "; \ - std::copy(failed_tests.begin(), failed_tests.end(), \ + if (!failed_tests.empty()) { \ + std::cerr << "tests failed: "; \ + std::copy(failed_tests.begin(), \ + failed_tests.end(), \ std::ostream_iterator<std::string>(std::cerr, " ")); \ std::cerr << std::endl; \ return 1; \ } \ + if (!unexpectedly_succeeded_tests.empty()) { \ + std::cerr << "tests unexpectedly succeeded: "; \ + std::copy(unexpectedly_succeeded_tests.begin(), \ + unexpectedly_succeeded_tests.end(), \ + std::ostream_iterator<std::string>(std::cerr, " ")); \ + std::cerr << std::endl; \ + return 1; \ + } \ + return 0; \ } \ catch (const std::overflow_error& e) { \ std::cerr << "arithmetic overflow (" << e.what() << ")" \ @@ -122,16 +131,18 @@ catch (const std::exception& e) { \ if (!succeeded) \ failed_tests.push_back(#test); -#define DO_TEST_F(test) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (succeeded) \ - failed_tests.push_back(#test); - -#define DO_TEST_OVERFLOW(test) \ - ANNOUNCE_TEST(test); \ - RUN_TEST(test); \ - if (succeeded || !overflow) \ +#define DO_TEST_F(test) \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (succeeded) \ + unexpectedly_succeeded_tests.push_back(#test); + +#define DO_TEST_OVERFLOW(test) \ + ANNOUNCE_TEST(test); \ + RUN_TEST(test); \ + if (succeeded) \ + unexpectedly_succeeded_tests.push_back(#test); \ + else if (!overflow) \ failed_tests.push_back(#test); #define DO_TEST_MAY_OVERFLOW_IF_INEXACT(test, shape) \

1 0

[GIT] ppl/ppl(master): Use the macros OCAMLC, OCAMLOPT and OCAMLDOC instead of hardcoded names.
by Roberto Bagnara 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: d9e719ff0f062c245a79ae8de69d94df473969df URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d9e719ff0f06… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 25 09:19:18 2009 +0200 Use the macros OCAMLC, OCAMLOPT and OCAMLDOC instead of hardcoded names. --- doc/Makefile.am | 16 ++++++++-------- interfaces/OCaml/Makefile.am | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ab02148..3e19707 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1058,7 +1058,7 @@ $(USER_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_USER)"'|' \ $< > Doxyfile.user-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.user-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli devref-ocaml-interface.latex-dir: \ @@ -1072,7 +1072,7 @@ $(DEVREF_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_OCAML_INPUT_DEVREF)"'|' \ $< > Doxyfile.devref-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli ppl-user-ocaml-interface-@VERSION@.pdf: user-ocaml-interface.latex-dir @@ -1095,7 +1095,7 @@ $(USER_OCAML_INTERFACE_STUFF) $(USER_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli ppl-devref-ocaml-interface-@VERSION@-html: \ @@ -1112,7 +1112,7 @@ $(DEVREF_OCAML_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ $(srcdir)/../interfaces/OCaml/ppl_ocaml_globals.mli # Java Language Interface Targets @@ -1392,7 +1392,7 @@ $(USER_CONFIGURED_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_USER)"'|' \ $< > Doxyfile.user-configured-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.user-configured-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ ../interfaces/OCaml/ppl_ocaml.mli devref-configured-ocaml-interface.latex-dir: \ @@ -1406,7 +1406,7 @@ $(DEVREF_CONFIGURED_OCAML_INTERFACE_STUFF) -e 's|<PPL_SED_INPUT>|'"$(SED_CONFIGURED_OCAML_INPUT_DEVREF)"'|' \ $< > Doxyfile.devref-configured-ocaml-interface-latex $(TEX_ENV) $(DOXYGEN) Doxyfile.devref-configured-ocaml-interface-latex - ocamldoc $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ + $(OCAMLDOC) $(OCAMLDOC_LATEX_OPTIONS) -o $(a)/ocamldoc.tex \ ../interfaces/OCaml/ppl_ocaml.mli ppl-user-configured-ocaml-interface-@VERSION@.pdf: \ @@ -1431,7 +1431,7 @@ $(USER_CONFIGURED_OCAML_INTERFACE_STUFF) $(USER_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(USER_CORE_HTML_DIR).tag@../$(USER_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ ../interfaces/OCaml/ppl_ocaml.mli ppl-devref-configured-ocaml-interface-@VERSION@-html: \ @@ -1448,7 +1448,7 @@ $(DEVREF_CONFIGURED_OCAML_INTERFACE_STUFF) $(DEVREF_CORE_HTML_DIR) (cd $@; $(INSTALLDOX) \ -l $(DEVREF_CORE_HTML_DIR).tag@../$(DEVREF_CORE_HTML_DIR)) mkdir $@/ocamldoc - ocamldoc $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ + $(OCAMLDOC) $(OCAMLDOC_HTML_OPTIONS) -d $@/ocamldoc \ ../interfaces/OCaml/ppl_ocaml.mli endif BUILD_OCAML_INTERFACE diff --git a/interfaces/OCaml/Makefile.am b/interfaces/OCaml/Makefile.am index fb1cfa8..8237afa 100644 --- a/interfaces/OCaml/Makefile.am +++ b/interfaces/OCaml/Makefile.am @@ -193,7 +193,7 @@ $(top_builddir)/interfaces/ppl_interface_instantiations.m4 \ $(interface_generator_files) ppl_ocaml.cma: ppl_ocaml_globals.cmo ppl_ocaml.cmo libppl_ocaml.a - $(OCAMLC_ENV) ocamlc -o $@ -a -custom \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ -a -custom \ ppl_ocaml_globals.cmo ppl_ocaml.cmo \ $(OCAMLC_COMPILE_FLAGS) -cclib -lppl_ocaml \ $(OCAMLC_LINK_FLAGS) @@ -201,7 +201,7 @@ ppl_ocaml.cma: ppl_ocaml_globals.cmo ppl_ocaml.cmo libppl_ocaml.a ppl_ocaml.cmxa: \ ppl_ocaml_globals.cmx ppl_ocaml_globals.o \ ppl_ocaml.cmx ppl_ocaml.o libppl_ocaml.a - $(OCAMLOPT_ENV) ocamlopt -o $@ -a \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -a \ ppl_ocaml_globals.cmx ppl_ocaml.cmx \ $(OCAMLOPT_COMPILE_FLAGS) -cclib -lppl_ocaml \ $(OCAMLOPT_LINK_FLAGS) @@ -213,10 +213,10 @@ ppl_ocaml.a: ppl_ocaml.cmxa fi ppl_ocaml.cmo: ppl_ocaml.ml ppl_ocaml.cmi ppl_ocaml_globals.cmi - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) ppl_ocaml.ml + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) ppl_ocaml.ml ppl_ocaml.cmx: ppl_ocaml.ml ppl_ocaml.cmi ppl_ocaml_globals.cmi - $(OCAMLOPT_ENV) ocamlopt -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ ppl_ocaml.ml ppl_ocaml.o: ppl_ocaml.cmx @@ -226,15 +226,15 @@ ppl_ocaml.o: ppl_ocaml.cmx fi ppl_ocaml.cmi: ppl_ocaml.mli - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< ppl_ocaml_globals.cmo: ppl_ocaml_globals.ml ppl_ocaml_globals.cmi - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) \ + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) \ $(srcdir)/ppl_ocaml_globals.ml ppl_ocaml_globals.cmx: \ ppl_ocaml_globals.ml ppl_ocaml_globals.cmi - $(OCAMLOPT_ENV) ocamlopt -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ + $(OCAMLOPT_ENV) $(OCAMLOPT) -o $@ -c $(OCAMLOPT_COMPILE_FLAGS) \ $(srcdir)/ppl_ocaml_globals.ml ppl_ocaml_globals.o: ppl_ocaml_globals.cmx @@ -244,7 +244,7 @@ ppl_ocaml_globals.o: ppl_ocaml_globals.cmx fi ppl_ocaml_globals.cmi: ppl_ocaml_globals.mli - $(OCAMLC_ENV) ocamlc -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< + $(OCAMLC_ENV) $(OCAMLC) -o $@ -c $(OCAMLC_COMPILE_FLAGS) $< ppl_ocaml.ml: $(interface_generator_dependencies) $(M4) --prefix-builtin -I.. -I$(srcdir) -I$(srcdir)/.. \

1 0

[GIT] ppl/ppl(master): Use the ocaml-autoconf macros for configuration of the OCaml interface.
by Roberto Bagnara 25 Apr '09

25 Apr '09

Module: ppl/ppl Branch: master Commit: df0492a0d79730e4b2efc5e61c34bf8b5d2de87b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df0492a0d797… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 25 08:34:02 2009 +0200 Use the ocaml-autoconf macros for configuration of the OCaml interface. --- TODO | 3 - configure.ac | 16 ++--- m4/ocaml.m4 | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 250 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index 6c4877d..f8f3a63 100644 --- a/TODO +++ b/TODO @@ -23,9 +23,6 @@ Enhancements for PPL 0.11 - Switch to the latest versions of Autoconf and Automake (in beta test at the time of writing): they provide features we have been looking for for years. -- Use the OCaml-Autoconf macros: https://forge.ocamlcore.org/frs/?group_id=69 - (see also - http://rwmj.wordpress.com/2009/03/31/using-autoconf-for-ocaml-projects/). - Fix the methods Box<ITV>::refine_with_constraint/s so that they perform a safe (i.e., always terminating) propagation instead of ignoring the non-interval constraints. diff --git a/configure.ac b/configure.ac index 03a740f..6499ffd 100644 --- a/configure.ac +++ b/configure.ac @@ -1000,12 +1000,11 @@ AC_ARG_WITH(mlgmp, # Checks for OCaml. if test x${ocaml_interface_enabled} = xyes then - # Check for the bytecode compiler. - AC_CHECK_PROG(OCAMLC, ocamlc, ocamlc) - ocamlc_gmp="no" - if test x"$OCAMLC" = xocamlc + # Detect which tools of the OCaml toolchain are available. + AC_PROG_OCAML + if test x"$OCAMLC" != xno then - ocamlc_root=`ocamlc -where` + ocamlc_root=`${OCAMLC} -where` # Check for the bytecode version of ML GMP. AC_MSG_CHECKING([for ML GMP bytecode module gmp.cma]) if ( test ${mlgmp_dir} = +gmp && test -f ${ocamlc_root}/gmp/gmp.cma ) \ @@ -1018,12 +1017,9 @@ then ocamlc_gmp="no" fi fi - # Check for the native compiler. - AC_CHECK_PROG(OCAMLOPT, ocamlopt, ocamlopt) - ocamlopt_gmp="no" - if test x"$OCAMLOPT" = xocamlopt + if test x"$OCAMLOPT" != xno then - ocamlopt_root=`ocamlopt -where` + ocamlopt_root=`${OCAMLOPT} -where` # Check for the native version of ML GMP. AC_MSG_CHECKING([for ML GMP native module gmp.cmxa]) if ( test ${mlgmp_dir} = +gmp && test -f ${ocamlopt_root}/gmp/gmp.cmxa ) \ diff --git a/m4/ocaml.m4 b/m4/ocaml.m4 new file mode 100644 index 0000000..87b1e3b --- /dev/null +++ b/m4/ocaml.m4 @@ -0,0 +1,244 @@ +dnl autoconf macros for OCaml +dnl +dnl Copyright (C) 2009 Richard W.M. Jones +dnl Copyright (C) 2009 Stefano Zacchiroli +dnl Copyright (C) 2000-2005 Olivier Andrieu +dnl Copyright (C) 2000-2005 Jean-Christophe Filliatre +dnl Copyright (C) 2000-2005 Georges Mariano +dnl +dnl For documentation, please read the ocaml.m4 man page. +dnl +dnl All rights reserved. +dnl +dnl Redistribution and use in source and binary forms, with or without +dnl modification, are permitted provided that the following conditions are +dnl met: +dnl +dnl * Redistributions of source code must retain the above copyright +dnl notice, this list of conditions and the following disclaimer. +dnl * Redistributions in binary form must reproduce the above copyright +dnl notice, this list of conditions and the following disclaimer in the +dnl documentation and/or other materials provided with the distribution. +dnl * The names of the contributors may not be used to endorse or promote +dnl products derived from this software without specific prior written +dnl permission. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' +dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +dnl THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +dnl PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS +dnl BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +dnl BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +dnl OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +AC_DEFUN([AC_PROG_OCAML], +[dnl + # checking for ocamlc + AC_CHECK_TOOL([OCAMLC],[ocamlc],[no]) + + if test "$OCAMLC" != "no"; then + OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|.*version* *$.*$$|\1|p'` + AC_MSG_RESULT([OCaml version is $OCAMLVERSION]) + OCAMLLIB=`$OCAMLC -where 2>/dev/null || $OCAMLC -v|tail -1|cut -d ' ' -f 4` + AC_MSG_RESULT([OCaml library path is $OCAMLLIB]) + + AC_SUBST([OCAMLVERSION]) + AC_SUBST([OCAMLLIB]) + + # checking for ocamlopt + AC_CHECK_TOOL([OCAMLOPT],[ocamlopt],[no]) + OCAMLBEST=byte + if test "$OCAMLOPT" = "no"; then + AC_MSG_WARN([Cannot find ocamlopt; bytecode compilation only.]) + else + TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version* *$.*$$|\1|p' ` + if test "$TMPVERSION" != "$OCAMLVERSION" ; then + AC_MSG_RESULT([versions differs from ocamlc; ocamlopt discarded.]) + OCAMLOPT=no + else + OCAMLBEST=opt + fi + fi + + AC_SUBST([OCAMLBEST]) + + # checking for ocamlc.opt + AC_CHECK_TOOL([OCAMLCDOTOPT],[ocamlc.opt],[no]) + if test "$OCAMLCDOTOPT" != "no"; then + TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version* *$.*$$|\1|p' ` + if test "$TMPVERSION" != "$OCAMLVERSION" ; then + AC_MSG_RESULT([versions differs from ocamlc; ocamlc.opt discarded.]) + else + OCAMLC=$OCAMLCDOTOPT + fi + fi + + # checking for ocamlopt.opt + if test "$OCAMLOPT" != "no" ; then + AC_CHECK_TOOL([OCAMLOPTDOTOPT],[ocamlopt.opt],[no]) + if test "$OCAMLOPTDOTOPT" != "no"; then + TMPVERSION=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version* *$.*$$|\1|p' ` + if test "$TMPVERSION" != "$OCAMLVERSION" ; then + AC_MSG_RESULT([version differs from ocamlc; ocamlopt.opt discarded.]) + else + OCAMLOPT=$OCAMLOPTDOTOPT + fi + fi + fi + + AC_SUBST([OCAMLOPT]) + fi + + AC_SUBST([OCAMLC]) + + # checking for ocamldep + AC_CHECK_TOOL([OCAMLDEP],[ocamldep],[no]) + + # checking for ocamlmktop + AC_CHECK_TOOL([OCAMLMKTOP],[ocamlmktop],[no]) + + # checking for ocamlmklib + AC_CHECK_TOOL([OCAMLMKLIB],[ocamlmklib],[no]) + + # checking for ocamldoc + AC_CHECK_TOOL([OCAMLDOC],[ocamldoc],[no]) + + # checking for ocamlbuild + AC_CHECK_TOOL([OCAMLBUILD],[ocamlbuild],[no]) +]) + + +AC_DEFUN([AC_PROG_OCAMLLEX], +[dnl + # checking for ocamllex + AC_CHECK_TOOL([OCAMLLEX],[ocamllex],[no]) + if test "$OCAMLLEX" != "no"; then + AC_CHECK_TOOL([OCAMLLEXDOTOPT],[ocamllex.opt],[no]) + if test "$OCAMLLEXDOTOPT" != "no"; then + OCAMLLEX=$OCAMLLEXDOTOPT + fi + fi + AC_SUBST([OCAMLLEX]) +]) + +AC_DEFUN([AC_PROG_OCAMLYACC], +[dnl + AC_CHECK_TOOL([OCAMLYACC],[ocamlyacc],[no]) + AC_SUBST([OCAMLYACC]) +]) + + +AC_DEFUN([AC_PROG_CAMLP4], +[dnl + AC_REQUIRE([AC_PROG_OCAML])dnl + + # checking for camlp4 + AC_CHECK_TOOL([CAMLP4],[camlp4],[no]) + if test "$CAMLP4" != "no"; then + TMPVERSION=`$CAMLP4 -v 2>&1| sed -n -e 's|.*version *$.*$$|\1|p'` + if test "$TMPVERSION" != "$OCAMLVERSION" ; then + AC_MSG_RESULT([versions differs from ocamlc]) + CAMLP4=no + fi + fi + AC_SUBST([CAMLP4]) + + # checking for companion tools + AC_CHECK_TOOL([CAMLP4BOOT],[camlp4boot],[no]) + AC_CHECK_TOOL([CAMLP4O],[camlp4o],[no]) + AC_CHECK_TOOL([CAMLP4OF],[camlp4of],[no]) + AC_CHECK_TOOL([CAMLP4OOF],[camlp4oof],[no]) + AC_CHECK_TOOL([CAMLP4ORF],[camlp4orf],[no]) + AC_CHECK_TOOL([CAMLP4PROF],[camlp4prof],[no]) + AC_CHECK_TOOL([CAMLP4R],[camlp4r],[no]) + AC_CHECK_TOOL([CAMLP4RF],[camlp4rf],[no]) + AC_SUBST([CAMLP4BOOT]) + AC_SUBST([CAMLP4O]) + AC_SUBST([CAMLP4OF]) + AC_SUBST([CAMLP4OOF]) + AC_SUBST([CAMLP4ORF]) + AC_SUBST([CAMLP4PROF]) + AC_SUBST([CAMLP4R]) + AC_SUBST([CAMLP4RF]) +]) + + +AC_DEFUN([AC_PROG_FINDLIB], +[dnl + AC_REQUIRE([AC_PROG_OCAML])dnl + + # checking for ocamlfind + AC_CHECK_TOOL([OCAMLFIND],[ocamlfind],[no]) + AC_SUBST([OCAMLFIND]) +]) + + +dnl Thanks to Jim Meyering for working this next bit out for us. +dnl XXX We should define AS_TR_SH if it's not defined already +dnl (eg. for old autoconf). +AC_DEFUN([AC_CHECK_OCAML_PKG], +[dnl + AC_REQUIRE([AC_PROG_FINDLIB])dnl + + AC_MSG_CHECKING([for OCaml findlib package $1]) + + unset found + unset pkg + found=no + for pkg in $1 $2 ; do + if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then + AC_MSG_RESULT([found]) + AS_TR_SH([OCAML_PKG_$1])=$pkg + found=yes + break + fi + done + if test "$found" = "no" ; then + AC_MSG_RESULT([not found]) + AS_TR_SH([OCAML_PKG_$1])=no + fi + + AC_SUBST(AS_TR_SH([OCAML_PKG_$1])) +]) + + +AC_DEFUN([AC_CHECK_OCAML_MODULE], +[dnl + AC_MSG_CHECKING([for OCaml module $2]) + + cat > conftest.ml <<EOF +open $3 +EOF + unset found + for $1 in $$1 $4 ; do + if $OCAMLC -c -I "$$1" conftest.ml >&5 2>&5 ; then + found=yes + break + fi + done + + if test "$found" ; then + AC_MSG_RESULT([$$1]) + else + AC_MSG_RESULT([not found]) + $1=no + fi + AC_SUBST([$1]) +]) + + +dnl XXX Cross-compiling +AC_DEFUN([AC_CHECK_OCAML_WORD_SIZE], +[dnl + AC_MSG_CHECKING([for OCaml compiler word size]) + cat > conftest.ml <<EOF + print_endline (string_of_int Sys.word_size) + EOF + OCAML_WORD_SIZE=`ocaml conftest.ml` + AC_MSG_RESULT([$OCAML_WORD_SIZE]) + AC_SUBST([OCAML_WORD_SIZE]) +])

1 0

[GIT] ppl/ppl(master): Improved jni helper functions set_coefficient, set_generator, set_by_reference.
by Enea Zaffanella 24 Apr '09

24 Apr '09

Module: ppl/ppl Branch: master Commit: 661fc6e75fa6a63230e5f366bb00c4ad9d74ad9a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=661fc6e75fa6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 24 21:51:31 2009 +0200 Improved jni helper functions set_coefficient, set_generator, set_by_reference. Cached anther few Java method IDs. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 14 +- interfaces/Java/jni/ppl_java_common.cc | 214 ++++++-------------- interfaces/Java/jni/ppl_java_common.defs.hh | 38 ++-- interfaces/Java/jni/ppl_java_common.inlines.hh | 33 +++- interfaces/Java/jni/ppl_java_globals.cc | 70 +++++-- .../Java/parma_polyhedra_library/Coefficient.java | 4 - .../Java/parma_polyhedra_library/Generator.java | 7 - 7 files changed, 163 insertions(+), 217 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=661fc6e7…

1 0

[GIT] ppl/ppl(master): In Java, avoid useless repeated copies in Coefficient and Linear_Expression.
by Enea Zaffanella 24 Apr '09

24 Apr '09

Module: ppl/ppl Branch: master Commit: 81e816d83312c7ca68c455f663d4e31a82bb08a2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81e816d83312… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 24 19:57:52 2009 +0200 In Java, avoid useless repeated copies in Coefficient and Linear_Expression. --- .../Java/parma_polyhedra_library/Coefficient.java | 10 +++++----- .../Java/parma_polyhedra_library/Constraint.java | 2 +- .../Java/parma_polyhedra_library/Generator.java | 8 +++----- .../Linear_Expression_Coefficient.java | 2 +- .../Linear_Expression_Difference.java | 2 +- .../Linear_Expression_Sum.java | 2 +- .../Linear_Expression_Times.java | 5 ++--- .../Linear_Expression_Unary_Minus.java | 2 +- .../Linear_Expression_Variable.java | 2 +- 9 files changed, 16 insertions(+), 19 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Coefficient.java b/interfaces/Java/parma_polyhedra_library/Coefficient.java index ce60db0..d70bb63 100644 --- a/interfaces/Java/parma_polyhedra_library/Coefficient.java +++ b/interfaces/Java/parma_polyhedra_library/Coefficient.java @@ -35,14 +35,14 @@ public class Coefficient { //! Holds the value of \p this. private BigInteger value; - //! Builds a coefficient values \p i. + //! Builds a coefficient valued \p i. public Coefficient(int i) { - value = new BigInteger(Integer.toString(i)); + value = BigInteger.valueOf(i); } //! Builds a coefficient valued \p l. public Coefficient(long l) { - value = new BigInteger(Long.toString(l)); + value = BigInteger.valueOf(l); } //! Builds a coefficient valued \p bi. @@ -61,7 +61,7 @@ public class Coefficient { //! Builds a copy of \p c. public Coefficient(Coefficient c) { - value = new BigInteger(c.value.toString()); + value = c.value; } //! Returns a String representation of \p this. @@ -75,7 +75,7 @@ public class Coefficient { } private void set(Coefficient c) { - value = c.getBigInteger(); + value = c.value; } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Constraint.java b/interfaces/Java/parma_polyhedra_library/Constraint.java index cc7b2d0..42962a5 100644 --- a/interfaces/Java/parma_polyhedra_library/Constraint.java +++ b/interfaces/Java/parma_polyhedra_library/Constraint.java @@ -48,7 +48,7 @@ public class Constraint { relation symbol. */ public Constraint(Linear_Expression le1, Relation_Symbol rel_sym, - Linear_Expression le2) { + Linear_Expression le2) { lhs = le1.clone(); rhs = le2.clone(); kind = rel_sym; diff --git a/interfaces/Java/parma_polyhedra_library/Generator.java b/interfaces/Java/parma_polyhedra_library/Generator.java index 6deaa35..ad03802 100644 --- a/interfaces/Java/parma_polyhedra_library/Generator.java +++ b/interfaces/Java/parma_polyhedra_library/Generator.java @@ -60,17 +60,15 @@ public class Generator { \exception RuntimeErrorException Thrown if \p d is zero. */ - public static Generator closure_point(Linear_Expression e, - Coefficient d) { + public static Generator closure_point(Linear_Expression e, Coefficient d) { if (d.getBigInteger().equals(java.math.BigInteger.ZERO)) { Error cause = new Error("parma_polyhedra_library.Generator::" + "Generator(e, d):\n" + "the divisor can not be zero."); throw new RuntimeErrorException(cause); } - Generator g = new Generator(e, Generator_Type.CLOSURE_POINT); - g.div = d; + g.div = new Coefficient(d); return g; } @@ -98,7 +96,7 @@ public class Generator { } Generator g = new Generator(e, Generator_Type.POINT); - g.div = d; + g.div = new Coefficient(d); return g; } diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Coefficient.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Coefficient.java index 765bce3..1514572 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Coefficient.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Coefficient.java @@ -42,7 +42,7 @@ public class Linear_Expression_Coefficient //! Builds a copy of this. public Linear_Expression_Coefficient clone() { - return new Linear_Expression_Coefficient(new Coefficient(coeff)); + return new Linear_Expression_Coefficient(coeff); } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Difference.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Difference.java index c20619b..15b6102 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Difference.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Difference.java @@ -55,7 +55,7 @@ public class Linear_Expression_Difference //! Builds a copy of this. public Linear_Expression_Difference clone() { - return new Linear_Expression_Difference(lhs.clone(), rhs.clone()); + return new Linear_Expression_Difference(lhs, rhs); } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Sum.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Sum.java index 4bf7dec..558b2bf 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Sum.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Sum.java @@ -51,7 +51,7 @@ public class Linear_Expression_Sum //! Builds a copy of this. public Linear_Expression_Sum clone() { - return new Linear_Expression_Sum(lhs.clone(), rhs.clone()); + return new Linear_Expression_Sum(lhs, rhs); } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java index 6787086..872bbe8 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Times.java @@ -35,7 +35,7 @@ public class Linear_Expression_Times //! Builds an object cloning the input arguments. public Linear_Expression_Times(Linear_Expression l, Coefficient c) { - lhs = new Linear_Expression_Coefficient(new Coefficient(c)); + lhs = new Linear_Expression_Coefficient(c); rhs = l.clone(); } @@ -51,8 +51,7 @@ public class Linear_Expression_Times //! Builds a copy of this. public Linear_Expression_Times clone() { - return new Linear_Expression_Times(rhs.clone(), - new Coefficient(lhs.argument())); + return new Linear_Expression_Times(rhs, lhs.argument()); } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Unary_Minus.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Unary_Minus.java index 267c0e9..d7c3f7b 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Unary_Minus.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Unary_Minus.java @@ -42,7 +42,7 @@ public class Linear_Expression_Unary_Minus //! Builds a copy of this. public Linear_Expression_Unary_Minus clone() { - return new Linear_Expression_Unary_Minus(arg.clone()); + return new Linear_Expression_Unary_Minus(arg); } private static native void initIDs(); diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Variable.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Variable.java index 7091a86..23f6fe4 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression_Variable.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression_Variable.java @@ -41,7 +41,7 @@ extends Linear_Expression { //! Builds a copy of this. public Linear_Expression_Variable clone() { - return new Linear_Expression_Variable(new Variable(arg.id())); + return new Linear_Expression_Variable(arg); } private int var_id() {

1 0

[GIT] ppl/ppl(master): Caching other Java field/method IDs.
by Enea Zaffanella 24 Apr '09

24 Apr '09

Module: ppl/ppl Branch: master Commit: 56f8b01231e0ad8251e56a8f0c9e00cf0ebc3c75 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=56f8b01231e0… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 24 12:10:04 2009 +0200 Caching other Java field/method IDs. Also corrected a latent bug in helper function j_long_to_j_long_class. --- interfaces/Java/jni/ppl_java_common.cc | 640 +++++++------------- interfaces/Java/jni/ppl_java_common.defs.hh | 74 +++- interfaces/Java/jni/ppl_java_common.inlines.hh | 51 +- interfaces/Java/jni/ppl_java_globals.cc | 419 ++++++++++++- .../Java/parma_polyhedra_library/By_Reference.java | 4 + .../Java/parma_polyhedra_library/Congruence.java | 5 + .../parma_polyhedra_library/Congruence_System.java | 5 + .../Java/parma_polyhedra_library/Constraint.java | 5 + .../parma_polyhedra_library/Constraint_System.java | 5 + .../Java/parma_polyhedra_library/Generator.java | 13 +- .../parma_polyhedra_library/Generator_System.java | 5 + .../parma_polyhedra_library/Generator_Type.java | 7 +- .../parma_polyhedra_library/Grid_Generator.java | 35 +- .../Grid_Generator_System.java | 5 + .../Grid_Generator_Type.java | 7 +- .../Linear_Expression_Difference.java | 5 + .../Linear_Expression_Sum.java | 5 + .../Linear_Expression_Times.java | 5 + .../Linear_Expression_Unary_Minus.java | 4 + .../Linear_Expression_Variable.java | 9 + .../MIP_Problem_Status.java | 7 +- .../Java/parma_polyhedra_library/Makefile.am | 32 +- .../parma_polyhedra_library/Optimization_Mode.java | 7 +- .../Java/parma_polyhedra_library/PPL_Object.java | 5 + .../parma_polyhedra_library/Relation_Symbol.java | 7 +- .../Java/parma_polyhedra_library/Variable.java | 7 +- 26 files changed, 850 insertions(+), 523 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=56f8b012…

1 0

[GIT] ppl/ppl(master): Started caching Java field/ method IDs for jni callbacks.
by Enea Zaffanella 24 Apr '09

24 Apr '09

Module: ppl/ppl Branch: master Commit: abce61709cfc9643bd9f3e5b508006f2a457fda5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=abce61709cfc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 24 09:56:40 2009 +0200 Started caching Java field/method IDs for jni callbacks. Improved the translation from Java Coefficient to PPL Coefficient objects by providing the former with a toString method. --- interfaces/Java/jni/ppl_java_common.cc | 69 ++++++------------- interfaces/Java/jni/ppl_java_common.defs.hh | 66 ++++++++++++++++--- interfaces/Java/jni/ppl_java_common.inlines.hh | 16 +---- interfaces/Java/jni/ppl_java_globals.cc | 71 +++++++++++++++++--- .../Java/parma_polyhedra_library/Coefficient.java | 10 +++ .../parma_polyhedra_library/Linear_Expression.java | 5 ++ .../Linear_Expression_Coefficient.java | 5 ++ .../Java/parma_polyhedra_library/Makefile.am | 12 +++- .../parma_polyhedra_library/Poly_Con_Relation.java | 5 ++ .../parma_polyhedra_library/Poly_Gen_Relation.java | 5 ++ 10 files changed, 184 insertions(+), 80 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=abce6170…

1 0