- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Perl is no longer a strict requirement.
by Roberto Bagnara 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: be262c561929432c22960e53026853d520396d7b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be262c561929… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Apr 8 22:34:23 2010 +0200 Perl is no longer a strict requirement. --- TODO | 3 --- configure.ac | 26 ++++++++------------------ interfaces/C/Makefile.am | 16 +++++++++++++++- src/Makefile.am | 16 ++++++++++++++-- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/TODO b/TODO index ddebb7f..b32e567 100644 --- a/TODO +++ b/TODO @@ -7,9 +7,6 @@ Enhancements for PPL 0.11 - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 -- Lack of perl can cause more problems than explained in the warning - message given by our configuration procedure. See, e.g., - http://www.cs.unipr.it/pipermail/ppl-devel/2009-November/015758.html - Complete the ppl_pips man page. diff --git a/configure.ac b/configure.ac index d56c885..3d0c31c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre18], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre19], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61) @@ -78,6 +78,8 @@ ISODATE=`date +%Y-%m-%d` AC_SUBST(ISODATE) AH_TOP([ +/* BEGIN ppl-config.h */ + /* Unique (nonzero) code for the IEEE 754 Single Precision floating point format. */ #define PPL_FLOAT_IEEE754_SINGLE 1 @@ -116,6 +118,8 @@ AH_BOTTOM([ #ifdef PPL_HAVE_INTTYPES_H # include <inttypes.h> #endif + +/* END ppl-config.h */ ]) @@ -908,17 +912,13 @@ xall) ;; esac -# Perl is needed to build the C++ interface. -if test x${cxx_interface_enabled} = xyes \ -&& test x"$PERL" != xno +if test x${cxx_interface_enabled} = xyes then build_cxx_interface=yes fi AM_CONDITIONAL(BUILD_CXX_INTERFACE, test x$build_cxx_interface = xyes) -# Perl is needed to build the C interface. -if test x${c_interface_enabled} = xyes \ -&& test x"$PERL" != xno +if test x${c_interface_enabled} = xyes then build_c_interface=yes fi @@ -1592,23 +1592,13 @@ fi if test x"$PERL" = xno then - if test x${c_interface_enabled} = xyes - then - AC_MSG_ERROR([PERL UNAVAILABLE: -*** CANNOT BUILD THE C_INTERFACE. -*** Perl could not be found on your system, so that the C interface cannot -*** be built. You should either disable the generation of the C interface -*** (with the `--enable-interfaces' configure option) or add Perl to your -*** development environment: see http://www.perl.org/ for more information.]) - else - AC_MSG_WARN([PERL UNAVAILABLE: + AC_MSG_WARN([PERL UNAVAILABLE: *** CANNOT REBUILD SOME FILES IF SOURCES ARE CHANGED. *** Perl could not be found on your system. This is OK, if you only plan *** to build the PPL without modifying the sources and without trying to *** build a distribution out of a CVS working copy. If this is not the case, *** then you need to add Perl to your development environment: *** see http://www.perl.org/ for more information.]) - fi fi if test x"$coefficient_kind" = xnative diff --git a/interfaces/C/Makefile.am b/interfaces/C/Makefile.am index 33dfc7c..ea27234 100644 --- a/interfaces/C/Makefile.am +++ b/interfaces/C/Makefile.am @@ -84,16 +84,30 @@ WATCHDOG_INCLUDE_OPTIONS = -I$(top_builddir)/Watchdog/src endif BUILD_WATCHDOG_LIBRARY +if HAVE_PERL + ppl_c.h: ppl_c_header.h ppl_c_version.h ppl_c_domains.h Makefile $(top_builddir)/utils/build_header $(top_builddir)/utils/build_header \ -I $(top_builddir)/interfaces/C -I $(top_srcdir)/src \ $(top_srcdir)/interfaces/C/ppl_c_header.h >$@ +else !HAVE_PERL + +ppl_c.h: ppl_c.h.dist + cp -f $< $@ + +endif !HAVE_PERL + BUILT_SOURCES = \ ppl_c.h \ ppl_c_implementation_domains.hh \ ppl_c_implementation_domains.cc.stamp +# ppl_c.h is not distributed. +# ppl_c.h.dist, which is distributed, is a copy of ppl_c.h. +dist-hook: + mv -f $(distdir)/ppl_c.h $(distdir)/ppl_c.h.dist + interface_generator_dependencies = \ $(top_builddir)/interfaces/ppl_interface_instantiations.m4 \ ../ppl_interface_generator_common.m4 \ @@ -231,7 +245,7 @@ libppl_c_la_LDFLAGS = \ $(NO_UNDEFINED_FLAG) \ -version-info $(LIBPPL_C_LT_CURRENT):$(LIBPPL_C_LT_REVISION):$(LIBPPL_C_LT_AGE) -nodist_include_HEADERS = ppl_c.h +include_HEADERS = ppl_c.h nodist_noinst_HEADERS = \ ppl_c_domains.h \ diff --git a/src/Makefile.am b/src/Makefile.am index d76fbfe..5d20cf7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -523,8 +523,20 @@ CREDITS.cc: $(top_builddir)/utils/text2cxxarray $(top_srcdir)/CREDITS else !HAVE_PERL -ppl.hh: ppl.hh.dist - cp -f $< $@ +ppl.hh.sed: Makefile + @echo "/^\/\* BEGIN ppl-config.h \*\/$$/ {" >$@ + @echo " r $(top_builddir)/ppl-config.h" >>$@ + @echo " : loop" >>$@ + @echo " /\n\/\* END ppl-config.h \*\/$$/ !{" >>$@ + @echo " N" >>$@ + @echo " b loop" >>$@ + @echo " }" >>$@ + @echo " d" >>$@ + @echo "}" >>$@ + +ppl.hh: ppl.hh.dist ppl.hh.sed + $(SED) -f ppl.hh.sed $< >$@ + rm -f ppl.hh.sed BUGS.cc: BUGS.cc.dist cp -f $< $@

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row: fix combine_needs_second() for backends that define PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES.
by Marco Poletti 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: sparse_matrices Commit: ba97824c0307ae2b5534a04ccb0196444f3e400c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba97824c0307… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Apr 8 19:00:01 2010 +0200 Unlimited_Sparse_Row: fix combine_needs_second() for backends that define PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES. --- src/Unlimited_Sparse_Row.templates.hh | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/Unlimited_Sparse_Row.templates.hh b/src/Unlimited_Sparse_Row.templates.hh index d990c55..8f15962 100644 --- a/src/Unlimited_Sparse_Row.templates.hh +++ b/src/Unlimited_Sparse_Row.templates.hh @@ -104,9 +104,8 @@ Unlimited_Sparse_Row::combine_needs_second(const Unlimited_Sparse_Row& y, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); } @@ -124,9 +123,8 @@ Unlimited_Sparse_Row::combine_needs_second(const Unlimited_Sparse_Row& y, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); } @@ -156,9 +154,8 @@ Unlimited_Sparse_Row::combine_needs_second(const Unlimited_Sparse_Row& y, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); } @@ -272,9 +269,8 @@ Unlimited_Sparse_Row::combine(const Unlimited_Sparse_Row& y, const Func1& f, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); } @@ -293,9 +289,8 @@ Unlimited_Sparse_Row::combine(const Unlimited_Sparse_Row& y, const Func1& f, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); } @@ -326,9 +321,8 @@ Unlimited_Sparse_Row::combine(const Unlimited_Sparse_Row& y, const Func1& f, #ifdef PPL_SPARSE_BACKEND_INVALIDATES_REFERENCES i = last_i; ++i; - i_end = x.end(); - if (& static_cast<PIP_Tree_Node:: - matrix_row_const_reference_type>(x) == &y) { + i_end = end(); + if (this == &y) { j = last_i; j_end = y.end(); }

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row: update the backend requirements.
by Marco Poletti 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: sparse_matrices Commit: d4d4042ded72da571a7984a5800d4de84176aaf6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d4d4042ded72… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Apr 8 18:59:11 2010 +0200 Unlimited_Sparse_Row: update the backend requirements. --- src/Unlimited_Sparse_Row.defs.hh | 73 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/src/Unlimited_Sparse_Row.defs.hh b/src/Unlimited_Sparse_Row.defs.hh index 5aeaec0..d53a552 100644 --- a/src/Unlimited_Sparse_Row.defs.hh +++ b/src/Unlimited_Sparse_Row.defs.hh @@ -97,6 +97,9 @@ namespace Parma_Polyhedra_Library { * C::value_type should be \p std::pair<dimension_type,Coefficient> . * C must have a swap() method. * C must have a const OK() method, returning bool. + * C must have a const external_memory_in_bytes() method, returning a + memory_size_type. This method returns the size in bytes of the memory + managed by \p *this. * C::const_iterator must have a default constructor * C::const_iterator must define operator*(), operator->(), and operator == and !=. @@ -109,6 +112,73 @@ namespace Parma_Polyhedra_Library { * C::dangerous_iterator must follow all the requirements for C::iterator. * C::dangerous_iterator must have a static method next(C::iterator i) that returns a dangerous_iterator pointing to the element after i. + * C must have a method find_dangerous(dimension_type i) returning a + C::dangerous_iterator. This method returns a dangerous_iterator pointing + to the element with index \p i, or end_dangerous() if there is no such + element. + * C must have a method + find_dangerous(dimension_type i, dangerous_iterator itr) returning a + C::dangerous_iterator. This method returns a dangerous_iterator pointing + to the element with index \p i, or end_dangerous() if there is no such + element. \p itr must be an iterator pointing to an element with index + less than i. + * C must have a method find(dimension_type i) returning a C::iterator. + This method returns a dangerous_iterator pointing to the element with + index \p i, or end() if there is no such element. + * C must have a method find(dimension_type i, iterator itr) returning a + C::iterator. This method returns an iterator pointing to the element with + index \p i, or end() if there is no such element. \p itr must be an + iterator pointing to an element with index less than i. + * C must have a const method find(dimension_type i) returning a + C::const_iterator. This method returns a const_iterator pointing to + the element with index \p i, or end() if there is no such element. + * C must have a const method find(dimension_type i, const_iterator itr) + returning a C::const_iterator. This method returns an iterator pointing to + the element with index \p i, or end() if there is no such element. + \p itr must be an iterator pointing to an element with index less than i. + * C must have a method lower_bound_dangerous(dimension_type i) returning a + C::dangerous_iterator. This method returns a dangerous_iterator pointing + to the element with index \p i, or to the last element with index less + than \p i, if there is no such element. + * C must have a method + lower_bound_dangerous(dimension_type i, dangerous_iterator itr) returning + a C::dangerous_iterator. This method returns a dangerous_iterator pointing + to the element with index \p i, or to the last element with index less + than \p i, if there is no such element. + \p itr must be an iterator pointing to an element with index less than i. + * C must have a method lower_bound(dimension_type i) returning a C::iterator. + This method returns a dangerous_iterator pointing to the element with + index \p i, or to the last element with index less than \p i, if there is + no such element. + * C must have a method lower_bound(dimension_type i, iterator itr) returning a + C::iterator. This method returns an iterator pointing to the element with + index \p i, or to the last element with index less than \p i, if there is + no such element. + \p itr must be an iterator pointing to an element with index less than i. + * C must have a const method lower_bound(dimension_type i) returning a + C::const_iterator. This method returns a const_iterator pointing to + the element with index \p i, or to the last element with index less than + \p i, if there is no such element. + * C must have a const method lower_bound(dimension_type i, const_iterator itr) + returning a C::const_iterator. This method returns an iterator pointing to + the element with index \p i, or to the last element with index less than + \p i, if there is no such element. + \p itr must be an iterator pointing to an element with index less than i. + * C must have a method + find2_dangerous(dimension_type c1, dimension_type c2, + C::dangerous_iterator& itr1, C::dangerous_iterator& itr2) + returning void, equivalent to<BR> + itr1=find_dangerous(c1); itr2=find_dangerous(c2); + * C must have a method + find2(dimension_type c1, dimension_type c2, + iterator& itr1, iterator& itr2); + returning void, equivalent to<BR> + itr1=find(c1); itr2=find(c2); + * C must have a const method + find2(dimension_type c1, dimension_type c2, + C::const_iterator& itr1, C::const_iterator& itr2) + returning void, equivalent to<BR> + itr1=find(c1); itr2=find(c2); * C must have a method insert(C::dangerous_iterator pos, const C::value_type& x) returning a C::dangerous_iterator. This method inserts x before pos and @@ -119,6 +189,9 @@ namespace Parma_Polyhedra_Library { returning a C::dangerous_iterator. This method inserts the pair (i, x) before pos and returns an iterator to the inserted element. This operation invalidates all C::dangerous_iterator objects equal to pos. + * C must have a method push_back(const C::value_type& x) returning void, + equivalent to<BR> + insert(end_dangerous(), x); * C must have a method erase(C::dangerous_iterator pos) returning a C::dangerous_iterator, that erases the element pointed to by pos. This operation invalidates all C::dangerous_iterators objects equal to

1 0

[GIT] ppl/ppl(master): Added ppl_PIP_Problem_has_big_parameter_dimension
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: be24cc575d751884fdf867291842645b3c8096ae URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be24cc575d75… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 16:20:40 2010 +0100 Added ppl_PIP_Problem_has_big_parameter_dimension that returns true if and only if the pip problem has a big parameter set. --- interfaces/OCaml/OCaml_interface.dox | 5 +++++ interfaces/OCaml/ppl_ocaml_common.cc | 12 +++++++++++- interfaces/OCaml/ppl_ocaml_globals.ml | 5 ++++- interfaces/OCaml/ppl_ocaml_globals.mli | 5 ++++- interfaces/OCaml/tests/test1.ml | 9 +++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 7d9fb8b..affac00 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -531,6 +531,11 @@ defining parametric integer programming problems. Exception is thrown if no big parameter dimension has been set. <H2><CODE> + ppl_PIP_Problem_has_big_parameter_dimension handle +</CODE></H2> + Returns true if and only if the dimension for the big parameter has been set. + +<H2><CODE> ppl_PIP_Problem_is_satisfiable handle </CODE></H2> Returns true if the PIP Problem referenced by diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 305c569..a852f53 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1371,7 +1371,7 @@ CATCH_ALL extern "C" CAMLprim value ppl_PIP_Problem_set_big_parameter_dimension(value caml_pip, - value caml_dim) try { + value caml_dim) try { CAMLparam2(caml_pip, caml_dim); dimension_type ppl_dim = value_to_ppl_dimension(caml_dim); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); @@ -1396,6 +1396,16 @@ CATCH_ALL extern "C" CAMLprim value +ppl_PIP_Problem_has_big_parameter_dimension(value caml_pip) try { + CAMLparam1(caml_pip); + PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); + dimension_type d = ppl_pip.get_big_parameter_dimension(); + CAMLreturn(Val_bool(d != not_a_dimension())); +} +CATCH_ALL + +extern "C" +CAMLprim value ppl_PIP_Problem_is_satisfiable(value caml_pip) try { CAMLparam1(caml_pip); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index 3d1e7a4..408febf 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -362,8 +362,11 @@ external ppl_PIP_Problem_optimizing_solution: external ppl_PIP_Problem_get_big_parameter_dimension: pip_problem -> int = "ppl_PIP_Problem_get_big_parameter_dimension" +external ppl_PIP_Problem_has_big_parameter_dimension: + pip_problem -> bool = "ppl_PIP_Problem_has_big_parameter_dimension" + external ppl_PIP_Problem_set_big_parameter_dimension: - pip_problem -> int = "ppl_PIP_Problem_set_big_parameter_dimension" + pip_problem -> int -> unit = "ppl_PIP_Problem_set_big_parameter_dimension" external ppl_PIP_Problem_OK: pip_problem -> bool diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index 8ffb016..79cff49 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -317,7 +317,10 @@ val ppl_PIP_Problem_get_big_parameter_dimension: pip_problem -> int val ppl_PIP_Problem_set_big_parameter_dimension: - pip_problem -> int + pip_problem -> int -> unit + +val ppl_PIP_Problem_has_big_parameter_dimension: + pip_problem -> bool val ppl_PIP_Problem_OK: pip_problem -> bool diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index 66d6b8a..a3d84aa 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -533,6 +533,15 @@ let out = if (i == Cutting_Strategy_First) else "PIP Problem Control Parameter test failed" in (print_string_if_noisy out);; print_string_if_noisy "\n";; +let b0 = ppl_PIP_Problem_has_big_parameter_dimension pip2;; +ppl_PIP_Problem_set_big_parameter_dimension pip2 7;; +let big_par = ppl_PIP_Problem_get_big_parameter_dimension pip2;; +let b1 = ppl_PIP_Problem_has_big_parameter_dimension pip2;; +let out = if (not b0 & b1 & (big_par = 7)) + then "ppl_PIP_Problem big parameter dimension tests succeeded" + else "ppl_PIP_Problem big parameter dimension tests failed" + in (print_string_if_noisy out);; +print_string_if_noisy "\n";; let out = if (ppl_PIP_Problem_is_satisfiable pip2) then "ppl_PIP_Problem_is_satisfiable test succeeded" else "ppl_PIP_Problem_is_satisfiable test failed"

1 0

[GIT] ppl/ppl(master): Added documentation for Prolog PPL_Problem
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 01224d157033e7b199958721f86bec4327bcf831 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=01224d157033… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 16:20:17 2010 +0100 Added documentation for Prolog PPL_Problem --- interfaces/Prolog/Prolog_interface.dox | 257 +++++++++++++++++++++++++++++++- 1 files changed, 254 insertions(+), 3 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=01224d15…

1 0

[GIT] ppl/ppl(master): Dealt with one of the items.
by Enea Zaffanella 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 2ffb054be82d536cdd158ca85ab39706871f9bb3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ffb054be82d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 8 16:47:29 2010 +0200 Dealt with one of the items. --- TODO | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/TODO b/TODO index 835ea2c..7917956 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,6 @@ Enhancements for PPL 0.11 - Make all the *affine*image() methods uniform as far as the specification is concerned. -- Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 - Lack of perl can cause more problems than explained in the warning message given by our configuration procedure. See, e.g., http://www.cs.unipr.it/pipermail/ppl-devel/2009-November/015758.html

1 0

[GIT] ppl/ppl(master): Better documentation for the two Row_Impl::Impl:: operator delete(...).
by Enea Zaffanella 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 039e6ba85aa460c8b0fc723ee6ed344dad2db8bb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=039e6ba85aa4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 8 15:57:50 2010 +0200 Better documentation for the two Row_Impl::Impl::operator delete(...). --- src/Row.defs.hh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/Row.defs.hh b/src/Row.defs.hh index 0f1ef26..f1b147c 100644 --- a/src/Row.defs.hh +++ b/src/Row.defs.hh @@ -390,19 +390,34 @@ public: //! \name Custom allocator and deallocator //@{ - /*! \brief - Allocates a chunk of memory able to contain \p capacity Coefficient objects - beyond the specified \p fixed_size and returns a pointer to the new - allocated memory. + //! Placement allocation function. + /*! + Allocates a chunk of memory able to contain \p capacity Coefficient + objects beyond the specified \p fixed_size and returns a pointer to + the newly allocated memory. */ static void* operator new(size_t fixed_size, dimension_type capacity); - //! Uses the standard delete operator to free the memory \p p points to. + //! Usual (non-placement) deallocation function. + /*! + Uses the standard delete operator to free the memory \p p points to. + + \note + The definition of this custom deallocation function is required + since otherwise the placement deallocation function + <code> + static void operator delete(void* p, dimension_type capacity); + </code> + would be wrongly interpreted as a usual (non-placement) deallocation + function (see C++98 3.7.3.2p2). This happens because \c dimension_type + is just an alias for \c std::size_t. + See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 + */ static void operator delete(void* p); - /*! \brief - Placement version: - uses the standard operator delete to free the memory \p p points to. + //! Placement deallocation function. + /*! + Uses the standard operator delete to free the memory \p p points to. */ static void operator delete(void* p, dimension_type capacity); //@} // Custom allocator and deallocator

1 0

[GIT] ppl/ppl(master): Added documentation in the OCaml interface for the PIP_Problem.
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 9a789a7575fa1cc482ecb1bc404d9a37a4d1ddd3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a789a7575fa… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:55:37 2010 +0100 Added documentation in the OCaml interface for the PIP_Problem. --- interfaces/OCaml/OCaml_interface.dox | 214 ++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 2bc0ac9..7d9fb8b 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -430,6 +430,220 @@ defining mixed integer (linear) programming problems. <BR> +\anchor OCaml_pip_functions +<H1> PIP Functions </H1> +Here we describe some functions available for PPL objects +defining parametric integer programming problems. + +<H2><CODE> + ppl_new_PIP_Problem_from_space_dimension dimension +</CODE></H2> + Return a handle to a PIP Problem \f$\mathrm{PIP}\f$ with the + feasible region the vector space of dimension <CODE>dimension</CODE>, + empty constraint_system and empty set of parametric variables. + +<H2><CODE> + ppl_new_PIP_Problem dimension constraint_system vars_list +</CODE></H2> + Return a handle to a PIP Problem \f$\mathrm{PIP}\f$ having space + dimension <CODE>dimension</CODE>, a feasible region represented by + <CODE>constraint_system</CODE> and parametric variables represented + by <CODE>vars_list</CODE>. + +<H2><CODE> + ppl_PIP_Problem_get_control_parameter handle param_name +</CODE></H2> + Returns the value of the control parameter named <CODE>param_name</CODE>. + +<H2><CODE> + ppl_PIP_Problem_set_control_parameter handle param_value +</CODE></H2> + Sets control parameter value <CODE>param_value</CODE>. + +<H2><CODE> + ppl_PIP_Problem_swap handle_1 handle_2 +</CODE></H2> + Swaps the PIP Problem referenced by <CODE>handle_1</CODE> + with the one referenced by <CODE>handle_2</CODE>. + +<H2><CODE> + ppl_PIP_Problem_space_dimension handle +</CODE></H2> + Returns the dimension of the vector space in which the + PIP Problem referenced by <CODE>handle</CODE> is embedded. + +<H2><CODE> + ppl_PIP_Problem_parameter_space_dimensions handle +</CODE></H2> + Returns a list of variables representing + representing the parameter space dimensions of the PIP Problem + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Problem_constraints handle +</CODE></H2> + Returns a list of the constraints in the constraints system + representing the feasible region for the PIP Problem + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Problem_clear handle +</CODE></H2> + Resets the PIP problem referenced by <CODE>handle</CODE> + to be the trivial problem with space dimension \f$0\f$. + +<H2><CODE> ppl_PIP_Problem_add_space_dimensions_and_embed + handle dimension_0 dimension_1 + </CODE></H2> + Embeds the PIP problem referenced by <CODE>handle</CODE> + in a space that is enlarged by <CODE>dimension_0</CODE> + non-parameter dimensions and <CODE>dimension_1</CODE> parameter dimensions, + +<H2><CODE> + ppl_PIP_Problem_add_to_parameter_space_dimensions handle vars_list +</CODE></H2> + Sets the space dimensions whose indexes are in \p vars_list + to be parameter space dimensions. + +<H2><CODE> + ppl_PIP_Problem_add_constraint handle constraint +</CODE></H2> + Updates the PIP Problem referenced by <CODE>handle</CODE> + so that the feasible region is represented by the original constraint + system together with the constraint <CODE>constraint</CODE>. + +<H2><CODE> + ppl_PIP_Problem_add_constraints handle constraint_system +</CODE></H2> + Updates the PIP Problem referenced by <CODE>handle</CODE> + so that the feasible region is represented by the original constraint + system together with all the constraints in <CODE>constraint_system</CODE>. + +<H2><CODE> + ppl_PIP_Problem_set_big_parameter_dimension handle dimension +</CODE></H2> + Sets the dimension for the big parameter to \p dimension. + +<H2><CODE> + ppl_PIP_Problem_get_big_parameter_dimension handle +</CODE></H2> + Returns the dimension for the big parameter. + Exception is thrown if no big parameter dimension has been set. + +<H2><CODE> + ppl_PIP_Problem_is_satisfiable handle +</CODE></H2> + Returns true if the PIP Problem referenced by + <CODE>handle</CODE> is satisfiable and false otherwise. + +<H2><CODE> + ppl_PIP_Problem_solve handle +</CODE></H2> + Solves the PIP problem referenced by + <CODE>handle</CODE> and returns + a status flag indicating the outcome of the optimization attempt: + \p Optimized_Pip_Problem if the optimization attempt succeeds; + \p Unfeasible_Pip_Problem otherwise. + +<H2><CODE> + ppl_PIP_Problem_solution handle +</CODE></H2> + Solves the PIP problem referenced by <CODE>handle</CODE> and + returns a handle to a PIP_Tree representing a feasible solution, + if it exists and bottom otherwise. + +<H2><CODE> + ppl_PIP_Problem_optimizing_solution handle +</CODE></H2> + Solves the PIP problem referenced by <CODE>handle</CODE> and + returns a handle to a PIP_Tree representing an optimizing_solution, + if it exists and bottom otherwise. + +<H2><CODE> + ppl_PIP_Problem_OK handle +</CODE></H2> + Returns true if the PIP Problem referenced by + <CODE>handle</CODE> is well formed, i.e., if it + satisfies all its implementation invariants and false, + otherwise. Useful for debugging purposes. + +<H2><CODE> + ppl_PIP_Problem_ascii_dump handle +</CODE></H2> + Returns a string containing an ASCII dump of the internal representation + of the PIP_Problem referenced by <CODE>handle</CODE>. Useful for + debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_swap handle_1 handle_2 +</CODE></H2> + Swaps the PIP tree node referenced by <CODE>handle_1</CODE> + with the one referenced by <CODE>handle_2</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_OK handle +</CODE></H2> + Returns true if the PIP tree node referenced by + <CODE>handle</CODE> is well formed, i.e., if it + satisfies all its implementation invariants and false, + otherwise. Useful for debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_ascii_dump handle +</CODE></H2> + Returns a string containing an ASCII dump of the internal representation + of the Pip tree node referenced by <CODE>handle</CODE>. Useful for + debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_constraints handle +</CODE></H2> + Returns a list of the parameter constraints in the PIP tree node + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_artificials handle +</CODE></H2> + Returns a list of the artificial parameters in the PIP + tree node referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_is_bottom handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents bottom. + +<H2><CODE> + ppl_PIP_Tree_Node_is_decision handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents a decision node. + +<H2><CODE> + ppl_PIP_Tree_Node_is_solution handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents a solution node. + +<H2><CODE> + ppl_PIP_Tree_Node_parametric_values handle var +</CODE></H2> + Returns a linear expression representing the values of problem variable + \p var in the solution node represented by <CODE>handle</CODE>. + The returned linear expression may involve problem parameters + as well as artificial parameters. + +<H2><CODE> + ppl_PIP_Tree_Node_true_child handle var +</CODE></H2> + Returns a handle to the child on the true branch of the + PIP tree node represented by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_false_child handle var +</CODE></H2> + Returns a handle to the child on the false branch of the + PIP tree node represented by <CODE>handle</CODE>. + +<BR> + \anchor main_OCaml_C_polyhedron_functions <H1> C_Polyhedron Functions </H1> Here we describe the main functions available for PPL objects

1 0

[GIT] ppl/ppl(master): ppl_PIP_Problem_get_big_parameter_dimension() now throws
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: b2698ee02273622a897d69f3044a2b7dda2410d7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b2698ee02273… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:54:23 2010 +0100 ppl_PIP_Problem_get_big_parameter_dimension() now throws an exception if the big parameter has not been set. --- interfaces/OCaml/ppl_ocaml_common.cc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 291298b..305c569 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1386,6 +1386,10 @@ ppl_PIP_Problem_get_big_parameter_dimension(value caml_pip) try { CAMLparam1(caml_pip); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); dimension_type d = ppl_pip.get_big_parameter_dimension(); + if (d == not_a_dimension()) + throw std::invalid_argument("ppl_PIP_Problem_get_big_parameter_dimension" + "(pip):\n" + "big parameter dimension has not been set."); CAMLreturn(ppl_dimension_to_value(d)); } CATCH_ALL

1 0

[GIT] ppl/ppl(master): Removed a completed item:
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: c27fa3bd5ea268d48ff9f5ca7d8bab4f92a5b553 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c27fa3bd5ea2… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:52:26 2010 +0100 Removed a completed item: - Handle std::logic_error (now thrown in case watchdogs are not available) in all the interfaces. --- TODO | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index ddebb7f..835ea2c 100644 --- a/TODO +++ b/TODO @@ -2,8 +2,6 @@ Enhancements for PPL 0.11 ========================= -- Handle std::logic_error (now thrown in case watchdogs are not - available) in all the interfaces. - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115

1 0