February 2011 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Fixed a number of wrong conditionals.
by Roberto Bagnara 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: b4e8a607e5a61dd8a9e9b0da3f30a405371bb2ed URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4e8a607e5a6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 14 16:45:57 2011 +0100 Fixed a number of wrong conditionals. --- interfaces/Prolog/Ciao/Makefile.am | 8 ++------ interfaces/Prolog/GNU/Makefile.am | 12 ++++++------ interfaces/Prolog/SICStus/Makefile.am | 20 ++++++-------------- interfaces/Prolog/SWI/Makefile.am | 24 ++++++++---------------- interfaces/Prolog/XSB/Makefile.am | 10 +++------- interfaces/Prolog/YAP/Makefile.am | 10 +++++----- 6 files changed, 30 insertions(+), 54 deletions(-) diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am index ec2c121..50ff920 100644 --- a/interfaces/Prolog/Ciao/Makefile.am +++ b/interfaces/Prolog/Ciao/Makefile.am @@ -225,14 +225,10 @@ ciao_clpq2: .libs/libppl_ciao.so ppl_ciao.po ciao_clpq.pl ../tests/clpq2.pl | ci ciao_prolog_generated_test: .libs/libppl_ciao.so ppl_ciao.po ciao_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl | ciao_pl_check - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl .; \ - fi + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . cp -f ../tests/ppl_prolog_generated_test_main.pl . ciaoc -o $@ ciao_prolog_generated_test.pl - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi + rm -f ppl_prolog_generated_test_common.pl rm -f ppl_prolog_generated_test_main.pl CLPQ_TESTS_NONSTRICT = \ diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am index c772687..f0ebf97 100644 --- a/interfaces/Prolog/GNU/Makefile.am +++ b/interfaces/Prolog/GNU/Makefile.am @@ -282,11 +282,11 @@ clpq2_test: gp_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2 ppl_prolog_generated_test: gnu_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + if [ $(abs_srcdir) != `pwd` ]; then \ cp -f $(srcdir)/gnu_prolog_generated_test.pl . ; \ fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ + cp -f ../tests/ppl_prolog_generated_test_main.pl . echo "['ppl_prolog_generated_test_main.pl', 'gnu_prolog_generated_test.pl']." \ >script_pgt echo "main." >>script_pgt @@ -295,11 +295,11 @@ ppl_prolog_generated_test: gnu_prolog_generated_test.pl ../tests/ppl_prolog_gen $(WATCHDOG_DLOPEN) \ -dlopen libppl_gprolog.la \ ./ppl_gprolog <script_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ + rm -f ppl_prolog_generated_test_common.pl + if [ $(abs_srcdir) != `pwd` ]; then \ rm -f gnu_prolog_generated_test.pl; \ fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt CLEANFILES = \ diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am index b4d7146..b8e0f57 100644 --- a/interfaces/Prolog/SICStus/Makefile.am +++ b/interfaces/Prolog/SICStus/Makefile.am @@ -263,18 +263,14 @@ endif !ASSERTIONS_ENABLED check-local: pl_check_test clpq_test clpq2_test ppl_prolog_generated_test pl_check_test: ppl_sicstus ppl_sicstus.pl sp_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/pl_check.pl . ;\ - fi + cp -f $(srcdir)/../tests/pl_check.pl . $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ ./ppl_sicstus -l $(srcdir)/sp_pl_check.pl \ --goal "main." \ >obtained_pchk - if [ $(srcdir) != `pwd` ]; then \ - rm -f pl_check.pl ;\ - fi + rm -f pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk $(CLPQ_TESTS): @@ -303,20 +299,16 @@ clpq2_test: ppl_sicstus ppl_sicstus.pl sp_clpq.pl ../tests/clpq2.pl ../tests/scr diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2 ppl_prolog_generated_test: ppl_sicstus ppl_sicstus.pl sp_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + cp -f ../tests/ppl_prolog_generated_test_main.pl . $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ ./ppl_sicstus -l $(srcdir)/sp_prolog_generated_test.pl \ --goal "main." \ >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt CLEANFILES = \ diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 078fac0..dfebe4d 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -276,18 +276,14 @@ endif !ASSERTIONS_ENABLED check-local: pl_check_test clpq_test clpq2_test ppl_prolog_generated_test pl_check_test: swi_pl_check.pl ../tests/pl_check.pl $(EXPECTED_PCHK) - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/pl_check.pl . ; \ - fi ;\ - echo "ensure_loaded('$(srcdir)/swi_pl_check'). main." > script_pchk + cp -f $(srcdir)/../tests/pl_check.pl . + echo "ensure_loaded('$(srcdir)/swi_pl_check'). main." > script_pchk $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ -dlopen libppl_swiprolog.la \ $(CHECKER) ./ppl_pl < script_pchk - if [ $(srcdir) != `pwd` ]; then \ - rm -f pl_check.pl; \ - fi + rm -f pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk $(CLPQ_TESTS): @@ -310,20 +306,16 @@ clpq2_test: pl_clpq2 ../tests/script_clpq2 $(EXPECTED_CLPQ2) $(CLPQ_TESTS) diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2 ppl_prolog_generated_test: swi_prolog_generated_test.pl ../tests/ppl_prolog_generated_test_main.pl ../tests/ppl_prolog_generated_test_common.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi - cp -f ../tests/ppl_prolog_generated_test_main.pl . ; \ - echo "ensure_loaded('$(srcdir)/swi_prolog_generated_test'). main." > script_pgt + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + cp -f ../tests/ppl_prolog_generated_test_main.pl . + echo "ensure_loaded('$(srcdir)/swi_prolog_generated_test'). main." > script_pgt $(LIBTOOL) --mode=execute \ -dlopen ../../../src/libppl.la \ $(WATCHDOG_DLOPEN) \ -dlopen libppl_swiprolog.la \ $(CHECKER) ./ppl_pl <script_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ - fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt CLEANFILES = \ diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am index d5bff8b..4db977c 100644 --- a/interfaces/Prolog/XSB/Makefile.am +++ b/interfaces/Prolog/XSB/Makefile.am @@ -286,9 +286,7 @@ pl_check_test: libppl_xsb.la ppl_xsb.xwam xsb_pl_check.P ../tests/pl_check.pl diff -u --ignore-all-space $(EXPECTED_PCHK) obtained_pchk ppl_prolog_generated_test: libppl_xsb.la ppl_xsb.xwam xsb_prolog_generated_test.P ../tests/ppl_prolog_generated_test_main.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ - fi + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . cp -f ../tests/ppl_prolog_generated_test_main.pl . rm -f xsb_prolog_generated_test.xwam $(LIBTOOL) --mode=execute \ @@ -296,10 +294,8 @@ ppl_prolog_generated_test: libppl_xsb.la ppl_xsb.xwam xsb_prolog_generated_test. $(WATCHDOG_DLOPEN) \ xsb xsb_prolog_generated_test \ >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl ; \ - fi - rm -f ppl_prolog_generated_test_main.pl ; \ + rm -f ppl_prolog_generated_test_common.pl + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am index dd133ce..c71adac 100644 --- a/interfaces/Prolog/YAP/Makefile.am +++ b/interfaces/Prolog/YAP/Makefile.am @@ -249,8 +249,8 @@ clpq2_test: yap_clpq2.pl ppl_yap.pl ../tests/clpq2.pl ../tests/script_clpq2 $(EX diff -u --ignore-all-space $(EXPECTED_CLPQ2) obtained_clpq2 ppl_prolog_generated_test: yap_prolog_generated_test.pl ppl_yap.pl ../tests/expected_pgt - if [ $(srcdir) != `pwd` ]; then \ - cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . ; \ + cp -f $(srcdir)/../tests/ppl_prolog_generated_test_common.pl . + if [ $(abs_srcdir) != `pwd` ]; then \ cp -f $(srcdir)/yap_prolog_generated_test.pl . ; \ cp -f $(srcdir)/ppl_yap.pl . ; \ fi @@ -262,12 +262,12 @@ ppl_prolog_generated_test: yap_prolog_generated_test.pl ppl_yap.pl ../tests/exp -dlopen ppl_yap.la \ $(YAP_PROLOG) -l yap_prolog_generated_test.pl \ <script_pgt >obtained_pgt - if [ $(srcdir) != `pwd` ]; then \ - rm -f ppl_prolog_generated_test_common.pl; \ + rm -f ppl_prolog_generated_test_common.pl + if [ $(abs_srcdir) != `pwd` ]; then \ rm -f yap_prolog_generated_test.pl; \ rm -f ppl_yap.pl; \ fi - rm -f ppl_prolog_generated_test_main.pl; \ + rm -f ppl_prolog_generated_test_main.pl diff -u --ignore-all-space $(srcdir)/../tests/expected_pgt obtained_pgt endif ENABLE_SHARED

1 0

[GIT] ppl/ppl(master): Minor improvements to documentation.
by Enea Zaffanella 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: 5147bf4e1914c62a956ab336f2dbf4f20ebe3e5b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5147bf4e1914… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 14 16:45:38 2011 +0100 Minor improvements to documentation. --- src/PIP_Problem.cc | 2 +- src/PIP_Tree.defs.hh | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 5ba2d30..eb9ff4d 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -230,7 +230,7 @@ PPL::PIP_Problem::solve() const { initial_context, parameters, external_space_dim, - /* rec_depth=*/ 0); + /*indent_level=*/ 0); // Update problem status. x.status = (x.current_solution) ? OPTIMIZED : UNSATISFIABLE; diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 3dec637..f526376 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -451,24 +451,24 @@ private: suitable for pivoting than the \f$(i',j')\f$ pair \param mapping - the PIP_Solution_Node::mapping vector for the tableau + The PIP_Solution_Node::mapping vector for the tableau. \param basis - the PIP_Solution_Node::basis vector for the tableau + The PIP_Solution_Node::basis vector for the tableau. \param i - the row number for the first pivot row and column pair to be compared + The row number for the first pivot row and column pair to be compared. \param j - the column number for the first pivot row and column pair to be - compared + The column number for the first pivot row and column pair to be + compared. \param i_ - the row number for the second pivot row and column pair to be compared + The row number for the second pivot row and column pair to be compared. \param j_ - the column number for the second pivot row and column pair to be - compared + The column number for the second pivot row and column pair to be + compared. */ bool is_better_pivot(const std::vector<dimension_type>& mapping, const std::vector<bool>& basis, @@ -657,19 +657,19 @@ protected: Generate a Gomory cut using non-integer tableau row \p i. \param i - Row index in simplex tableau from which the cut is generated + Row index in simplex tableau from which the cut is generated. \param parameters A std::set of the current parameter dimensions (including artificials); - to be updated if a new artificial parameter is to be created + to be updated if a new artificial parameter is to be created. \param context A set of linear inequalities on the parameters, in matrix form; to be - updated if a new artificial parameter is to be created + updated if a new artificial parameter is to be created. \param space_dimension The current space dimension, including variables and all parameters; to - be updated if an extra parameter is to be created + be updated if an extra parameter is to be created. \param indent_level The indentation level (for debugging output only).

1 0

[GIT] ppl/ppl(ppl-0_11-branch): Updated expected results.
by Enea Zaffanella 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: ppl-0_11-branch Commit: 76edc5e8cf411542fc0cb999ef014bb3e7364306 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=76edc5e8cf41… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 14 16:22:20 2011 +0100 Updated expected results. --- demos/ppl_pips/expected_int16 | 8 ++++---- demos/ppl_pips/expected_int16_a | 8 ++++---- demos/ppl_pips/expected_int32 | 12 ++++++------ demos/ppl_pips/expected_int32_a | 12 ++++++------ demos/ppl_pips/expected_int64 | 8 ++++---- demos/ppl_pips/expected_int64_a | 8 ++++---- demos/ppl_pips/expected_int8 | 2 +- demos/ppl_pips/expected_int8_a | 2 +- tests/PIP_Problem/pipproblem1.cc | 10 +++++----- 9 files changed, 35 insertions(+), 35 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=76edc5e8…

1 0

[GIT] ppl/ppl(ppl-0_11-branch): The resolution process for PIP_Problem now better exploits the
by Enea Zaffanella 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: ppl-0_11-branch Commit: d3bfbcbfbc4f16ac4ba5e59069aa9fd6258dad97 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3bfbcbfbc4f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 14 12:28:30 2011 +0100 The resolution process for PIP_Problem now better exploits the integrality of parameters to simplify the newly generated tautological constraints, the splitting constraints of decision nodes, and the expressions defining artificial parameters. --- src/PIP_Problem.cc | 3 +- src/PIP_Tree.cc | 347 ++++++++++++++++++++++++++++++++++++----------- src/PIP_Tree.defs.hh | 3 +- src/PIP_Tree.inlines.hh | 17 --- 4 files changed, 272 insertions(+), 98 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d3bfbcbf…

1 0

[GIT] ppl/ppl(ppl-0_11-branch): Document parameter indent_level in PIP_Tree_Node::solve().
by Enea Zaffanella 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: ppl-0_11-branch Commit: 1ff736620c63bfdf93ab33b05a890b86dd32820c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1ff736620c63… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 14 11:57:05 2011 +0100 Document parameter indent_level in PIP_Tree_Node::solve(). --- src/PIP_Tree.defs.hh | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 77de2b8..dd630ed 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -203,12 +203,16 @@ protected: \param space_dim The space dimension of parent, including artificial parameters. + + \param indent_level + The indentation level (for debugging output only). */ virtual PIP_Tree_Node* solve(const PIP_Problem& pip, bool check_feasible_context, const Matrix& context, const Variables_Set& params, - dimension_type space_dim) = 0; + dimension_type space_dim, + unsigned indent_level) = 0; //! Inserts a new parametric constraint in internal Row format void add_constraint(const Row& x, const Variables_Set& parameters); @@ -642,25 +646,29 @@ protected: bool check_feasible_context, const Matrix& context, const Variables_Set& params, - dimension_type space_dim); + dimension_type space_dim, + unsigned indent_level); /*! \brief Generate a Gomory cut using non-integer tableau row \p i. \param i - row index in simplex tableau from which the cut is generated + Row index in simplex tableau from which the cut is generated \param parameters - a std::set of the current parameter dimensions (including artificials); + A std::set of the current parameter dimensions (including artificials); to be updated if a new artificial parameter is to be created \param context - a set of linear inequalities on the parameters, in Matrix form; to be + A set of linear inequalities on the parameters, in matrix form; to be updated if a new artificial parameter is to be created \param space_dimension - the current space dimension, including variables and all parameters; to + The current space dimension, including variables and all parameters; to be updated if an extra parameter is to be created + + \param indent_level + The indentation level (for debugging output only). */ void generate_cut(dimension_type i, Variables_Set& parameters, @@ -776,7 +784,8 @@ protected: bool check_feasible_context, const Matrix& context, const Variables_Set& params, - dimension_type space_dim); + dimension_type space_dim, + unsigned indent_level); //! Prints on \p s the tree rooted in \p *this. virtual void print_tree(std::ostream& s,

1 0

[GIT] ppl/ppl(master): Copyright notices updated.
by Roberto Bagnara 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: d6bbae8773094c0890166e92ce379f37a612c628 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d6bbae877309… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Feb 14 13:01:50 2011 +0100 Copyright notices updated. --- interfaces/Prolog/tests/clpq.pl | 1 + interfaces/Prolog/tests/clpq2.pl | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/tests/clpq.pl b/interfaces/Prolog/tests/clpq.pl index cd87cd7..b798804 100644 --- a/interfaces/Prolog/tests/clpq.pl +++ b/interfaces/Prolog/tests/clpq.pl @@ -795,6 +795,7 @@ POSSIBILITY OF SUCH DAMAGES.\n'). common_main :- write('\ Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it>\n\ +Copyright (C) 2010-2011 BUGSENG srl (http://bugseng.com)\n\ this program is free software, covered by the GNU General Public License,\n\ and you are welcome to change it and/or distribute copies of it\n\ under certain conditions.\n\ diff --git a/interfaces/Prolog/tests/clpq2.pl b/interfaces/Prolog/tests/clpq2.pl index 6349949..250ad1a 100644 --- a/interfaces/Prolog/tests/clpq2.pl +++ b/interfaces/Prolog/tests/clpq2.pl @@ -1116,6 +1116,7 @@ POSSIBILITY OF SUCH DAMAGES.\n'). common_main :- write('\ Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it>\n\ +Copyright (C) 2010-2011 BUGSENG srl (http://bugseng.com)\n\ this program is free software, covered by the GNU General Public License,\n\ and you are welcome to change it and/or distribute copies of it\n\ under certain conditions.\n\

1 0

[GIT] ppl/ppl(master): Document parameter indent_level in PIP_Tree_Node:: solve().
by Enea Zaffanella 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: 0f42c4966e4c1add7feb83a3dcfd9c6f8fc68d23 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f42c4966e4c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Feb 14 11:57:05 2011 +0100 Document parameter indent_level in PIP_Tree_Node::solve(). --- src/PIP_Tree.defs.hh | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index e7de640..3dec637 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -205,13 +205,16 @@ protected: \param space_dim The space dimension of parent, including artificial parameters. + + \param indent_level + The indentation level (for debugging output only). */ virtual PIP_Tree_Node* solve(const PIP_Problem& pip, bool check_feasible_context, const Matrix& context, const Variables_Set& params, dimension_type space_dim, - unsigned recursion_depth) = 0; + unsigned indent_level) = 0; //! Inserts a new parametric constraint in internal row format void add_constraint(const Row& x, const Variables_Set& parameters); @@ -648,25 +651,28 @@ protected: const Matrix& context, const Variables_Set& params, dimension_type space_dim, - unsigned recursion_depth); + unsigned indent_level); /*! \brief Generate a Gomory cut using non-integer tableau row \p i. \param i - row index in simplex tableau from which the cut is generated + Row index in simplex tableau from which the cut is generated \param parameters - a std::set of the current parameter dimensions (including artificials); + A std::set of the current parameter dimensions (including artificials); to be updated if a new artificial parameter is to be created \param context - a set of linear inequalities on the parameters, in matrix form; to be + A set of linear inequalities on the parameters, in matrix form; to be updated if a new artificial parameter is to be created \param space_dimension - the current space dimension, including variables and all parameters; to + The current space dimension, including variables and all parameters; to be updated if an extra parameter is to be created + + \param indent_level + The indentation level (for debugging output only). */ void generate_cut(dimension_type i, Variables_Set& parameters, Matrix& context, dimension_type& space_dimension, @@ -781,7 +787,7 @@ protected: const Matrix& context, const Variables_Set& params, dimension_type space_dim, - unsigned recursion_depth); + unsigned indent_level); //! Prints on \p s the tree rooted in \p *this. virtual void print_tree(std::ostream& s, unsigned indent,

1 0

Minor bug in PPL test-suite
by J.S. van Bethlehem 14 Feb '11

14 Feb '11

Dear developers, Today I was trying to compile,test and install the PPL library. I ran the configure-script with the options --enable-check=thorough --enable-valgrind-tests After successfully configuring and compiling the library, I ran 'make check'. This gave the same valgrind-error in many tests (not sure if it happens in all tests): ==3786== '--num-callers' argument must be between 1 and 50 valgrind: Bad option '--num-callers=100'; aborting. valgrind: Use --help for more information. After replacing the --num-callers option in all Makefiles with --num-callers=12 (which is the valgrind default) everything seems to work fine. Although I still haven't ran the full test suite since it's REALLY big. (a little warning somewhere in the README or INSTALL file may be nice) Yours sincerely, Jakob van Bethlehem

2 1

[GIT] ppl/ppl(master): Added other plain char specializations.
by Abramo Bagnara 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: 5e75a70506117ff2375961fd7517345e8ecf3c90 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5e75a7050611… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 3 17:26:08 2011 +0100 Added other plain char specializations. --- src/checked.inlines.hh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/checked.inlines.hh b/src/checked.inlines.hh index 004511a..6bdf2f1 100644 --- a/src/checked.inlines.hh +++ b/src/checked.inlines.hh @@ -52,24 +52,42 @@ struct Safe_Conversion<T, T> : public True { #define PPL_SAFE_CONVERSION(To, From) \ template <> struct Safe_Conversion<To, From> : public True { } +#if PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed short, char); +#endif PPL_SAFE_CONVERSION(signed short, signed char); #if PPL_SIZEOF_CHAR < PPL_SIZEOF_SHORT +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed short, char); +#endif PPL_SAFE_CONVERSION(signed short, unsigned char); #endif +#if PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed int, char); +#endif PPL_SAFE_CONVERSION(signed int, signed char); PPL_SAFE_CONVERSION(signed int, signed short); #if PPL_SIZEOF_CHAR < PPL_SIZEOF_INT +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed int, char); +#endif PPL_SAFE_CONVERSION(signed int, unsigned char); #endif #if PPL_SIZEOF_SHORT < PPL_SIZEOF_INT PPL_SAFE_CONVERSION(signed int, unsigned short); #endif +#if PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed long, char); +#endif PPL_SAFE_CONVERSION(signed long, signed char); PPL_SAFE_CONVERSION(signed long, signed short); PPL_SAFE_CONVERSION(signed long, signed int); #if PPL_SIZEOF_CHAR < PPL_SIZEOF_LONG +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed long, char); +#endif PPL_SAFE_CONVERSION(signed long, unsigned char); #endif #if PPL_SIZEOF_SHORT < PPL_SIZEOF_LONG @@ -79,11 +97,17 @@ PPL_SAFE_CONVERSION(signed long, unsigned short); PPL_SAFE_CONVERSION(signed long, unsigned int); #endif +#if PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed long long, char); +#endif PPL_SAFE_CONVERSION(signed long long, signed char); PPL_SAFE_CONVERSION(signed long long, signed short); PPL_SAFE_CONVERSION(signed long long, signed int); PPL_SAFE_CONVERSION(signed long long, signed long); #if PPL_SIZEOF_CHAR < PPL_SIZEOF_LONG_LONG +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(signed long long, char); +#endif PPL_SAFE_CONVERSION(signed long long, unsigned char); #endif #if PPL_SIZEOF_SHORT < PPL_SIZEOF_LONG_LONG @@ -96,15 +120,27 @@ PPL_SAFE_CONVERSION(signed long long, unsigned int); PPL_SAFE_CONVERSION(signed long long, unsigned long); #endif +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(unsigned short, char); +#endif PPL_SAFE_CONVERSION(unsigned short, unsigned char); +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(unsigned int, char); +#endif PPL_SAFE_CONVERSION(unsigned int, unsigned char); PPL_SAFE_CONVERSION(unsigned int, unsigned short); +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(unsigned long, char); +#endif PPL_SAFE_CONVERSION(unsigned long, unsigned char); PPL_SAFE_CONVERSION(unsigned long, unsigned short); PPL_SAFE_CONVERSION(unsigned long, unsigned int); +#if !PPL_CXX_PLAIN_CHAR_IS_SIGNED +PPL_SAFE_CONVERSION(unsigned long long, char); +#endif PPL_SAFE_CONVERSION(unsigned long long, unsigned char); PPL_SAFE_CONVERSION(unsigned long long, unsigned short); PPL_SAFE_CONVERSION(unsigned long long, unsigned int); @@ -112,6 +148,7 @@ PPL_SAFE_CONVERSION(unsigned long long, unsigned long); #if PPL_SIZEOF_CHAR <= PPL_SIZEOF_FLOAT - 2 +PPL_SAFE_CONVERSION(float, char); PPL_SAFE_CONVERSION(float, signed char); PPL_SAFE_CONVERSION(float, unsigned char); #endif @@ -133,6 +170,7 @@ PPL_SAFE_CONVERSION(float, unsigned long long); #endif #if PPL_SIZEOF_CHAR <= PPL_SIZEOF_DOUBLE - 4 +PPL_SAFE_CONVERSION(double, char); PPL_SAFE_CONVERSION(double, signed char); PPL_SAFE_CONVERSION(double, unsigned char); #endif @@ -155,6 +193,7 @@ PPL_SAFE_CONVERSION(double, unsigned long long); PPL_SAFE_CONVERSION(double, float); #if PPL_SIZEOF_CHAR <= PPL_SIZEOF_LONG_DOUBLE - 4 +PPL_SAFE_CONVERSION(long double, char); PPL_SAFE_CONVERSION(long double, signed char); PPL_SAFE_CONVERSION(long double, unsigned char); #endif @@ -177,6 +216,7 @@ PPL_SAFE_CONVERSION(long double, unsigned long long); PPL_SAFE_CONVERSION(long double, float); PPL_SAFE_CONVERSION(long double, double); +PPL_SAFE_CONVERSION(mpz_class, char); PPL_SAFE_CONVERSION(mpz_class, signed char); PPL_SAFE_CONVERSION(mpz_class, signed short); PPL_SAFE_CONVERSION(mpz_class, signed int); @@ -188,6 +228,7 @@ PPL_SAFE_CONVERSION(mpz_class, unsigned int); PPL_SAFE_CONVERSION(mpz_class, unsigned long); //PPL_SAFE_CONVERSION(mpz_class, unsigned long long); +PPL_SAFE_CONVERSION(mpq_class, char); PPL_SAFE_CONVERSION(mpq_class, signed char); PPL_SAFE_CONVERSION(mpq_class, signed short); PPL_SAFE_CONVERSION(mpq_class, signed int);

1 0

[GIT] ppl/ppl(master): Added missing specializations for plain char.
by Roberto Bagnara 14 Feb '11

14 Feb '11

Module: ppl/ppl Branch: master Commit: e5f893b6c2cfc12755e3849ac485addcd3d03d68 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5f893b6c2cf… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Feb 3 17:11:20 2011 +0100 Added missing specializations for plain char. --- src/Checked_Number.defs.hh | 6 ++++++ src/Checked_Number.inlines.hh | 1 + src/Interval.inlines.hh | 5 +++++ src/checked_float.inlines.hh | 3 +++ src/checked_mpq.inlines.hh | 2 ++ src/checked_mpz.inlines.hh | 2 ++ src/checked_numeric_limits.hh | 2 ++ src/meta_programming.hh | 1 + 8 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/Checked_Number.defs.hh b/src/Checked_Number.defs.hh index 13ea995..767ba41 100644 --- a/src/Checked_Number.defs.hh +++ b/src/Checked_Number.defs.hh @@ -176,6 +176,9 @@ public: template <typename From, typename From_Policy> Checked_Number(const Checked_Number<From, From_Policy>& y, Rounding_Dir dir); + //! Direct initialization from a plain char and rounding mode. + Checked_Number(char y, Rounding_Dir dir); + //! Direct initialization from a signed char and rounding mode. Checked_Number(signed char y, Rounding_Dir dir); @@ -238,6 +241,9 @@ public: template <typename From, typename From_Policy> explicit Checked_Number(const Checked_Number<From, From_Policy>& y); + //! Direct initialization from a plain char, default rounding mode. + Checked_Number(char y); + //! Direct initialization from a signed char, default rounding mode. Checked_Number(signed char y); diff --git a/src/Checked_Number.inlines.hh b/src/Checked_Number.inlines.hh index b9ee619..f27559b 100644 --- a/src/Checked_Number.inlines.hh +++ b/src/Checked_Number.inlines.hh @@ -134,6 +134,7 @@ Checked_Number<T, Policy>::Checked_Number(const type x) { \ #define PPL_COND_(if, ...) PPL_COND_##if(__VA_ARGS__) #define PPL_COND(if, ...) PPL_COND_(if, __VA_ARGS__) +DEF_CTOR(char) DEF_CTOR(signed char) DEF_CTOR(signed short) DEF_CTOR(signed int) diff --git a/src/Interval.inlines.hh b/src/Interval.inlines.hh index f91aefe..a6936a1 100644 --- a/src/Interval.inlines.hh +++ b/src/Interval.inlines.hh @@ -1139,6 +1139,11 @@ struct Select_Temp_Boundary_Type<float> { }; template <> +struct Select_Temp_Boundary_Type<char> { + typedef signed long long type; +}; + +template <> struct Select_Temp_Boundary_Type<signed char> { typedef signed long long type; }; diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index f6077c1..24a795e 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -1030,6 +1030,7 @@ PPL_SPECIALIZE_IS_NAN(is_nan_float, float) PPL_SPECIALIZE_IS_MINF(is_minf_float, float) PPL_SPECIALIZE_IS_PINF(is_pinf_float, float) PPL_SPECIALIZE_ASSIGN_SPECIAL(assign_special_float, float) +PPL_SPECIALIZE_ASSIGN(assign_float_int, float, char) PPL_SPECIALIZE_ASSIGN(assign_float_int, float, signed char) PPL_SPECIALIZE_ASSIGN(assign_float_int, float, signed short) PPL_SPECIALIZE_ASSIGN(assign_float_int, float, signed int) @@ -1078,6 +1079,7 @@ PPL_SPECIALIZE_IS_NAN(is_nan_float, double) PPL_SPECIALIZE_IS_MINF(is_minf_float, double) PPL_SPECIALIZE_IS_PINF(is_pinf_float, double) PPL_SPECIALIZE_ASSIGN_SPECIAL(assign_special_float, double) +PPL_SPECIALIZE_ASSIGN(assign_float_int, double, char) PPL_SPECIALIZE_ASSIGN(assign_float_int, double, signed char) PPL_SPECIALIZE_ASSIGN(assign_float_int, double, signed short) PPL_SPECIALIZE_ASSIGN(assign_float_int, double, signed int) @@ -1126,6 +1128,7 @@ PPL_SPECIALIZE_IS_NAN(is_nan_float, long double) PPL_SPECIALIZE_IS_MINF(is_minf_float, long double) PPL_SPECIALIZE_IS_PINF(is_pinf_float, long double) PPL_SPECIALIZE_ASSIGN_SPECIAL(assign_special_float, long double) +PPL_SPECIALIZE_ASSIGN(assign_float_int, long double, char) PPL_SPECIALIZE_ASSIGN(assign_float_int, long double, signed char) PPL_SPECIALIZE_ASSIGN(assign_float_int, long double, signed short) PPL_SPECIALIZE_ASSIGN(assign_float_int, long double, signed int) diff --git a/src/checked_mpq.inlines.hh b/src/checked_mpq.inlines.hh index 22458b0..acf5962 100644 --- a/src/checked_mpq.inlines.hh +++ b/src/checked_mpq.inlines.hh @@ -141,6 +141,7 @@ construct_mpq_base(mpq_class& to, const From& from, Rounding_Dir) { } PPL_SPECIALIZE_CONSTRUCT(construct_mpq_base, mpq_class, mpz_class) +PPL_SPECIALIZE_CONSTRUCT(construct_mpq_base, mpq_class, char) PPL_SPECIALIZE_CONSTRUCT(construct_mpq_base, mpq_class, signed char) PPL_SPECIALIZE_CONSTRUCT(construct_mpq_base, mpq_class, signed short) PPL_SPECIALIZE_CONSTRUCT(construct_mpq_base, mpq_class, signed int) @@ -168,6 +169,7 @@ PPL_SPECIALIZE_CONSTRUCT(construct_mpq_float, mpq_class, double) PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, mpq_class) PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, mpz_class) +PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, char) PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, signed char) PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, signed short) PPL_SPECIALIZE_ASSIGN(assign_exact, mpq_class, signed int) diff --git a/src/checked_mpz.inlines.hh b/src/checked_mpz.inlines.hh index 5dfeb8d..63a935f 100644 --- a/src/checked_mpz.inlines.hh +++ b/src/checked_mpz.inlines.hh @@ -179,6 +179,7 @@ construct_mpz_base(mpz_class& to, const From from, Rounding_Dir) { return V_EQ; } +PPL_SPECIALIZE_CONSTRUCT(construct_mpz_base, mpz_class, char) PPL_SPECIALIZE_CONSTRUCT(construct_mpz_base, mpz_class, signed char) PPL_SPECIALIZE_CONSTRUCT(construct_mpz_base, mpz_class, signed short) PPL_SPECIALIZE_CONSTRUCT(construct_mpz_base, mpz_class, signed int) @@ -215,6 +216,7 @@ PPL_SPECIALIZE_CONSTRUCT(construct_mpz_float, mpz_class, float) PPL_SPECIALIZE_CONSTRUCT(construct_mpz_float, mpz_class, double) PPL_SPECIALIZE_ASSIGN(assign_exact, mpz_class, mpz_class) +PPL_SPECIALIZE_ASSIGN(assign_exact, mpz_class, char) PPL_SPECIALIZE_ASSIGN(assign_exact, mpz_class, signed char) PPL_SPECIALIZE_ASSIGN(assign_exact, mpz_class, signed short) PPL_SPECIALIZE_ASSIGN(assign_exact, mpz_class, signed int) diff --git a/src/checked_numeric_limits.hh b/src/checked_numeric_limits.hh index 2d4ffe1..31413d4 100644 --- a/src/checked_numeric_limits.hh +++ b/src/checked_numeric_limits.hh @@ -71,6 +71,8 @@ template <typename Policy> \ } \ }; +PPL_SPECIALIZE_LIMITS_INT(char) + PPL_SPECIALIZE_LIMITS_INT(signed char) PPL_SPECIALIZE_LIMITS_INT(signed short) PPL_SPECIALIZE_LIMITS_INT(signed int) diff --git a/src/meta_programming.hh b/src/meta_programming.hh index d67f245..25f4648 100644 --- a/src/meta_programming.hh +++ b/src/meta_programming.hh @@ -310,6 +310,7 @@ template <typename T> struct Is_Native : public False { }; +template <> struct Is_Native<char> : public True { }; template <> struct Is_Native<signed char> : public True { }; template <> struct Is_Native<signed short> : public True { }; template <> struct Is_Native<signed int> : public True { };

1 0