March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Decided that it is not worth renaming PPL_OUTPUT_TEMPLATE_DEFINITIONS.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 82eb7cc49693a4550aa044bb8218077470142cbf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=82eb7cc49693… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 15:14:28 2009 +0200 Decided that it is not worth renaming PPL_OUTPUT_TEMPLATE_DEFINITIONS. Calling it PPL_OUTPUT_1_PARAM_TEMPLATE_DEFINITIONS would not buy us anything: FIXMEs removed. --- src/Partially_Reduced_Product.inlines.hh | 1 - src/globals.defs.hh | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/Partially_Reduced_Product.inlines.hh b/src/Partially_Reduced_Product.inlines.hh index a6f48f0..a6f209d 100644 --- a/src/Partially_Reduced_Product.inlines.hh +++ b/src/Partially_Reduced_Product.inlines.hh @@ -717,7 +717,6 @@ Partially_Reduced_Product<D1, D2, R>::set_reduced_flag() const { const_cast<Partially_Reduced_Product&>(*this).reduced = true; } -// FIXME(0.10.1): Improve this name. PPL_OUTPUT_3_PARAM_TEMPLATE_DEFINITIONS(D1, D2, R, Partially_Reduced_Product) template <typename D1, typename D2, typename R> diff --git a/src/globals.defs.hh b/src/globals.defs.hh index f2b682b..cb6ae20 100644 --- a/src/globals.defs.hh +++ b/src/globals.defs.hh @@ -201,10 +201,6 @@ struct Recycle_Input { std::cerr << *this; \ } -// FIXME(0.10.1): The class_prefix has changed from -// PPL_OUTPUT_TEMPLATE_DEFINITIONS, to work around `,'. -// Perhaps PPL_OUTPUT_TEMPLATE_DEFINITIONS should be changed to -// match this. #define PPL_OUTPUT_2_PARAM_TEMPLATE_DEFINITIONS(type_symbol1, \ type_symbol2, \ class_prefix) \ @@ -221,7 +217,6 @@ struct Recycle_Input { std::cerr << *this; \ } -// FIXME(0.10.1): Copy and edit of PPL_OUTPUT_2_PARAM_TEMPLATE_DEFINITIONS #define PPL_OUTPUT_3_PARAM_TEMPLATE_DEFINITIONS(type_symbol1, \ type_symbol2, \ type_symbol3, \

1 0

[GIT] ppl/ppl(master): Let OCaml tests also link with the pwl library, if configured.
by Enea Zaffanella 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 3a4ca18a89472ed184229e24b82b29229d86163b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a4ca18a8947… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 30 16:01:01 2009 +0200 Let OCaml tests also link with the pwl library, if configured. --- interfaces/OCaml/Makefile.am | 11 ++++++++- interfaces/OCaml/tests/Makefile.am | 22 ++++++++++++------- interfaces/OCaml/tests/test1.ml | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 9 deletions(-) diff --git a/interfaces/OCaml/Makefile.am b/interfaces/OCaml/Makefile.am index 9f88c7f..26fce87 100644 --- a/interfaces/OCaml/Makefile.am +++ b/interfaces/OCaml/Makefile.am @@ -148,8 +148,16 @@ ppl_ocaml_Constraints_Product_NNC_Polyhedron_Grid.cc \ ppl_ocaml_Constraints_Product_Grid_C_Polyhedron.cc \ ppl_ocaml_Constraints_Product_Grid_NNC_Polyhedron.cc +if BUILD_WATCHDOG_LIBRARY + +WATCHDOG_LIBRARY = $(top_builddir)/Watchdog/src/libpwl.la +WATCHDOG_INCLUDE_OPTIONS = -I$(top_builddir)/Watchdog/src + +endif BUILD_WATCHDOG_LIBRARY + libppl_ocaml_a_LIBADD = \ -@required_instantiations_ocaml_cxx_objects@ +@required_instantiations_ocaml_cxx_objects@ \ +$(WATCHDOG_LIBRARY) libppl_ocaml_a_DEPENDENCIES = \ @required_instantiations_ocaml_cxx_objects@ @@ -174,6 +182,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/interfaces \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ +$(WATCHDOG_INCLUDE_OPTIONS) \ @extra_includes@ interface_generator_dependencies = \ diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index 7892220..f6047ca 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -74,13 +74,19 @@ OCAMLOPT_LINK_FLAGS = $(OCAMLC_LINK_FLAGS) if ENABLE_SHARED -BUILT_PPL = \ -$(top_builddir)/src/.libs/libppl$(SHREXT) +BUILT_PPL_FLAGS = -cclib $(top_builddir)/src/.libs/libppl$(SHREXT) + +if BUILD_WATCHDOG_LIBRARY +BUILT_PWL_FLAGS = -cclib $(top_builddir)/Watchdog/src/.libs/libpwl$(SHREXT) +endif BUILD_WATCHDOG_LIBRARY else !ENABLE_SHARED -BUILT_PPL = \ -$(top_builddir)/src/.libs/libppl.$(LIBEXT) +BUILT_PPL_FLAGS = -cclib $(top_builddir)/src/.libs/libppl.$(LIBEXT) + +if BUILD_WATCHDOG_LIBRARY +BUILT_PWL_FLAGS = -cclib $(top_builddir)/Watchdog/src/.libs/libpwl.$(LIBEXT) +endif BUILD_WATCHDOG_LIBRARY endif !ENABLE_SHARED @@ -115,7 +121,7 @@ test1_SOURCES = test1.ml test1$(EXEEXT): test1.cmo ../ppl_ocaml.cma $(OCAMLC_ENV) ocamlc -o $@ \ -cc "$(CXX)" $(OCAMLC_COMPILE_FLAGS) \ - -cclib $(BUILT_PPL) $(OCAMLC_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ ppl_ocaml.cma $< test1_opt_SOURCES = test1.ml @@ -123,7 +129,7 @@ test1_opt_SOURCES = test1.ml test1_opt$(EXEEXT): test1.cmx ../ppl_ocaml.cmxa $(OCAMLOPT_ENV) ocamlopt -o $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - -cclib $(BUILT_PPL) $(OCAMLOPT_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ ppl_ocaml.cmxa $< @@ -141,14 +147,14 @@ ppl_ocaml_generated_test$(EXEEXT): \ ppl_ocaml_generated_test.cmo ../ppl_ocaml.cma $(OCAMLC_ENV) ocamlc -o $@ \ -cc "$(CXX)" $(OCAMLC_COMPILE_FLAGS) \ - -cclib $(BUILT_PPL) $(OCAMLC_LINK_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 $@ \ -cc "$(CXX)" $(OCAMLOPT_COMPILE_FLAGS) \ - -cclib $(BUILT_PPL) $(OCAMLOPT_LINK_FLAGS) \ + $(BUILT_PPL_FLAGS) $(BUILT_PWL_FLAGS) $(OCAMLC_LINK_FLAGS) \ ppl_ocaml.cmxa $< MOSTLYCLEANFILES = \ diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index 19caca4..3366c85 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -219,6 +219,47 @@ let congruence1 = (e2, e2 , (Z.from_int 1));; let congruences1 = [e3, e2 , (Z.from_int 20)];; let grid_generator1 = Grid_Point (e3, (Z.from_int 1));; +(* Testing timeouts *) +let lower = Coefficient(Gmp.Z.of_int 0) +in let upper = Coefficient(Gmp.Z.of_int 1) +in let rec hypercube_cs dim = + begin + if dim < 0 then [] + else + Greater_Or_Equal(Variable dim, lower) + :: Less_Or_Equal(Variable dim, upper) + :: hypercube_cs (dim-1) + end +in let rec compute_timeout_hypercube dim_in dim_out = + if dim_in < dim_out then + let ph = ppl_new_C_Polyhedron_from_constraints (hypercube_cs dim_in) + in begin +(* FIXME. + try + let () = ppl_Polyhedron_get_minimized_constraints ph; + ppl_delete_Polyhedron ph + with x -> + raise x; +*) + compute_timeout_hypercube (dim_in + 1) dim_out + end +in begin + try + ppl_set_timeout 100; + compute_timeout_hypercube 0 2; + ppl_reset_timeout; + print_string_if_noisy "ppl_reset_timeout test succeeded\n"; + with x -> + print_string_if_noisy "ppl_reset_timeout test seems to be failed!\n"; + try + ppl_set_timeout 100; + compute_timeout_hypercube 0 100; + ppl_reset_timeout; + print_string_if_noisy "ppl_set_timeout test seems to be failed!\n"; + with x -> + print_string_if_noisy "ppl_set_timeout test succeded\n"; + end;; + let mip1 = ppl_new_MIP_Problem 10 constraints1 e3 Maximization;; let objective_func = ppl_MIP_Problem_objective_function mip1;; print_string_if_noisy "\n";;

1 0

[GIT] ppl/ppl(master): Warn about the GCC bug affecting exception handling on the Alpha.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: f90f270562890d79c2da403a9531115252ed4014 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f90f27056289… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 14:51:32 2009 +0200 Warn about the GCC bug affecting exception handling on the Alpha. --- README.alpha | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/README.alpha b/README.alpha new file mode 100644 index 0000000..15ce29a --- /dev/null +++ b/README.alpha @@ -0,0 +1,16 @@ +There appears to be a bug in GCC (all versions) concerning exception +handling on the Alpha. This may be related to + + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=8966 + +Strictily speaking, the PPL uses exception handling, so if that does +not work on the Alpha, then the PPL does not work on the Alpha. And +there is nothing to do but fix the GCC bug. + +However, if that GCC bug really only affects exception handling and nothing +else, given that the PPL only uses exceptions for error reporting, we can +probably say that the PPL works on the Alpha *apart* from error reporting. +In other words, under this hypothesis (which we have no way to check), +users that are not interested in catching exceptions thrown by the PPL +(in response to invalid arguments, heap exhaustion, overflows, ...) +should probably not worry. Your mileage may vary...

1 0

[GIT] ppl/ppl(master): Consider switching to MLGMPIDL for the OCaml interface.
by Roberto Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 6e2ef07827349faf64df156406ba94473a19bb10 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6e2ef0782734… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 30 14:25:36 2009 +0200 Consider switching to MLGMPIDL for the OCaml interface. --- TODO | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index 713db37..ee2be4b 100644 --- a/TODO +++ b/TODO @@ -8,6 +8,8 @@ Enhancements for PPL 0.10.1 or later versions Enhancements for PPL 0.11 or later versions =========================================== +- Consider switching to MLGMPIDL for the OCaml interface + (see https://bugzilla.redhat.com/show_bug.cgi?id=491712). - Reconsider the datatype for the units parameter in the Watchdog constructors: should we prefer an unsigned? - Rename set_rational_sqrt_precision_parameter to

1 0

[GIT] ppl/ppl(master): Added wrap_string to java interface.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: c73b9bb132e83740420c4e1b5f5556f3ecf20fdc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c73b9bb132e8… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 13:36:40 2009 +0200 Added wrap_string to java interface. --- interfaces/Java/jni/ppl_java_globals.cc | 21 +++++++++ interfaces/Java/parma_polyhedra_library/IO.java | 47 ++++++++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 4 ++ interfaces/Java/tests/MIP_Problem_test1.java | 4 +- 4 files changed, 74 insertions(+), 2 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index d35275d..f7295f9 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -32,6 +32,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "parma_polyhedra_library_Generator_System.h" #include "parma_polyhedra_library_Grid_Generator.h" #include "parma_polyhedra_library_Grid_Generator_System.h" +#include "parma_polyhedra_library_IO.h" using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::Java; @@ -714,3 +715,23 @@ Java_parma_1polyhedra_1library_Congruence_1System_ascii_1dump CATCH_ALL; return 0; } + +JNIEXPORT jstring JNICALL +Java_parma_1polyhedra_1library_IO_wrap_1string +(JNIEnv* env, jclass, jstring str, jint indent_depth, + jint preferred_first_line_length, jint preferred_line_length) { + try { + unsigned ind = jtype_to_unsigned<unsigned int>(indent_depth); + unsigned pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length); + unsigned pll = jtype_to_unsigned<unsigned int>(preferred_line_length); + const char* chars = env->GetStringUTFChars(str, 0); + if (!chars) + return 0; + using namespace Parma_Polyhedra_Library::IO_Operators; + std::string s = wrap_string(chars, ind, pfll, pll); + env->ReleaseStringUTFChars(str, chars); + return env->NewStringUTF(s.c_str()); + } + CATCH_ALL; + return 0; +} diff --git a/interfaces/Java/parma_polyhedra_library/IO.java b/interfaces/Java/parma_polyhedra_library/IO.java new file mode 100644 index 0000000..1b83922 --- /dev/null +++ b/interfaces/Java/parma_polyhedra_library/IO.java @@ -0,0 +1,47 @@ +/* IO Java class declaration and implementation. + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +package parma_polyhedra_library; + +//! A class collecting I/O functions. +/*! \ingroup PPL_Java_interface */ +public class IO { + //! Utility function for the wrapping of lines of text. + /*! + \param str + The source string holding the lines to wrap. + + \param indent_depth + The indentation depth. + + \param preferred_first_line_length + The preferred length for the first line of text. + + \param preferred_line_length + The preferred length for all the lines but the first one. + + \return + The wrapped string. + */ + public static native String wrap_string(String str, int indent_depth, + int preferred_first_line_length, int preferred_line_length); +} diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index b3542ec..9505cb7 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -41,6 +41,7 @@ parma_polyhedra_library.Generator \ parma_polyhedra_library.Generator_System \ parma_polyhedra_library.Grid_Generator \ parma_polyhedra_library.Grid_Generator_System \ +parma_polyhedra_library.IO \ parma_polyhedra_library.Linear_Expression \ parma_polyhedra_library.MIP_Problem \ parma_polyhedra_library.Parma_Polyhedra_Library @@ -54,6 +55,7 @@ parma_polyhedra_library_Generator.h \ parma_polyhedra_library_Generator_System.h \ parma_polyhedra_library_Grid_Generator.h \ parma_polyhedra_library_Grid_Generator_System.h \ +parma_polyhedra_library_IO.h \ parma_polyhedra_library_Linear_Expression.h \ parma_polyhedra_library_MIP_Problem.h \ parma_polyhedra_library_Parma_Polyhedra_Library.h @@ -78,6 +80,7 @@ $(srcdir)/Grid_Generator.java \ $(srcdir)/Grid_Generator_System.java \ $(srcdir)/Grid_Generator_Type.java \ $(srcdir)/Invalid_Argument_Exception.java \ +$(srcdir)/IO.java \ $(srcdir)/Length_Error_Exception.java \ $(srcdir)/Linear_Expression.java \ $(srcdir)/Linear_Expression_Coefficient.java \ @@ -176,6 +179,7 @@ Grid_Generator.class \ Grid_Generator_System.class \ Grid_Generator_Type.class \ Invalid_Argument_Exception.class \ +IO.class \ Length_Error_Exception.class \ Linear_Expression.class \ Linear_Expression_Coefficient.class \ diff --git a/interfaces/Java/tests/MIP_Problem_test1.java b/interfaces/Java/tests/MIP_Problem_test1.java index f6b9515..9ff3baf 100644 --- a/interfaces/Java/tests/MIP_Problem_test1.java +++ b/interfaces/Java/tests/MIP_Problem_test1.java @@ -233,8 +233,8 @@ static { expected_ov_ph.add_constraint(c_a_geq_1); ok = (ov_ph.equals(expected_ov_ph)); - PPL_Test.println_if_noisy("Testing toString(): "); - PPL_Test.println_if_noisy(mip1.toString()); + PPL_Test.println_if_noisy("Testing toString() and wrap_string(): "); + PPL_Test.println_if_noisy(IO.wrap_string(mip1.toString(), 4, 64, 60)); PPL_Test.println_if_noisy(); PPL_Test.print_if_noisy("Testing max_space_dimension(): ");

1 0

[GIT] ppl/ppl(master): Reverted bogus commits.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 7bcea883ad54f3411ee17ec64783f7df90f26004 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7bcea883ad54… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 13:21:27 2009 +0200 Reverted bogus commits. --- interfaces/Java/jni/ppl_java_globals.cc | 21 --------- interfaces/Java/parma_polyhedra_library/IO.java | 47 -------------------- .../Java/parma_polyhedra_library/Makefile.am | 4 -- interfaces/Java/tests/MIP_Problem_test1.java | 2 +- 4 files changed, 1 insertions(+), 73 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 97e2071..d35275d 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -32,7 +32,6 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "parma_polyhedra_library_Generator_System.h" #include "parma_polyhedra_library_Grid_Generator.h" #include "parma_polyhedra_library_Grid_Generator_System.h" -#include "parma_polyhedra_library_IO.h" using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::Java; @@ -715,23 +714,3 @@ Java_parma_1polyhedra_1library_Congruence_1System_ascii_1dump CATCH_ALL; return 0; } - -JNIEXPORT jstring JNICALL -Java_parma_1polyhedra_1library_IO_wrap_1string -(JNIEnv* env, jstring str, jint indent_depth, - jint preferred_first_line_length, jint preferred_line_length) { - try { - unsigned ind = jtype_to_unsigned<unsigned int>(indent_depth); - unsigned pfll = jtype_to_unsigned<unsigned int>(preferred_first_line_length); - unsigned pll = jtype_to_unsigned<unsigned int>(preferred_line_length); - const char* chars = env->GetStringUTFChars(str, 0); - if (!chars) - return 0; - using namespace Parma_Polyhedra_Library::IO_Operators; - std::string s = wrap_string(chars, ind, pfll, pll); - env->ReleaseStringUTFChars(str, chars); - return env->NewStringUTF(s.c_str()); - } - CATCH_ALL; - return 0; -} diff --git a/interfaces/Java/parma_polyhedra_library/IO.java b/interfaces/Java/parma_polyhedra_library/IO.java deleted file mode 100644 index 1b83922..0000000 --- a/interfaces/Java/parma_polyhedra_library/IO.java +++ /dev/null @@ -1,47 +0,0 @@ -/* IO Java class declaration and implementation. - Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> - -This file is part of the Parma Polyhedra Library (PPL). - -The PPL is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or (at your -option) any later version. - -The PPL is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software Foundation, -Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. - -For the most up-to-date information see the Parma Polyhedra Library -site: http://www.cs.unipr.it/ppl/ . */ - -package parma_polyhedra_library; - -//! A class collecting I/O functions. -/*! \ingroup PPL_Java_interface */ -public class IO { - //! Utility function for the wrapping of lines of text. - /*! - \param str - The source string holding the lines to wrap. - - \param indent_depth - The indentation depth. - - \param preferred_first_line_length - The preferred length for the first line of text. - - \param preferred_line_length - The preferred length for all the lines but the first one. - - \return - The wrapped string. - */ - public static native String wrap_string(String str, int indent_depth, - int preferred_first_line_length, int preferred_line_length); -} diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 9505cb7..b3542ec 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -41,7 +41,6 @@ parma_polyhedra_library.Generator \ parma_polyhedra_library.Generator_System \ parma_polyhedra_library.Grid_Generator \ parma_polyhedra_library.Grid_Generator_System \ -parma_polyhedra_library.IO \ parma_polyhedra_library.Linear_Expression \ parma_polyhedra_library.MIP_Problem \ parma_polyhedra_library.Parma_Polyhedra_Library @@ -55,7 +54,6 @@ parma_polyhedra_library_Generator.h \ parma_polyhedra_library_Generator_System.h \ parma_polyhedra_library_Grid_Generator.h \ parma_polyhedra_library_Grid_Generator_System.h \ -parma_polyhedra_library_IO.h \ parma_polyhedra_library_Linear_Expression.h \ parma_polyhedra_library_MIP_Problem.h \ parma_polyhedra_library_Parma_Polyhedra_Library.h @@ -80,7 +78,6 @@ $(srcdir)/Grid_Generator.java \ $(srcdir)/Grid_Generator_System.java \ $(srcdir)/Grid_Generator_Type.java \ $(srcdir)/Invalid_Argument_Exception.java \ -$(srcdir)/IO.java \ $(srcdir)/Length_Error_Exception.java \ $(srcdir)/Linear_Expression.java \ $(srcdir)/Linear_Expression_Coefficient.java \ @@ -179,7 +176,6 @@ Grid_Generator.class \ Grid_Generator_System.class \ Grid_Generator_Type.class \ Invalid_Argument_Exception.class \ -IO.class \ Length_Error_Exception.class \ Linear_Expression.class \ Linear_Expression_Coefficient.class \ diff --git a/interfaces/Java/tests/MIP_Problem_test1.java b/interfaces/Java/tests/MIP_Problem_test1.java index ff5b9f8..f6b9515 100644 --- a/interfaces/Java/tests/MIP_Problem_test1.java +++ b/interfaces/Java/tests/MIP_Problem_test1.java @@ -234,7 +234,7 @@ static { ok = (ov_ph.equals(expected_ov_ph)); PPL_Test.println_if_noisy("Testing toString(): "); - PPL_Test.println_if_noisy(IO.wrap_string(mip1.toString(), 4, 64, 60)); + PPL_Test.println_if_noisy(mip1.toString()); PPL_Test.println_if_noisy(); PPL_Test.print_if_noisy("Testing max_space_dimension(): ");

1 0

[GIT] ppl/ppl(master): Added file.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 16ac5d178e70c96c151c4e5fe367c9ea5e333ddb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=16ac5d178e70… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 13:15:23 2009 +0200 Added file. --- interfaces/Java/jni/ppl_java_globals.cc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 2da6a8c..97e2071 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -32,6 +32,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "parma_polyhedra_library_Generator_System.h" #include "parma_polyhedra_library_Grid_Generator.h" #include "parma_polyhedra_library_Grid_Generator_System.h" +#include "parma_polyhedra_library_IO.h" using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::Java;

1 0

[GIT] ppl/ppl(master): Added file.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: a4fe353e3680d456ec6ab4d83a03b5eda1c35321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4fe353e3680… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 13:11:35 2009 +0200 Added file. --- .../Java/parma_polyhedra_library/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index d99df5f..9505cb7 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -41,6 +41,7 @@ parma_polyhedra_library.Generator \ parma_polyhedra_library.Generator_System \ parma_polyhedra_library.Grid_Generator \ parma_polyhedra_library.Grid_Generator_System \ +parma_polyhedra_library.IO \ parma_polyhedra_library.Linear_Expression \ parma_polyhedra_library.MIP_Problem \ parma_polyhedra_library.Parma_Polyhedra_Library @@ -54,6 +55,7 @@ parma_polyhedra_library_Generator.h \ parma_polyhedra_library_Generator_System.h \ parma_polyhedra_library_Grid_Generator.h \ parma_polyhedra_library_Grid_Generator_System.h \ +parma_polyhedra_library_IO.h \ parma_polyhedra_library_Linear_Expression.h \ parma_polyhedra_library_MIP_Problem.h \ parma_polyhedra_library_Parma_Polyhedra_Library.h

1 0

[GIT] ppl/ppl(master): Added test.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: 9c437b89916221bb957014a7d2d55055a3d020a3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c437b899162… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 12:32:15 2009 +0200 Added test. --- interfaces/Java/tests/MIP_Problem_test1.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/tests/MIP_Problem_test1.java b/interfaces/Java/tests/MIP_Problem_test1.java index f6b9515..ff5b9f8 100644 --- a/interfaces/Java/tests/MIP_Problem_test1.java +++ b/interfaces/Java/tests/MIP_Problem_test1.java @@ -234,7 +234,7 @@ static { ok = (ov_ph.equals(expected_ov_ph)); PPL_Test.println_if_noisy("Testing toString(): "); - PPL_Test.println_if_noisy(mip1.toString()); + PPL_Test.println_if_noisy(IO.wrap_string(mip1.toString(), 4, 64, 60)); PPL_Test.println_if_noisy(); PPL_Test.print_if_noisy("Testing max_space_dimension(): ");

1 0

[GIT] ppl/ppl(master): Added java.
by Abramo Bagnara 30 Mar '09

30 Mar '09

Module: ppl/ppl Branch: master Commit: e3bdb6dc94f23b59c60d66653141a2824a2b1597 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e3bdb6dc94f2… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 30 12:27:48 2009 +0200 Added java. --- interfaces/Java/parma_polyhedra_library/IO.java | 47 ++++++++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 2 + 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/IO.java b/interfaces/Java/parma_polyhedra_library/IO.java new file mode 100644 index 0000000..1b83922 --- /dev/null +++ b/interfaces/Java/parma_polyhedra_library/IO.java @@ -0,0 +1,47 @@ +/* IO Java class declaration and implementation. + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +package parma_polyhedra_library; + +//! A class collecting I/O functions. +/*! \ingroup PPL_Java_interface */ +public class IO { + //! Utility function for the wrapping of lines of text. + /*! + \param str + The source string holding the lines to wrap. + + \param indent_depth + The indentation depth. + + \param preferred_first_line_length + The preferred length for the first line of text. + + \param preferred_line_length + The preferred length for all the lines but the first one. + + \return + The wrapped string. + */ + public static native String wrap_string(String str, int indent_depth, + int preferred_first_line_length, int preferred_line_length); +} diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index b3542ec..d99df5f 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -78,6 +78,7 @@ $(srcdir)/Grid_Generator.java \ $(srcdir)/Grid_Generator_System.java \ $(srcdir)/Grid_Generator_Type.java \ $(srcdir)/Invalid_Argument_Exception.java \ +$(srcdir)/IO.java \ $(srcdir)/Length_Error_Exception.java \ $(srcdir)/Linear_Expression.java \ $(srcdir)/Linear_Expression_Coefficient.java \ @@ -176,6 +177,7 @@ Grid_Generator.class \ Grid_Generator_System.class \ Grid_Generator_Type.class \ Invalid_Argument_Exception.class \ +IO.class \ Length_Error_Exception.class \ Linear_Expression.class \ Linear_Expression_Coefficient.class \

1 0