March 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed indentation.
by Abramo Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: be1e8179983eb8a99bba2014c1275183ad10a4ac URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be1e8179983e… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Mar 24 12:00:37 2009 +0100 Fixed indentation. --- interfaces/C/ppl_c_header.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 32b3340..6581b43 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -606,7 +606,7 @@ ppl_io_fprint_##Type PPL_PROTO((FILE* stream, ppl_const_##Type##_t x)); \ /*! \relates ppl_##Type##_tag \brief Prints \p x to a malloc-allocated string, a pointer to which is returned via \p strp. */ \ int \ ppl_io_asprint_##Type PPL_PROTO((char** strp, ppl_const_##Type##_t x)); \ -/*! \relates ppl_##Type##_tag \brief Print \p x to stream \p s */ \ + /*! \relates ppl_##Type##_tag \brief Print \p x to stream \p s */ \ int \ ppl_io_write_##Type PPL_PROTO((ppl_io_ostream_t s, ppl_const_##Type##_t x));

1 0

[GIT] ppl/ppl(master): Corrected bug affecting method Octagonal_Shape:: affine_image().
by Enea Zaffanella 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: d81e9642493f53fa6456d19e4ba3107bcfdf42a8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d81e9642493f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Mar 24 11:10:57 2009 +0100 Corrected bug affecting method Octagonal_Shape::affine_image(). --- src/Octagonal_Shape.templates.hh | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 812790a..8bc568e 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -4042,11 +4042,17 @@ Octagonal_Shape<T>::affine_image(const Variable var, const Row_Iterator m_begin = matrix.row_begin(); const Row_Iterator m_end = matrix.row_end(); Row_Iterator m_iter = m_begin + n_var; - N& m_v_cv = (*m_iter)[n_var+1]; + Row_Reference m_v = *m_iter; ++m_iter; - N& m_cv_v = (*m_iter)[n_var]; + Row_Reference m_cv = *m_iter; ++m_iter; - // NOTE: delay update of m_v_cv and m_cv_v. + // NOTE: delay update of unary constraints on `var'. + for (dimension_type j = n_var; j-- > 0; ) { + N& m_v_j = m_v[j]; + add_assign_r(m_v_j, m_v_j, minus_d, ROUND_UP); + N& m_cv_j = m_cv[j]; + add_assign_r(m_cv_j, m_cv_j, d, ROUND_UP); + } for ( ; m_iter != m_end; ++m_iter) { Row_Reference m_i = *m_iter; N& m_i_v = m_i[n_var]; @@ -4054,10 +4060,12 @@ Octagonal_Shape<T>::affine_image(const Variable var, N& m_i_cv = m_i[n_var+1]; add_assign_r(m_i_cv, m_i_cv, minus_d, ROUND_UP); } - // Now update m_v_cv and m_cv_v. + // Now update unary constraints on var. mul2exp_assign_r(d, d, 1, ROUND_IGNORE); + N& m_cv_v = m_cv[n_var]; add_assign_r(m_cv_v, m_cv_v, d, ROUND_UP); mul2exp_assign_r(minus_d, minus_d, 1, ROUND_IGNORE); + N& m_v_cv = m_v[n_var+1]; add_assign_r(m_v_cv, m_v_cv, minus_d, ROUND_UP); } reset_strongly_closed(); @@ -4076,23 +4084,14 @@ Octagonal_Shape<T>::affine_image(const Variable var, // Strong closure is not preserved. reset_strongly_closed(); if (b != 0) { - // Translate all the constraints on `var' adding or - // subtracting the value `b/denominator'. + // Translate the unary constraints on `var', + // adding or subtracting the value `b/denominator'. PPL_DIRTY_TEMP(N, d); div_round_up(d, b, denominator); - PPL_DIRTY_TEMP(N, minus_d); - div_round_up(minus_d, b, minus_den); - ++m_iter; - for (const Row_Iterator m_end - = matrix.row_end(); m_iter != m_end; ++m_iter) { - Row_Reference m_i = *m_iter; - N& m_i_v = m_i[n_var]; - add_assign_r(m_i_v, m_i_v, d, ROUND_UP); - N& m_i_cv = m_i[n_var+1]; - add_assign_r(m_i_cv, m_i_cv, minus_d, ROUND_UP); - } mul2exp_assign_r(d, d, 1, ROUND_IGNORE); add_assign_r(m_cv_v, m_cv_v, d, ROUND_UP); + PPL_DIRTY_TEMP(N, minus_d); + div_round_up(minus_d, b, minus_den); mul2exp_assign_r(minus_d, minus_d, 1, ROUND_IGNORE); add_assign_r(m_v_cv, m_v_cv, minus_d, ROUND_UP); }

1 0

[GIT] ppl/ppl(master): Cleaned C streams implementation.
by Abramo Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 52d75eceb14d7271a171ca824a22a8fae1dcdd24 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=52d75eceb14d… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Tue Mar 24 11:09:17 2009 +0100 Cleaned C streams implementation. --- interfaces/C/Makefile.am | 7 +- interfaces/C/ppl_c_header.h | 27 ++--- interfaces/C/ppl_c_implementation_common.cc | 1 + interfaces/C/ppl_c_implementation_common.defs.hh | 12 ++ src/c_stream.cc => interfaces/C/ppl_c_stream.cc | 45 +++----- interfaces/C/ppl_c_stream.defs.hh | 39 +++++++ interfaces/C/ppl_c_stream.h | 70 ++++++++++++ interfaces/C/ppl_c_stream.inlines.hh | 42 +++++++ interfaces/C/tests/formatted_output.c | 4 +- interfaces/C/tests/print_to_buffer.c | 34 +++--- interfaces/C/tests/print_to_buffer.h | 8 +- src/Makefile.am | 3 +- src/c_stream.h | 128 ---------------------- src/c_streambuf.inlines.hh | 2 +- src/c_streambuf_format.cc | 4 +- src/c_streambuf_format.defs.hh | 14 +-- src/c_streambuf_format.inlines.hh | 4 +- src/c_streambuf_format_settings.h | 86 +++++++++++++++ 18 files changed, 312 insertions(+), 218 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=52d75ece…

1 0

[GIT] ppl/ppl(master): Test test17() shows a bug in method Octagonal_Shape: :affine_image().
by Enea Zaffanella 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 9d1163ad3ea3657d527ee26017c41a504f677f94 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9d1163ad3ea3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Tue Mar 24 11:01:04 2009 +0100 Test test17() shows a bug in method Octagonal_Shape::affine_image(). The bug is triggered when the affine image is of the form var -> var + n and the octagonal shape has constraints relating var with another space dimension having index smaller than var. --- tests/Octagonal_Shape/affineimage1.cc | 49 +++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/tests/Octagonal_Shape/affineimage1.cc b/tests/Octagonal_Shape/affineimage1.cc index 6bdafa3..5f13405 100644 --- a/tests/Octagonal_Shape/affineimage1.cc +++ b/tests/Octagonal_Shape/affineimage1.cc @@ -448,18 +448,49 @@ test17() { oct1.add_constraint(y >= 0); oct1.add_constraint(y <= 2); - print_constraints(oct1.minimized_constraints(), "*** oct1 ***"); + print_constraints(oct1, "*** oct1 ***"); - TOctagonal_Shape oct2(oct1); - print_constraints(oct2.minimized_constraints(), "*** oct1 ***"); + oct1.affine_image(y, y + 6); - oct2.affine_image(x, x + 1); - print_constraints(oct2.minimized_constraints(), "*** oct1 ***"); + TOctagonal_Shape known_result(2); + known_result.add_constraint(x >= 0); + known_result.add_constraint(x <= 2); + known_result.add_constraint(y >= 6); + known_result.add_constraint(y <= 8); + + bool ok = (oct1 == known_result); + + print_constraints(oct1, "*** oct1.affine_image(y, y + 6) ***"); + + return ok; +} + +bool +test18() { + Variable x(0); + Variable y(1); + + TOctagonal_Shape oct1(2); + oct1.add_constraint(x >= 0); + oct1.add_constraint(x <= 2); + oct1.add_constraint(y >= 0); + oct1.add_constraint(y <= 2); + + print_constraints(oct1, "*** oct1 ***"); - oct2.affine_image(y, y + 6); - print_constraints(oct2.minimized_constraints(), "*** oct2 ***"); + oct1.affine_image(y, -y + 6); - return !oct2.is_empty(); + TOctagonal_Shape known_result(2); + known_result.add_constraint(x >= 0); + known_result.add_constraint(x <= 2); + known_result.add_constraint(y >= 4); + known_result.add_constraint(y <= 6); + + bool ok = (oct1 == known_result); + + print_constraints(oct1, "*** oct1.affine_image(y, -y + 6) ***"); + + return ok; } } // namespace @@ -481,4 +512,6 @@ BEGIN_MAIN DO_TEST(test14); DO_TEST(test15); DO_TEST(test16); + DO_TEST(test17); + DO_TEST(test18); END_MAIN

1 0

[GIT] ppl/ppl(master): Explained the `--disable-ppl_lcdd' and `--disable-ppl_lcdd' configure
by Roberto Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 61f6bc80eab3dee36ac2fd15e907a86d3633b0bf URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=61f6bc80eab3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 24 10:10:06 2009 +0100 Explained the `--disable-ppl_lcdd' and `--disable-ppl_lcdd' configure options. --- README.configure | 33 +++++++++++++++++++++++++++++++-- TODO | 2 -- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/README.configure b/README.configure index 017957e..9b97730 100644 --- a/README.configure +++ b/README.configure @@ -15,7 +15,8 @@ Contents 5. Configuring the Language Interfaces 6. Configuring for Optimized Performance 7. Configuring for Debugging -8. Using the CVS Sources +8. Programs that Come with the Library +9. Using the CVS Sources 1. The Standard Thing (configure, make, make install) @@ -401,7 +402,35 @@ In order to assess the coverage of the PPL test suite, the code to be used in conjunction with the `gcov' coverage testing tool. -8. Using the CVS Sources +8. Programs that Come with the Library +-------------------------------------- + +The PPL is shipped with two programs that are interesting per se, and +allow to sanity-check the build as well as to obtain performance +comparisons. The first such program is `ppl_lpsol', which offers some +of the functionality of GLPK's `glpsol' using the service of the +PPL, including its simplex solver. Since `ppl_lpsol' uses GLPK's +input routines, it is only built if a suitable version of GLPK is +available. If you prefer `ppl_lpsol' not to be built, use the +configure option + + --disable-ppl_lpsol + +Another program that is built by default and is used for regression +testing and build validation is `ppl_lcdd'. This is a program for +vertex/facet enumeration, accepting the same input format as the +similar programs shipped with cddlib and lrslib. If you prefer `ppl_lcdd' +not to be built, use the configure option + + --disable-ppl_lcdd + +Disabling these programs will shorten the compilation time by a few +seconds, and the time spent in `make check' by a dozen of minutes. +In exchange, you will give up an important opportunity to discover +whether the version of PPL you have built has been miscompiled. + + +9. Using the CVS Sources ------------------------ If you use the CVS sources, then you need recent versions of Autoconf diff --git a/TODO b/TODO index 49aff25..3e5ca97 100644 --- a/TODO +++ b/TODO @@ -8,8 +8,6 @@ Enhancements for PPL 0.10.1 or later versions or not, with failure or not), the latter `make check' can succeed without testing anything. - Do not enable the Prolog interfaces by default in the release tarballs. -- Explain the `--enable-ppl_lcdd' and `--enable-ppl_lpsol' in - README.configure. - Check the configuration dependent documentation for Prolog,

1 0

[GIT] ppl/ppl(master): There are no GNU Prolog packages available on ia64: disable the GNU Prolog
by Roberto Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 39fd46630c127615b91df53be047484ac4709696 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39fd46630c12… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 24 09:28:03 2009 +0100 There are no GNU Prolog packages available on ia64: disable the GNU Prolog interface also on those platforms (besides ppc64, s390 and s390x). --- fedora/ppl.spec | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/fedora/ppl.spec b/fedora/ppl.spec index bebedd5..270d723 100644 --- a/fedora/ppl.spec +++ b/fedora/ppl.spec @@ -2,7 +2,7 @@ Name: ppl Version: 0.10 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions Group: Development/Libraries @@ -60,7 +60,7 @@ BuildRequires: glpk-devel >= 4.13 This package contains the mixed integer linear programming solver ppl_lpsol and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra. -%ifnarch ppc64 s390 s390x +%ifnarch ia64 ppc64 s390 s390x %package gprolog # The `gprolog' package is not available on ppc64: # the GNU Prolog interface must thus be disabled for that architecture. @@ -73,7 +73,7 @@ This package adds GNU Prolog support to the Parma Polyhedra Library (PPL). Install this package if you want to use the library in GNU Prolog programs. %endif -%ifnarch ppc64 s390 s390x +%ifnarch ia64 ppc64 s390 s390x %package gprolog-static Summary: The static archive for the GNU Prolog interface of the Parma Polyhedra Library Group: Development/Libraries @@ -203,7 +203,7 @@ Install this package if you want to program with the PWL. %build CPPFLAGS="-I%{_includedir}/glpk" -%ifnarch ppc64 s390 s390x +%ifnarch ia64 ppc64 s390 s390x CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* $[^ ]*$$/\1/g"`/include" %endif CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap" @@ -289,7 +289,7 @@ mv \ %{_mandir}/man1/ppl_lcdd.1.gz %{_mandir}/man1/ppl_lpsol.1.gz -%ifnarch ppc64 s390 s390x +%ifnarch ia64 ppc64 s390 s390x %files gprolog %defattr(-,root,root,-) %doc interfaces/Prolog/GNU/README.gprolog @@ -298,7 +298,7 @@ mv \ %{_libdir}/%{name}/libppl_gprolog.so %endif -%ifnarch ppc64 s390 s390x +%ifnarch ia64 ppc64 s390 s390x %files gprolog-static %defattr(-,root,root,-) %{_libdir}/%{name}/libppl_gprolog.a @@ -401,6 +401,10 @@ mv \ rm -rf %{buildroot} %changelog +* Tue Mar 24 2009 Roberto Bagnara <bagnara(a)cs.unipr.it> 0.10-10 +- There are no GNU Prolog packages available on ia64: disable the GNU Prolog + interface also on those platforms (besides ppc64, s390 and s390x). + * Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild. @@ -408,7 +412,7 @@ rm -rf %{buildroot} - Install the documentation according to the Fedora packaging conventions. * Wed Feb 17 2009 Karsten Hopp <karsten(a)redhat.comt> 0.10-7 -- There are no GNU Prolog packages available on s390 and s390: disable +- There are no GNU Prolog packages available on s390 and s390x: disable the GNU Prolog interface also on those platforms (besides ppc64). * Wed Feb 04 2009 Roberto Bagnara <bagnara(a)cs.unipr.it> 0.10-6

1 0

[GIT] ppl/ppl(master): Synchronized with the Fedora repository.
by Roberto Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 0af6517d2c2660682608bfbb6f5bc409adeb39c5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0af6517d2c26… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 24 09:20:38 2009 +0100 Synchronized with the Fedora repository. --- fedora/ppl.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fedora/ppl.spec b/fedora/ppl.spec index 177c9c3..bebedd5 100644 --- a/fedora/ppl.spec +++ b/fedora/ppl.spec @@ -2,7 +2,7 @@ Name: ppl Version: 0.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: The Parma Polyhedra Library: a library of numerical abstractions Group: Development/Libraries @@ -401,6 +401,9 @@ mv \ rm -rf %{buildroot} %changelog +* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild. + * Wed Feb 18 2009 Roberto Bagnara <bagnara(a)cs.unipr.it> 0.10-8 - Install the documentation according to the Fedora packaging conventions.

1 0

[GIT] ppl/ppl(master): Added some more infrastructure. Variables renamed.
by Roberto Bagnara 24 Mar '09

24 Mar '09

Module: ppl/ppl Branch: master Commit: 62138fd38306b0a68475b4a440bafaf41d5df525 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=62138fd38306… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Mar 24 07:19:25 2009 +0100 Added some more infrastructure. Variables renamed. --- interfaces/C/ppl_c_header.h | 12 ++++++ interfaces/C/tests/formatted_output.c | 2 +- interfaces/C/tests/print_to_buffer.c | 62 ++++++++++++++++---------------- interfaces/C/tests/print_to_buffer.h | 6 ++-- src/c_stream.h | 7 +++- 5 files changed, 52 insertions(+), 37 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 6f96cab..fa0bc9d 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2465,4 +2465,16 @@ PPL_DECLARE_AND_DOCUMENT_IO_FUNCTIONS(MIP_Problem) #include "c_stream.h" +DECLARE_WRITE_VAL(Coefficient, ppl_const_Coefficient_t); +DECLARE_WRITE_VAL(Linear_Expression, ppl_const_Linear_Expression_t); +DECLARE_WRITE_VAL(Constraint, ppl_const_Constraint_t); +DECLARE_WRITE_VAL(Constraint_System, ppl_const_Constraint_System_t); +DECLARE_WRITE_VAL(Generator, ppl_const_Generator_t); +DECLARE_WRITE_VAL(Generator_System, ppl_const_Generator_System_t); +DECLARE_WRITE_VAL(Congruence, ppl_const_Congruence_t); +DECLARE_WRITE_VAL(Congruence_System, ppl_const_Congruence_System_t); +DECLARE_WRITE_VAL(Grid_Generator, ppl_const_Grid_Generator_t); +DECLARE_WRITE_VAL(Grid_Generator_System, ppl_const_Grid_Generator_System_t); +DECLARE_WRITE_VAL(MIP_Problem, ppl_const_MIP_Problem_t); + #endif /* !defined(PPL_ppl_c_h) */ diff --git a/interfaces/C/tests/formatted_output.c b/interfaces/C/tests/formatted_output.c index 2f47073..e1c6311 100644 --- a/interfaces/C/tests/formatted_output.c +++ b/interfaces/C/tests/formatted_output.c @@ -53,7 +53,7 @@ main() { p = print_ppl_Constraint_System_t_to_buffer(cs, 4, 64, 64); if (check_noisy()) { if (p == 0) - printf("print_ppl_Constraint_System_t_to_buffer() returned NULL!\n"); + printf("print_ppl_Constraint_System_to_buffer() returned NULL!\n"); else printf(" %s\n", p); } diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index b9c5519..5b80649 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -1,4 +1,4 @@ -/* Declarations of print_ppl_*_t_to_buffer() functions. +/* Declarations of print_ppl_*_to_buffer() functions. Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -25,13 +25,13 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <malloc.h> #include <string.h> -#define DEFINE_PRINT_TO_BUFFER(Name) \ +#define DEFINE_PRINT_TO_BUFFER(Type) \ char* \ -print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ +print_ppl_##Type##_to_buffer(ppl_const_##Type##_t p, \ unsigned indent_depth, \ unsigned pfll, \ unsigned pll) { \ - struct ppl_io_format_settings settings = { \ + struct ppl_io_format_settings settings = { \ 0, /* tr_in */ \ 0, /* tr_out */ \ "\n", /* paragraph_end */ \ @@ -52,36 +52,36 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ - { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ - { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ - } \ - }; \ - struct ppl_io_ostream *target, *stream; \ - char *buf; \ - settings.lines[PPL_IO_FORMAT_LINE_FIRST].length = pfll; \ - settings.lines[PPL_IO_FORMAT_LINE_FIRSTLAST].length = pfll; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRST].length = pfll; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST].length = pfll; \ - settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST].length = pfll; \ - settings.lines[PPL_IO_FORMAT_LINE_NEXT].length = pll; \ - settings.lines[PPL_IO_FORMAT_LINE_LAST].length = pll; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].length = pll; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].length = pll; \ - settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].length = pll; \ - settings.lines[PPL_IO_FORMAT_LINE_NEXT].left_n = indent_depth; \ - settings.lines[PPL_IO_FORMAT_LINE_LAST].left_n = indent_depth; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].left_n = indent_depth; \ - settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].left_n = indent_depth; \ + } \ + }; \ + struct ppl_io_ostream *target, *stream; \ + char *buf; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].left_n = indent_depth; \ settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].left_n = indent_depth; \ - target = ppl_io_ostream_buffer_new(); \ - stream = ppl_io_ostream_format_new(target, &settings); \ - ppl_io_write_##Name(stream, p); \ - ppl_io_ostream_delete(stream); \ - ppl_io_ostream_buffer_get(target, &buf); \ - ppl_io_ostream_delete(target); \ - return buf; \ + target = ppl_io_ostream_buffer_new(); \ + stream = ppl_io_ostream_format_new(target, &settings); \ + ppl_io_write_##Type(stream, p); \ + ppl_io_ostream_delete(stream); \ + ppl_io_ostream_buffer_get(target, &buf); \ + ppl_io_ostream_delete(target); \ + return buf; \ } #if 0 diff --git a/interfaces/C/tests/print_to_buffer.h b/interfaces/C/tests/print_to_buffer.h index f565f94..b4c47a7 100644 --- a/interfaces/C/tests/print_to_buffer.h +++ b/interfaces/C/tests/print_to_buffer.h @@ -1,4 +1,4 @@ -/* Declarations of print_ppl_*_t_to_buffer() functions. +/* Declarations of print_ppl_*_to_buffer() functions. Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> This file is part of the Parma Polyhedra Library (PPL). @@ -33,9 +33,9 @@ site: http://www.cs.unipr.it/ppl/ . */ `preferred_first_line_length' and `preferred_line_length', respectively. */ -#define DECLARE_PRINT_TO_BUFFER(Name) \ +#define DECLARE_PRINT_TO_BUFFER(Type) \ char* \ -print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ +print_ppl_##Type##_t_to_buffer(ppl_const_##Type##_t p, \ unsigned indent_depth, \ unsigned preferred_first_line_length, \ unsigned preferred_line_length); diff --git a/src/c_stream.h b/src/c_stream.h index 3c8454d..f39009d 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -101,8 +101,11 @@ int ppl_io_write_endl(struct ppl_io_ostream* s); /* FIXME: */ /* Add ios_base methods: flags, setf, unsetf, width, precision (others?) */ -#define DECLARE_WRITE_VAL(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type o) -#define DECLARE_WRITE_REF(name, type) int ppl_io_write_##name(struct ppl_io_ostream* s, const type* o) +#define DECLARE_WRITE_VAL(name, type) \ + int ppl_io_write_##name(struct ppl_io_ostream* s, const type o) + +#define DECLARE_WRITE_REF(name, type) \ + int ppl_io_write_##name(struct ppl_io_ostream* s, const type* o) DECLARE_WRITE_VAL(char, char); DECLARE_WRITE_VAL(signed_char, signed char);

1 0

[GIT] ppl/ppl(master): Build restored.
by Roberto Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: 09c6fe37dac83e5128da517351beb91ef69da1c3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=09c6fe37dac8… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 23 22:29:56 2009 +0100 Build restored. --- interfaces/C/tests/formatted_output.c | 2 ++ interfaces/C/tests/print_to_buffer.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/interfaces/C/tests/formatted_output.c b/interfaces/C/tests/formatted_output.c index 4fa8d3f..2f47073 100644 --- a/interfaces/C/tests/formatted_output.c +++ b/interfaces/C/tests/formatted_output.c @@ -29,6 +29,7 @@ site: http://www.cs.unipr.it/ppl/ . */ int main() { +#if 0 int i; mpz_t z; ppl_Coefficient_t coeff; @@ -57,5 +58,6 @@ main() { printf(" %s\n", p); } ppl_delete_Constraint_System(cs); +#endif return 0; } diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index 87a81e4..b9c5519 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -84,6 +84,7 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ return buf; \ } +#if 0 DEFINE_PRINT_TO_BUFFER(Coefficient) DEFINE_PRINT_TO_BUFFER(Linear_Expression) @@ -105,3 +106,4 @@ DEFINE_PRINT_TO_BUFFER(Grid_Generator) DEFINE_PRINT_TO_BUFFER(Grid_Generator_System) DEFINE_PRINT_TO_BUFFER(MIP_Problem) +#endif

1 0

[GIT] ppl/ppl(master): Added repeated char for left and right margin.
by Abramo Bagnara 23 Mar '09

23 Mar '09

Module: ppl/ppl Branch: master Commit: bace9caed4ba2aba49450798390a526501db70bd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bace9caed4ba… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Mon Mar 23 22:16:56 2009 +0100 Added repeated char for left and right margin. --- interfaces/C/tests/print_to_buffer.c | 55 +++++++++++++++++++++------------- src/c_stream.cc | 24 +++++++------- src/c_stream.h | 8 +++++ src/c_streambuf_format.cc | 5 +++ 4 files changed, 59 insertions(+), 33 deletions(-) diff --git a/interfaces/C/tests/print_to_buffer.c b/interfaces/C/tests/print_to_buffer.c index 5de5698..87a81e4 100644 --- a/interfaces/C/tests/print_to_buffer.c +++ b/interfaces/C/tests/print_to_buffer.c @@ -31,9 +31,6 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ unsigned indent_depth, \ unsigned pfll, \ unsigned pll) { \ - char in[indent_depth + 1]; \ - memset(in, ' ', indent_depth); \ - in[indent_depth] = '\0'; \ struct ppl_io_format_settings settings = { \ 0, /* tr_in */ \ 0, /* tr_out */ \ @@ -46,26 +43,42 @@ print_ppl_##Name##_t_to_buffer(ppl_const_##Name##_t p, \ 0, /* top */ \ 0, /* bottom */ \ { \ - /* length, left, right, alignment, fill_char */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ - { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ - { 0, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ - { pfll, "", "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ - { pll, in, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ - { pfll, "", "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ - { pll, in, "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ - } \ + /* length, left, left_n, left_c, right_n, right_c right, alignment, fill_char */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* FIRSTLAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* CHOPPED_NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_FIRSTLAST */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_NEXT */ \ + { 0, 0, ' ', 0, 0, ' ', "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* LONGER_LAST */ \ + { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, /* UNTERMINATED_FIRST */ \ + { 0, 0, ' ', 0, 0, ' ', "", PPL_IO_FORMAT_ALIGN_LEFT, 0 } /* UNTERMINATED_NEXT */ \ + } \ }; \ - struct ppl_io_ostream* target = ppl_io_ostream_buffer_new(); \ - struct ppl_io_ostream* stream = ppl_io_ostream_format_new(target, &settings); \ - ppl_io_write_##NAME(stream, object); \ - ppl_io_ostream_delete(stream); \ + struct ppl_io_ostream *target, *stream; \ char *buf; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST].length = pfll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].length = pll; \ + settings.lines[PPL_IO_FORMAT_LINE_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LAST].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_NEXT].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_LONGER_LAST].left_n = indent_depth; \ + settings.lines[PPL_IO_FORMAT_LINE_UNTERMINATED_NEXT].left_n = indent_depth; \ + target = ppl_io_ostream_buffer_new(); \ + stream = ppl_io_ostream_format_new(target, &settings); \ + ppl_io_write_##Name(stream, p); \ + ppl_io_ostream_delete(stream); \ ppl_io_ostream_buffer_get(target, &buf); \ ppl_io_ostream_delete(target); \ return buf; \ diff --git a/src/c_stream.cc b/src/c_stream.cc index 6b3b20b..11ea69e 100644 --- a/src/c_stream.cc +++ b/src/c_stream.cc @@ -34,18 +34,18 @@ ppl_io_format_settings ppl_io_format_default_settings = { 0, // bottom { // length, left, right, alignment, fill_char - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT - { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_LAST - { 80, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // UNTERMINATED_FIRST - { 80, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 } // UNTERMINATED_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT + { 80, 0, 0, 0, 0, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_LAST + { 80, 0, 0, 0, 0, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // UNTERMINATED_FIRST + { 80, 0, 0, 0, 0, 0, 0, PPL_IO_FORMAT_ALIGN_LEFT, 0 } // UNTERMINATED_NEXT } }; diff --git a/src/c_stream.h b/src/c_stream.h index e8857ee..3c8454d 100644 --- a/src/c_stream.h +++ b/src/c_stream.h @@ -68,6 +68,14 @@ struct ppl_io_format_settings { unsigned int length; /* Left margin string */ const char *left; + /* Left margin repeated char count */ + unsigned int left_n; + /* Left margin repeated char */ + char left_c; + /* Right margin repeated char count */ + unsigned int right_n; + /* Right margin repeated char */ + unsigned int right_c; /* Right margin string */ const char *right; /* 0 left, 8 center, 16 right */ diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc index 368a494..5d94ac6 100644 --- a/src/c_streambuf_format.cc +++ b/src/c_streambuf_format.cc @@ -145,6 +145,9 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma } if (settings->lines[type].left) stream << settings->lines[type].left; + unsigned int i; + for (i = 0; i < settings->lines[type].left_n; ++i) + stream.put(settings->lines[type].left_c); if (settings->lines[type].fill_char && n < settings->lines[type].length) { unsigned int left = 0; unsigned int right = 0; @@ -160,6 +163,8 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma } else stream.write(s, n); + for (i = 0; i < settings->lines[type].right_n; ++i) + stream.put(settings->lines[type].right_c); if (settings->lines[type].right) stream << settings->lines[type].right; switch (type) {

1 0