- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 25 Apr '10

25 Apr '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2f7598b23351… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 19:24:07 2010 +0200 CO_Tree: cache level_data arrays and share them among trees with the same height. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8194fcc2cec6… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 18:27:55 2010 +0200 MIP_Problem: reversed loop in steepest_edge_exact_entering_index(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6da127293c70… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 18:27:41 2010 +0200 MIP_Problem: reversed loop in steepest_edge_float_entering_index(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1676d8e611a7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 18:03:14 2010 +0200 MIP_Problem: optimize steepest_edge_exact_entering_index(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ba8dabf354b0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 16:50:17 2010 +0200 Unlimited_Sparse_Row_Over_CO_Tree: optimize combine() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8696af5a29af… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 16:49:34 2010 +0200 MIP_Problem: optimize steepest_edge_float_entering_index().

1 0

[GIT] ppl/ppl(sparse_matrices): Unlimited_Sparse_Row_Over_CO_Tree: optimize combine_needs_second().
by Marco Poletti 25 Apr '10

25 Apr '10

Module: ppl/ppl Branch: sparse_matrices Commit: c75a75d9eb636efc7facf173d098aebb480d304b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c75a75d9eb63… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 12:43:06 2010 +0200 Unlimited_Sparse_Row_Over_CO_Tree: optimize combine_needs_second(). --- src/Unlimited_Sparse_Row_Over_CO_Tree.templates.hh | 121 +++++--------------- 1 files changed, 27 insertions(+), 94 deletions(-) diff --git a/src/Unlimited_Sparse_Row_Over_CO_Tree.templates.hh b/src/Unlimited_Sparse_Row_Over_CO_Tree.templates.hh index 22b2181..eb5b2d4 100644 --- a/src/Unlimited_Sparse_Row_Over_CO_Tree.templates.hh +++ b/src/Unlimited_Sparse_Row_Over_CO_Tree.templates.hh @@ -76,74 +76,13 @@ template <typename Func1, typename Func2> void Unlimited_Sparse_Row_Over_CO_Tree ::combine_needs_second(const Unlimited_Sparse_Row_Over_CO_Tree& y, - const Func1& g, const Func2& h) { - iterator i = begin(); - iterator last_i = begin(); - const_iterator j = y.begin(); - if (!i.itr.is_at_end()) { - if (!j.itr.is_at_end()) { - if (i->first == j->first) { - g(i->second, j->second); - last_i = i; - ++i; - ++j; - } else - if (i->first < j->first) { - last_i = i; - ++i; - } else { - last_i = find_create(j->first); - h(last_i->second, j->second); - i = last_i; - ++i; - if (this == &y) - j = last_i; - ++j; - } - } else { - last_i = i; - ++i; - } - } else { - if (!j.itr.is_at_end()) { - last_i = find_create(j->first); - h(last_i->second, j->second); - i = last_i; - ++i; - if (this == &y) - j = last_i; - ++j; - } else { - PPL_ASSERT(i.itr.is_at_end()); - PPL_ASSERT(j.itr.is_at_end()); - - return; - } - } - PPL_ASSERT(!last_i.itr.is_at_end()); - while (!i.itr.is_at_end() && !j.itr.is_at_end()) - if (i->first == j->first) { - g(i->second, j->second); - last_i = i; - ++i; - ++j; - } else - if (i->first < j->first) { - last_i = i; - i = lower_bound(j->first, i); - } else { - last_i = find_create(j->first, last_i); - h(last_i->second, j->second); - i = last_i; - ++i; - if (this == &y) - j = last_i; - ++j; - } - while (!j.itr.is_at_end()) { - last_i = find_create(j->first, last_i); - h(last_i->second, j->second); - ++j; + const Func1& g, const Func2& /* h */) { + iterator i; + unordered_const_iterator j = y.unordered_begin(); + unordered_const_iterator j_end = y.unordered_end(); + for ( ; j != j_end; ++j) { + find_create_assign(j->first, i); + g(i->second, j->second); } } @@ -153,42 +92,36 @@ Unlimited_Sparse_Row_Over_CO_Tree ::combine(const Unlimited_Sparse_Row_Over_CO_Tree& y, const Func1& f, const Func2& g, const Func3& h) { iterator i = begin(); - iterator last_i = begin(); const_iterator j = y.begin(); if (!i.itr.is_at_end()) { if (!j.itr.is_at_end()) { if (i->first == j->first) { g(i->second, j->second); - last_i = i; ++i; ++j; } else if (i->first < j->first) { f(i->second); - last_i = i; ++i; } else { - last_i = find_create(j->first); - h(last_i->second, j->second); - i = last_i; - ++i; + find_create_assign(j->first, i); + h(i->second, j->second); if (this == &y) - j = last_i; + j = i; + ++i; ++j; } } else { f(i->second); - last_i = i; ++i; } } else { if (!j.itr.is_at_end()) { - last_i = find_create(j->first); - h(last_i->second, j->second); - i = last_i; - ++i; + find_create_assign(j->first, i); + h(i->second, j->second); if (this == &y) - j = last_i; + j = i; + ++i; ++j; } else { PPL_ASSERT(i.itr.is_at_end()); @@ -197,35 +130,35 @@ Unlimited_Sparse_Row_Over_CO_Tree return; } } - PPL_ASSERT(!last_i.itr.is_at_end()); while (!i.itr.is_at_end() && !j.itr.is_at_end()) if (i->first == j->first) { g(i->second, j->second); - last_i = i; ++i; ++j; } else if (i->first < j->first) { f(i->second); - last_i = i; ++i; } else { - last_i = find_create(j->first, last_i); - h(last_i->second, j->second); - i = last_i; - ++i; + --i; + find_create_hint_assign(j->first, i); + h(i->second, j->second); if (this == &y) - j = last_i; + j = i; + ++i; ++j; } while (!i.itr.is_at_end()) { f(i->second); ++i; } - while (!j.itr.is_at_end()) { - last_i = find_create(j->first, last_i); - h(last_i->second, j->second); - ++j; + if (!j.itr.is_at_end()) { + --i; + while (!j.itr.is_at_end()) { + find_create_hint_assign(j->first, i); + h(i->second, j->second); + ++j; + } } }

1 0

[GIT] ppl/ppl(sparse_matrices): MIP_Problem:: use lower_bound_hint_assign() in steepest_edge_float_entering_index().
by Marco Poletti 25 Apr '10

25 Apr '10

Module: ppl/ppl Branch: sparse_matrices Commit: ad7ead07cfb5be5f6918629ac9f53cd74e98e264 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ad7ead07cfb5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Apr 25 12:42:40 2010 +0200 MIP_Problem:: use lower_bound_hint_assign() in steepest_edge_float_entering_index(). --- src/MIP_Problem.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index e911745..c9e611d 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -1049,7 +1049,7 @@ PPL::MIP_Problem::steepest_edge_float_entering_index() const { break; PPL_ASSERT(j->first <= *k); if (j->first < *k) - j = tableau_i.lower_bound(*k, j); + tableau_i.lower_bound_hint_assign(*k, j); else { const Coefficient& tableau_ij = j->second; WEIGHT_BEGIN();

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 24 Apr '10

24 Apr '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=74103cefa1c2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:32:39 2010 +0200 Unlimited_Sparse_Row_Over_CO_Tree: optimize combine_needs_first(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c3f08c216992… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:22:36 2010 +0200 Sparse_Row, Sparse_Row_Reference: add find_create_[hint_]assign(), lower_bound_[hint_]assign() and find_[hint_]assign() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d202a91f779… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:22:11 2010 +0200 Dense_Row: add find_create_[hint_]assign(), lower_bound_[hint_]assign() and find_[hint_]assign() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3bdb3eb426ef… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:21:41 2010 +0200 Unlimited_Sparse_Row_Over_CO_Tree: add find_create_[hint_]assign(), lower_bound_[hint_]assign() and find_[hint_]assign() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bc6407e0be1c… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:21:13 2010 +0200 Unlimited_Sparse_Row_Over_Linear_Sequence: add find_create_[hint_]assign(), lower_bound_[hint_]assign() and find_[hint_]assign() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fbf8dea0ebfe… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Apr 20 20:19:22 2010 +0200 CO_Tree: add insert_hint(), insert_precise() and insert() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=57f9c8d7ed8e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Apr 19 21:05:47 2010 +0200 MIP_Problem: optimize steepest_edge_float_entering_index (#3). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=490a2446c104… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Apr 19 20:53:12 2010 +0200 MIP_Problem: optimize steepest_edge_float_entering_index (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1363ad8ffcd3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Apr 19 19:30:41 2010 +0200 CO_Tree: split data array in two parts, avoiding some cache misses. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b067699ac647… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Apr 19 19:15:39 2010 +0200 MIP_Problem: optimize steepest_edge_float_entering_index().

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 23 Apr '10

23 Apr '10

Module: ppl/ppl Branch: master Commit: 140b42a24737edb642cfaeae5a6c7355e1724986 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=140b42a24737… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Apr 23 08:33:56 2010 +0200 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 97c2a72..cf12df1 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.11pre23], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre24], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Put under git control.
by Enea Zaffanella 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: b75b69c4ea3e6f5bd1fb293f5eb89ba855252415 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b75b69c4ea3e… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Apr 23 00:51:39 2010 +0200 Put under git control. --- src/Partial_Function.cc | 41 ++++++++++++++++++ src/Partial_Function.defs.hh | 86 +++++++++++++++++++++++++++++++++++++ src/Partial_Function.inlines.hh | 89 +++++++++++++++++++++++++++++++++++++++ src/Partial_Function.types.hh | 21 +++++++++ 4 files changed, 237 insertions(+), 0 deletions(-) diff --git a/src/Partial_Function.cc b/src/Partial_Function.cc new file mode 100644 index 0000000..c38a89d --- /dev/null +++ b/src/Partial_Function.cc @@ -0,0 +1,41 @@ +/* Implementation of class Partial_Function (non-inline functions). + Copyright (C) 2001-2010 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/ . */ + +#include <ppl-config.h> +#include "Partial_Function.defs.hh" +#include "Variable.defs.hh" +#include <iostream> + +namespace Parma_Polyhedra_Library { + +void +Partial_Function::print(std::ostream& s) const { + using namespace Parma_Polyhedra_Library::IO_Operators; + if (has_empty_codomain()) + s << "empty" << std::endl; + else + for (dimension_type i = 0, i_end = vec.size(); i < i_end; ++i) + if (vec[i] != not_a_dimension()) + s << Variable(i) << " --> " << Variable(vec[i]) << "\n"; +} + +} // namespace Parma_Polyhedra_Library diff --git a/src/Partial_Function.defs.hh b/src/Partial_Function.defs.hh new file mode 100644 index 0000000..a500902 --- /dev/null +++ b/src/Partial_Function.defs.hh @@ -0,0 +1,86 @@ +/* Partial_Function class declaration. + Copyright (C) 2001-2010 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/ . */ + +#ifndef PPL_Partial_Function_defs_hh +#define PPL_Partial_Function_defs_hh 1 + +#include "Partial_Function.types.hh" +#include "globals.defs.hh" +#include <vector> +#ifndef NDEBUG +#include <set> +#endif +#include <iosfwd> + +namespace Parma_Polyhedra_Library { + +class Partial_Function { +public: + /*! \brief + Default constructor: builds a function with empty codomain + (i.e., always undefined). + */ + Partial_Function(); + + /*! \brief + Returns \c true if and only if the represented partial function + has an empty codomain (i.e., it is always undefined). + */ + bool has_empty_codomain() const; + + /*! \brief + If the codomain is \e not empty, returns the maximum value in it. + + \exception std::runtime_error + Thrown if called when \p *this has an empty codomain. + */ + dimension_type max_in_codomain() const; + + /*! \brief + If \p *this maps \p i to a value \c k, assigns \c k to \p j and + returns \c true; otherwise, \p j is unchanged and \c false is returned. + */ + bool maps(dimension_type i, dimension_type& j) const; + + void print(std::ostream& s) const; + + /*! \brief + Modifies \p *this so that \p i is mapped to \p j. + + \exception std::runtime_error + Thrown if \p *this is already mapping \p j. + */ + void insert(dimension_type i, dimension_type j); + +private: + std::vector<dimension_type> vec; + dimension_type max; +#ifndef NDEBUG + std::set<dimension_type> codomain; +#endif +}; // class Partial_Function + +} // namespace Parma_Polyhedra_Library + +#include "Partial_Function.inlines.hh" + +#endif // !defined(PPL_Partial_Function_defs_hh) diff --git a/src/Partial_Function.inlines.hh b/src/Partial_Function.inlines.hh new file mode 100644 index 0000000..bffc8ad --- /dev/null +++ b/src/Partial_Function.inlines.hh @@ -0,0 +1,89 @@ +/* Partial_Function class implementation: inline functions. + Copyright (C) 2001-2010 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/ . */ + +#ifndef PPL_Partial_Function_inlines_hh +#define PPL_Partial_Function_inlines_hh 1 + +#include <stdexcept> +#include <cassert> + +namespace Parma_Polyhedra_Library { + +inline +Partial_Function::Partial_Function() + : max(0) { +} + +inline bool +Partial_Function::has_empty_codomain() const { + PPL_ASSERT(vec.empty() == codomain.empty()); + return vec.empty(); +} + +inline dimension_type +Partial_Function::max_in_codomain() const { + if (has_empty_codomain()) + throw std::runtime_error("Partial_Function::max_in_codomain() called" + " when has_empty_codomain()"); + PPL_ASSERT(codomain.begin() != codomain.end() + && max == *codomain.rbegin()); + return max; +} + +inline void +Partial_Function::insert(dimension_type i, dimension_type j) { +#ifndef NDEBUG + // The partial function has to be an injective map. + std::pair<std::set<dimension_type>::iterator, bool> s = codomain.insert(j); + PPL_ASSERT(s.second); +#endif // #ifndef NDEBUG + + // Expand `vec' if needed. + const dimension_type sz = vec.size(); + if (i >= sz) + vec.insert(vec.end(), i - sz + 1, not_a_dimension()); + + // We cannot remap the same index to another one. + PPL_ASSERT(i < vec.size() && vec[i] == not_a_dimension()); + vec[i] = j; + + // Maybe update `max'. + if (j > max) + max = j; + PPL_ASSERT(codomain.begin() != codomain.end() + && max == *codomain.rbegin()); +} + +inline bool +Partial_Function::maps(dimension_type i, dimension_type& j) const { + if (i >= vec.size()) + return false; + dimension_type vec_i = vec[i]; + if (vec_i == not_a_dimension()) + return false; + j = vec_i; + return true; +} + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_Partial_Function_inlines_hh) diff --git a/src/Partial_Function.types.hh b/src/Partial_Function.types.hh new file mode 100644 index 0000000..8146ca2 --- /dev/null +++ b/src/Partial_Function.types.hh @@ -0,0 +1,21 @@ +/* Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is free software; as a special exception the author gives +unlimited permission to copy and/or distribute it, with or without +modifications, as long as this notice is preserved. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. */ + +#ifndef PPL_Partial_Function_types_hh +#define PPL_Partial_Function_types_hh 1 + +namespace Parma_Polyhedra_Library { + +class Partial_Function; + +} // namespace Parma_Polyhedra_Library + +#endif // !defined(PPL_Partial_Function_types_hh)

1 0

[GIT] ppl/ppl(master): Added class Partial_Function to the PPL library.
by Enea Zaffanella 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: d882d4ea5dbe6220418ff85252035c2b14b9a20d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d882d4ea5dbe… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 23:59:57 2010 +0200 Added class Partial_Function to the PPL library. Java, Prolog and OCaml interfaces now use an object of this Partial_Function class when mapping the space dimensions of teh vector space. Some of the consistency checks that were performed by other variants of Partial_Function are now only done when in debugging mode. --- interfaces/Java/jni/ppl_java_common.inlines.hh | 81 -------------------- interfaces/OCaml/ppl_ocaml_common.cc | 51 ------------ interfaces/OCaml/ppl_ocaml_common.defs.hh | 18 ----- interfaces/OCaml/ppl_ocaml_common.inlines.hh | 47 ----------- .../ppl_interface_generator_prolog_cc_code.m4 | 3 +- interfaces/Prolog/ppl_prolog_common.defs.hh | 50 ------------ interfaces/Prolog/tests/pl_check.pl | 5 - src/Affine_Space.defs.hh | 4 +- src/Any_Pointset.defs.hh | 4 +- src/BD_Shape.defs.hh | 4 +- src/Box.defs.hh | 4 +- src/Grid.defs.hh | 4 +- src/Makefile.am | 4 + src/Octagonal_Shape.defs.hh | 4 +- src/Polyhedron.defs.hh | 4 +- tests/Makefile.am | 6 +- tests/Partial_Function.cc | 80 ------------------- tests/Partial_Function.defs.hh | 61 --------------- tests/Partial_Function.inlines.hh | 44 ----------- tests/Partial_Function.types.hh | 25 ------ tests/ppl_test.cc | 2 +- tests/ppl_test.hh | 39 +++++----- 22 files changed, 41 insertions(+), 503 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d882d4ea…

1 0

[GIT] ppl/ppl(master): Fixed expected results for tests/Octagonal_Shape/ writeoctagon1.cc
by Enea Zaffanella 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: 5b80536886e308d776ad8c08b30c2d0e8b73f66c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5b80536886e3… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 15:20:33 2010 +0200 Fixed expected results for tests/Octagonal_Shape/writeoctagon1.cc --- tests/Octagonal_Shape/writeoctagon1.cc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Octagonal_Shape/writeoctagon1.cc b/tests/Octagonal_Shape/writeoctagon1.cc index 14853bb..3535387 100644 --- a/tests/Octagonal_Shape/writeoctagon1.cc +++ b/tests/Octagonal_Shape/writeoctagon1.cc @@ -40,7 +40,7 @@ test01() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "A - B == 4, A + B == 3"; + return s.str() == "A - B = 4, A + B = 3"; } bool @@ -57,7 +57,7 @@ test02() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "A - B == 5, A + B == -1"; + return s.str() == "A - B = 5, A + B = -1"; } bool @@ -109,7 +109,7 @@ test05() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "A - B == 4"; + return s.str() == "A - B = 4"; } bool @@ -127,7 +127,7 @@ test06() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "A + B == 3"; + return s.str() == "A + B = 3"; } bool @@ -171,7 +171,7 @@ test09() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "2*A == 3, 2*B == 1, A - B == 1, A + B == 2"; + return s.str() == "2*A = 3, 2*B = 1, A - B = 1, A + B = 2"; } bool @@ -191,7 +191,7 @@ test10() { nout << "*** s << oc ***" << endl << "`" << s.str() << "'" << endl; - return s.str() == "A == 3/2, B == 1/2, A - B == 1, A + B == 2"; + return s.str() == "A = 3/2, B = 1/2, A - B = 1, A + B = 2"; } } // namespace

1 0

[GIT] ppl/ppl(master): Use a C++ object to encode a Partial_Function in the Java interface.
by Enea Zaffanella 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: c976419bcc8f082a6a0e4fd543ecc09994e03e7e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c976419bcc8f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 14:42:20 2010 +0200 Use a C++ object to encode a Partial_Function in the Java interface. Current implementation is based on a copy of the Partial_Function type used in C++ tests: we should consider whether or not it would be appropriate to have this Partial_Function type as a first class PPL object. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 5 +- interfaces/Java/jni/ppl_java_common.defs.hh | 31 ------ interfaces/Java/jni/ppl_java_common.inlines.hh | 99 +++++++++++++------- interfaces/Java/jni/ppl_java_globals.cc | 82 ++++++++++++++++- .../Java/parma_polyhedra_library/Makefile.am | 8 +- .../parma_polyhedra_library/Partial_Function.java | 42 ++++++-- interfaces/Java/tests/C_Polyhedron_test1.java | 2 +- interfaces/Java/tests/Makefile.am | 2 - interfaces/Java/tests/Test_Partial_Function.java | 60 ------------ interfaces/Java/tests/ppl_java_tests_common | 4 +- 10 files changed, 186 insertions(+), 149 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c976419b…

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: 64faa9223236a2a38b714c2c22830fe80b84831f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=64faa9223236… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Apr 22 10:17:09 2010 +0200 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index c4744c0..97c2a72 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.11pre22], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre23], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0