April 2010 - PPL-devel - BUGSENG Mailman

[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 23 Apr '10

23 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 23 Apr '10

23 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

[GIT] ppl/ppl(master): Modified signature of method maps() in Java Partial_Function interface.
by Enea Zaffanella 22 Apr '10

22 Apr '10

Module: ppl/ppl Branch: master Commit: c30a06c1bbee850d1ef6d74e23e6d77073578911 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c30a06c1bbee… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 22 10:05:12 2010 +0200 Modified signature of method maps() in Java Partial_Function interface. Modified test implementation in tests/Test_Partial_Function.java accordingly (note though that TreeMap still uses Long objects). --- interfaces/Java/jni/ppl_java_common.inlines.hh | 20 ++++---------------- .../parma_polyhedra_library/Partial_Function.java | 8 ++++---- interfaces/Java/tests/Test_Partial_Function.java | 11 +++++------ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_common.inlines.hh b/interfaces/Java/jni/ppl_java_common.inlines.hh index d96681b..f449495 100644 --- a/interfaces/Java/jni/ppl_java_common.inlines.hh +++ b/interfaces/Java/jni/ppl_java_common.inlines.hh @@ -278,24 +278,12 @@ inline bool Partial_Function::maps(dimension_type i, dimension_type& j) const { jclass j_p_func_class = env->GetObjectClass(j_p_func); CHECK_RESULT_ASSERT(env, j_p_func_class); - jobject coeff = j_long_to_j_long_class(env, 0); - jobject new_by_ref = env->NewObject(cached_classes.By_Reference, - cached_FMIDs.By_Reference_init_ID, - coeff); - CHECK_RESULT_THROW(env, new_by_ref); - jmethodID j_maps_id - = env->GetMethodID(j_p_func_class, "maps", - "(Ljava/lang/Long;" - "Lparma_polyhedra_library/By_Reference;)Z"); + jmethodID j_maps_id = env->GetMethodID(j_p_func_class, "maps", "(J)J"); CHECK_RESULT_ASSERT(env, j_maps_id); - jboolean b = env->CallBooleanMethod(j_p_func, j_maps_id, - j_long_to_j_long_class(env, i), - new_by_ref); + jlong j_long_value = env->CallLongMethod(j_p_func, j_maps_id, i); CHECK_EXCEPTION_THROW(env); - if (b) { - jobject long_value = get_by_reference(env, new_by_ref); - j = jtype_to_unsigned<dimension_type>(j_long_class_to_j_long(env, - long_value)); + if (j_long_value >= 0) { + j = jtype_to_unsigned<dimension_type>(j_long_value); return true; } return false; diff --git a/interfaces/Java/parma_polyhedra_library/Partial_Function.java b/interfaces/Java/parma_polyhedra_library/Partial_Function.java index 782731d..323a352 100644 --- a/interfaces/Java/parma_polyhedra_library/Partial_Function.java +++ b/interfaces/Java/parma_polyhedra_library/Partial_Function.java @@ -50,10 +50,10 @@ public interface Partial_Function { long max_in_codomain(); /*! \brief - Sets \p j to the value (if any) of the partial function on index \p i. + If the partial function is defined on index \p i, returns its value. - The function returns \c true if and only if the partial function - is defined on domain value \p i. + The function returns a negative value if the partial function + is not defined on domain value \p i. */ - boolean maps(Long i, By_Reference<Long> j); + long maps(long i); } diff --git a/interfaces/Java/tests/Test_Partial_Function.java b/interfaces/Java/tests/Test_Partial_Function.java index cdff40b..7375851 100644 --- a/interfaces/Java/tests/Test_Partial_Function.java +++ b/interfaces/Java/tests/Test_Partial_Function.java @@ -37,12 +37,11 @@ public class Test_Partial_Function implements Partial_Function { max = 0; } - public boolean maps(Long i, By_Reference<Long> j) { - if (map.containsKey(i)) { - j.set(map.get(i)); - return true; - } - return false; + public long maps(long i) { + if (map.containsKey(i)) + return map.get(i); + else + return -1; } public long max_in_codomain() {

1 0

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

21 Apr '10

Module: ppl/ppl Branch: master Commit: 212a7409b92992e7b8275819676710e16224158c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=212a7409b929… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:55:53 2010 +0200 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index c690827..c4744c0 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.11pre21], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre22], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Fixed the printing of equality constraints.
by Roberto Bagnara 21 Apr '10

21 Apr '10

Module: ppl/ppl Branch: master Commit: a04daee5e4dcef68794ef5be1d5c412d29803a09 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a04daee5e4dc… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Apr 21 18:54:32 2010 +0200 Fixed the printing of equality constraints. --- src/BD_Shape.templates.hh | 10 +++++----- src/Octagonal_Shape.templates.hh | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index 02eec79..bbb5e1b 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -5311,7 +5311,7 @@ BD_Shape<T>::generalized_affine_image(const Variable var, "*this is a BD_Shape"); if (relsym == EQUAL) { - // The relation symbol is "==": + // The relation symbol is "=": // this is just an affine image computation. affine_image(var, expr, denominator); return; @@ -5893,7 +5893,7 @@ BD_Shape<T>::generalized_affine_preimage(const Variable var, "*this is a BD_Shape"); if (relsym == EQUAL) { - // The relation symbol is "==": + // The relation symbol is "=": // this is just an affine preimage computation. affine_preimage(var, expr, denominator); return; @@ -6432,7 +6432,7 @@ IO_Operators::operator<<(std::ostream& s, const BD_Shape<T>& c) { if (i == 0) { // We have got a equality constraint with one variable. s << Variable(j - 1); - s << " == " << c_i_j; + s << " = " << c_i_j; } else { // We have got a equality constraint with two variables. @@ -6440,13 +6440,13 @@ IO_Operators::operator<<(std::ostream& s, const BD_Shape<T>& c) { s << Variable(j - 1); s << " - "; s << Variable(i - 1); - s << " == " << c_i_j; + s << " = " << c_i_j; } else { s << Variable(i - 1); s << " - "; s << Variable(j - 1); - s << " == " << c_j_i; + s << " = " << c_j_i; } } } diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 7dfb781..4b76797 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -5718,7 +5718,7 @@ Octagonal_Shape<T> "*this is an Octagonal_Shape"); if (relsym == EQUAL) { - // The relation symbol is "==": + // The relation symbol is "=": // this is just an affine image computation. affine_image(var, expr, denominator); return; @@ -6686,7 +6686,7 @@ Octagonal_Shape<T> "*this is an Octagonal_Shape"); if (relsym == EQUAL) { - // The relation symbol is "==": + // The relation symbol is "=": // this is just an affine preimage computation. affine_preimage(var, expr, denominator); return; @@ -7699,11 +7699,11 @@ IO_Operators::operator<<(std::ostream& s, const Octagonal_Shape<T>& x) { else s << ", "; // If the value bound can NOT be divided by 2 exactly, - // then we output the constraint `2*v_i == bound'. + // then we output the constraint `2*v_i = bound'. if (div_2exp_assign_r(half, x_ii_i, 1, ROUND_UP | ROUND_STRICT_RELATION) == V_EQ) - s << v_i << " == " << half; + s << v_i << " = " << half; else - s << "2*" << v_i << " == " << x_ii_i; + s << "2*" << v_i << " = " << x_ii_i; } else { // We will print unary non-strict inequalities, if any. @@ -7759,9 +7759,9 @@ IO_Operators::operator<<(std::ostream& s, const Octagonal_Shape<T>& x) { else s << ", "; if (sgn(x_i_j) >= 0) - s << v_j << " - " << v_i << " == " << x_i_j; + s << v_j << " - " << v_i << " = " << x_i_j; else - s << v_i << " - " << v_j << " == " << x_ii_jj; + s << v_i << " - " << v_j << " = " << x_ii_jj; } else { // We will print non-strict inequalities, if any. @@ -7801,7 +7801,7 @@ IO_Operators::operator<<(std::ostream& s, const Octagonal_Shape<T>& x) { first = false; else s << ", "; - s << v_j << " + " << v_i << " == " << x_ii_j; + s << v_j << " + " << v_i << " = " << x_ii_j; } else { // We will print non-strict inequalities, if any.

1 0