January 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Merge branch 'master' into pip
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 582ab4eaecea30f066a28edfe31b85b9f39d310e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=582ab4eaecea… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 16:33:56 2010 +0100 Merge branch 'master' into pip ---

1 0

[GIT] ppl/ppl(pip): Added support for GMP 5.0.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 9c19bc2b318a35016e0189f9552c98910be37f53 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c19bc2b318a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 16:32:08 2010 +0100 Added support for GMP 5.0. --- configure.ac | 2 +- m4/ac_check_gmp.m4 | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 400030b..0c9a321 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.11pre9], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre10], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index 60cecdc..15acb18 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #GMP version 4.1.3 or higher is required #endif +#ifndef BITS_PER_MP_LIMB +#define BITS_PER_MP_LIMB GMP_LIMB_BITS +#endif + int main() { std::string header_version; @@ -97,11 +101,11 @@ main() { return 1; } - if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS - || GMP_LIMB_BITS != mp_bits_per_limb) { + if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB + || BITS_PER_MP_LIMB != mp_bits_per_limb) { std::cerr << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" - << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" + << "header gives " << BITS_PER_MP_LIMB << ";\n" << "library gives " << mp_bits_per_limb << ".\n" << "This probably means you are on a bi-arch system and\n" << "you are compiling with the wrong header or linking with\n"

1 0

[GIT] ppl/ppl(master): Added support for GMP 5.0.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: master Commit: 9c19bc2b318a35016e0189f9552c98910be37f53 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9c19bc2b318a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 16:32:08 2010 +0100 Added support for GMP 5.0. --- configure.ac | 2 +- m4/ac_check_gmp.m4 | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 400030b..0c9a321 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.11pre9], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre10], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61) diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 index 60cecdc..15acb18 100644 --- a/m4/ac_check_gmp.m4 +++ b/m4/ac_check_gmp.m4 @@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #GMP version 4.1.3 or higher is required #endif +#ifndef BITS_PER_MP_LIMB +#define BITS_PER_MP_LIMB GMP_LIMB_BITS +#endif + int main() { std::string header_version; @@ -97,11 +101,11 @@ main() { return 1; } - if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS - || GMP_LIMB_BITS != mp_bits_per_limb) { + if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB + || BITS_PER_MP_LIMB != mp_bits_per_limb) { std::cerr << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" - << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" + << "header gives " << BITS_PER_MP_LIMB << ";\n" << "library gives " << mp_bits_per_limb << ".\n" << "This probably means you are on a bi-arch system and\n" << "you are compiling with the wrong header or linking with\n"

1 0

[GIT] ppl/ppl(pip): Merge branch 'master' into pip
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 07245b3ac3485ebcd4acdf1d00585988e58c60ad URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=07245b3ac348… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 16:18:38 2010 +0100 Merge branch 'master' into pip ---

1 0

[GIT] ppl/ppl(pip): Adapted to follow the IBM OSL conventions for the MPS format.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 56ee86b9ccf001c8dc2ab1558332e9691b2eff3f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=56ee86b9ccf0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 14:38:37 2010 +0100 Adapted to follow the IBM OSL conventions for the MPS format. --- demos/ppl_lpsol/examples/unboundedmin.mps | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/demos/ppl_lpsol/examples/unboundedmin.mps b/demos/ppl_lpsol/examples/unboundedmin.mps index 059a663..9f3549d 100644 --- a/demos/ppl_lpsol/examples/unboundedmin.mps +++ b/demos/ppl_lpsol/examples/unboundedmin.mps @@ -16,4 +16,6 @@ RHS RHS C1 0 RHS r_000002 0 BOUNDS + PL FOO x1 + PL FOO x2 ENDATA

1 0

[GIT] ppl/ppl(pip): Generate nicer identifiers for the temporaries.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 447775d2f2aab7c3203bd356ffb6c1420944ad8d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=447775d2f2aa… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 14:23:58 2010 +0100 Generate nicer identifiers for the temporaries. --- src/Temp.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Temp.inlines.hh b/src/Temp.inlines.hh index 61cd25c..234db1e 100644 --- a/src/Temp.inlines.hh +++ b/src/Temp.inlines.hh @@ -91,12 +91,12 @@ Temp_Value_Holder<T>::item() { #define PPL_DIRTY_TEMP(T, id) \ typename \ - Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder ## id; \ + Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder_ ## id; \ typename \ - Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder ## id.item() + Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder_ ## id.item() #define PPL_DIRTY_TEMP0(T, id) \ - Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder ## id; \ - Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder ## id.item() + Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder_ ## id; \ + Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder_ ## id.item() #endif // !defined(PPL_Temp_inlines_hh)

1 0

[GIT] ppl/ppl(pip): Adapted to follow the IBM OSL conventions for the MPS format.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 97ce932e012943328164d387cfe9a8d2196ca171 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97ce932e0129… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 14:19:59 2010 +0100 Adapted to follow the IBM OSL conventions for the MPS format. --- demos/ppl_lpsol/examples/ex1.mps | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/demos/ppl_lpsol/examples/ex1.mps b/demos/ppl_lpsol/examples/ex1.mps index 125f3d9..fcbc51a 100644 --- a/demos/ppl_lpsol/examples/ex1.mps +++ b/demos/ppl_lpsol/examples/ex1.mps @@ -16,4 +16,6 @@ RHS RHS C1 5 RHS r_000002 5 BOUNDS + PL FOO x1 + PL FOO x2 ENDATA

1 0

[GIT] ppl/ppl(pip): Do not include <iostream> if PPL_NOISY_SIMPLEX is defined to 0.
by Enea Zaffanella 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: pip Commit: 9cea0f3363061e33072a9eb93be55666c13adfe0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9cea0f336306… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Jan 4 08:25:47 2010 +0100 Do not include <iostream> if PPL_NOISY_SIMPLEX is defined to 0. --- src/MIP_Problem.cc | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index f62d21e..9c05c72 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -44,7 +44,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #define PPL_SIMPLEX_USE_MIP_HEURISTIC 1 #endif -#ifdef PPL_NOISY_SIMPLEX +#if PPL_NOISY_SIMPLEX #include <iostream> #endif @@ -237,7 +237,7 @@ PPL::MIP_Problem::is_satisfiable() const { relaxed.lp.is_lp_satisfiable(); #if PPL_NOISY_SIMPLEX mip_recursion_level = 0; -#endif +#endif // PPL_NOISY_SIMPLEX if (is_mip_satisfiable(relaxed.lp, relaxed.i_vars, p)) { x.last_generator = p; x.status = SATISFIABLE; @@ -837,7 +837,7 @@ PPL::MIP_Problem::process_pending_constraints() { std::cout << "MIP_Problem::process_pending_constraints(): " << "1st phase ended at iteration " << num_iterations << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX if (!first_phase_succesful || working_cost[0] != 0) { // The feasible region is empty. @@ -1190,7 +1190,7 @@ PPL::MIP_Problem::compute_simplex_using_steepest_edge_float() { if (num_iterations % 200 == 0) std::cout << "Primal simplex: iteration " << num_iterations << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX // If the following condition fails, probably there's a bug. PPL_ASSERT(challenger >= current); // If the value of the objective function does not improve, @@ -1257,7 +1257,7 @@ PPL::MIP_Problem::compute_simplex_using_exact_pricing() { if (num_iterations % 200 == 0) std::cout << "Primal simplex: iteration " << num_iterations << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX } } @@ -1462,7 +1462,7 @@ PPL::MIP_Problem::second_phase() { std::cout << "MIP_Problem::second_phase(): 2nd phase ended at iteration " << num_iterations << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX status = second_phase_successful ? OPTIMIZED : UNBOUNDED; PPL_ASSERT(OK()); } @@ -1500,7 +1500,7 @@ bool PPL::MIP_Problem::is_lp_satisfiable() const { #if PPL_NOISY_SIMPLEX num_iterations = 0; -#endif +#endif // PPL_NOISY_SIMPLEX switch (status) { case UNSATISFIABLE: return false; @@ -1618,7 +1618,7 @@ PPL::MIP_Problem::solve_mip(bool& have_incumbent_solution, std::cout << "MIP_Problem::solve_mip(): " << "new value found: " << num << "/" << den << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX } return lp_status; } @@ -1640,7 +1640,7 @@ PPL::MIP_Problem::solve_mip(bool& have_incumbent_solution, << "descending with: " << (Variable(nonint_dim) <= tmp_coeff1) << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX solve_mip(have_incumbent_solution, incumbent_solution_value, incumbent_solution_point, lp_aux, i_vars); } @@ -1652,7 +1652,7 @@ PPL::MIP_Problem::solve_mip(bool& have_incumbent_solution, << "descending with: " << (Variable(nonint_dim) >= tmp_coeff2) << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX solve_mip(have_incumbent_solution, incumbent_solution_value, incumbent_solution_point, lp, i_vars); return have_incumbent_solution ? lp_status : UNFEASIBLE_MIP_PROBLEM; @@ -1721,7 +1721,7 @@ PPL::MIP_Problem::is_mip_satisfiable(MIP_Problem& lp, std::cout << "MIP_Problem::is_mip_satisfiable(): " << "entering recursion level " << mip_recursion_level << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX PPL_ASSERT(lp.integer_space_dimensions().empty()); // Solve the LP problem. @@ -1731,7 +1731,7 @@ PPL::MIP_Problem::is_mip_satisfiable(MIP_Problem& lp, << "exiting from recursion level " << mip_recursion_level << "." << std::endl; --mip_recursion_level; -#endif +#endif // PPL_NOISY_SIMPLEX return false; } @@ -1779,14 +1779,14 @@ PPL::MIP_Problem::is_mip_satisfiable(MIP_Problem& lp, << "descending with: " << (Variable(nonint_dim) <= tmp_coeff1) << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX if (is_mip_satisfiable(lp_aux, i_vars, p)) { #if PPL_NOISY_SIMPLEX std::cout << "MIP_Problem::is_mip_satisfiable(): " << "exiting from recursion level " << mip_recursion_level << "." << std::endl; --mip_recursion_level; -#endif +#endif // PPL_NOISY_SIMPLEX return true; } } @@ -1797,14 +1797,14 @@ PPL::MIP_Problem::is_mip_satisfiable(MIP_Problem& lp, << "descending with: " << (Variable(nonint_dim) >= tmp_coeff2) << "." << std::endl; -#endif +#endif // PPL_NOISY_SIMPLEX bool satisfiable = is_mip_satisfiable(lp, i_vars, p); #if PPL_NOISY_SIMPLEX std::cout << "MIP_Problem::is_mip_satisfiable(): " << "exiting from recursion level " << mip_recursion_level << "." << std::endl; --mip_recursion_level; -#endif +#endif // PPL_NOISY_SIMPLEX return satisfiable; }

1 0

[GIT] ppl/ppl(master): Adapted to follow the IBM OSL conventions for the MPS format.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: master Commit: 56ee86b9ccf001c8dc2ab1558332e9691b2eff3f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=56ee86b9ccf0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 14:38:37 2010 +0100 Adapted to follow the IBM OSL conventions for the MPS format. --- demos/ppl_lpsol/examples/unboundedmin.mps | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/demos/ppl_lpsol/examples/unboundedmin.mps b/demos/ppl_lpsol/examples/unboundedmin.mps index 059a663..9f3549d 100644 --- a/demos/ppl_lpsol/examples/unboundedmin.mps +++ b/demos/ppl_lpsol/examples/unboundedmin.mps @@ -16,4 +16,6 @@ RHS RHS C1 0 RHS r_000002 0 BOUNDS + PL FOO x1 + PL FOO x2 ENDATA

1 0

[GIT] ppl/ppl(master): Generate nicer identifiers for the temporaries.
by Roberto Bagnara 09 Jan '10

09 Jan '10

Module: ppl/ppl Branch: master Commit: 447775d2f2aab7c3203bd356ffb6c1420944ad8d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=447775d2f2aa… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 9 14:23:58 2010 +0100 Generate nicer identifiers for the temporaries. --- src/Temp.inlines.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Temp.inlines.hh b/src/Temp.inlines.hh index 61cd25c..234db1e 100644 --- a/src/Temp.inlines.hh +++ b/src/Temp.inlines.hh @@ -91,12 +91,12 @@ Temp_Value_Holder<T>::item() { #define PPL_DIRTY_TEMP(T, id) \ typename \ - Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder ## id; \ + Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder_ ## id; \ typename \ - Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder ## id.item() + Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder_ ## id.item() #define PPL_DIRTY_TEMP0(T, id) \ - Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder ## id; \ - Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder ## id.item() + Parma_Polyhedra_Library::Dirty_Temp<T>::holder_type holder_ ## id; \ + Parma_Polyhedra_Library::Dirty_Temp<T>::type id = holder_ ## id.item() #endif // !defined(PPL_Temp_inlines_hh)

1 0