January 2010 - PPL-devel - BUGSENG Mailman

[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: 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

Variables erroneously read as binary?
by Roberto Bagnara 09 Jan '10

09 Jan '10

After an upgrade to Fedora 12 (which ships GLPK 4.40) the attached MPS is interpreted as having all binary variables: $ glpsol --min ~/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps GLPSOL: GLPK LP/MIP Solver 4.40 Parameter(s) specified in the command line: --min /home/roberto/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps Reading problem data from `/home/roberto/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps'... Problem: from_lp_file Objective: r_000000 3 rows, 2 columns, 6 non-zeros 2 integer variables, all of which are binary 19 records were read ipp_basic_tech: 3 row(s) and 2 column(s) removed ipp_reduce_bnds: 1 pass(es) made, 0 bound(s) reduced ipp_basic_tech: 0 row(s) and 0 column(s) removed ipp_reduce_coef: 1 pass(es) made, 0 coefficient(s) reduced Objective value = -2 INTEGER OPTIMAL SOLUTION FOUND BY MIP PRESOLVER Time used: 0.0 secs Memory used: 0.0 Mb (45508 bytes) On Fedora 10 (which ships GLPK 4.36) the same file is interpreted as having no binary variables: $ glpsol --min ~/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps glp_read_mps: reading problem data from `/home/bagnara/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps'... glp_read_mps: problem from_lp_file glp_read_mps: 3 rows, 2 columns, 6 non-zeros glp_read_mps: 2 integer columns, none of which are binary glp_read_mps: 19 records were read ipp_basic_tech: 1 row(s) and 0 column(s) removed ipp_reduce_bnds: 2 pass(es) made, 2 bound(s) reduced ipp_basic_tech: 0 row(s) and 0 column(s) removed ipp_reduce_coef: 1 pass(es) made, 0 coefficient(s) reduced glp_intopt: presolved MIP has 2 rows, 2 columns, 4 non-zeros glp_intopt: 2 integer columns, none of which are binary Scaling... A: min|aij| = 1.000e+00 max|aij| = 4.000e+00 ratio = 4.000e+00 Problem data seem to be well scaled Crashing... Size of triangular part = 2 Solving LP relaxation... * 0: obj = 0.000000000e+00 infeas = 0.000e+00 (0) * 2: obj = -3.750000000e+00 infeas = 0.000e+00 (0) OPTIMAL SOLUTION FOUND Integer optimization begins... + 2: mip = not found yet >= -inf (1; 0) + 4: >>>>> -3.000000000e+00 >= -3.000000000e+00 0.0% (2; 0) + 4: mip = -3.000000000e+00 >= tree is empty 0.0% (0; 3) INTEGER OPTIMAL SOLUTION FOUND Time used: 0.0 secs Memory used: 0.1 Mb (84145 bytes) [bagnara@spartacus ppl_lpsol]$ rpm -q glpsol package glpsol is not installed [bagnara@spartacus ppl_lpsol]$ qpm -k glpk-utils -bash: qpm: command not found [bagnara@spartacus ppl_lpsol]$ rpm -q glpk-utils glpk-utils-4.36-1.fc10.x86_64 [bagnara@spartacus ppl_lpsol]$ [bagnara@spartacus ppl_lpsol]$ glpsol --min ~/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps glp_read_mps: reading problem data from `/home/bagnara/ppl/ppl/demos/ppl_lpsol/examples/ex1.mps'... glp_read_mps: problem from_lp_file glp_read_mps: 3 rows, 2 columns, 6 non-zeros glp_read_mps: 2 integer columns, none of which are binary glp_read_mps: 19 records were read ipp_basic_tech: 1 row(s) and 0 column(s) removed ipp_reduce_bnds: 2 pass(es) made, 2 bound(s) reduced ipp_basic_tech: 0 row(s) and 0 column(s) removed ipp_reduce_coef: 1 pass(es) made, 0 coefficient(s) reduced glp_intopt: presolved MIP has 2 rows, 2 columns, 4 non-zeros glp_intopt: 2 integer columns, none of which are binary Scaling... A: min|aij| = 1.000e+00 max|aij| = 4.000e+00 ratio = 4.000e+00 Problem data seem to be well scaled Crashing... Size of triangular part = 2 Solving LP relaxation... * 0: obj = 0.000000000e+00 infeas = 0.000e+00 (0) * 2: obj = -3.750000000e+00 infeas = 0.000e+00 (0) OPTIMAL SOLUTION FOUND Integer optimization begins... + 2: mip = not found yet >= -inf (1; 0) + 4: >>>>> -3.000000000e+00 >= -3.000000000e+00 0.0% (2; 0) + 4: mip = -3.000000000e+00 >= tree is empty 0.0% (0; 3) INTEGER OPTIMAL SOLUTION FOUND Time used: 0.0 secs Memory used: 0.1 Mb (84145 bytes) All the best, Roberto -- Prof. Roberto Bagnara Applied Formal Methods Laboratory Department of Mathematics, University of Parma, Italy http://www.cs.unipr.it/~bagnara/ mailto:bagnara@cs.unipr.it

1 0

[GIT] ppl/ppl(pip): Fixed a bug. Now test08 and test09 in pipproblem2. cc are successful.
by François Galea 05 Jan '10

05 Jan '10

Module: ppl/ppl Branch: pip Commit: 2434409ba4ea91334a47ebb49cb8afca1dfa6a77 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2434409ba4ea… Author: François Galea <francois.galea(a)uvsq.fr> Date: Tue Jan 5 20:32:59 2010 +0100 Fixed a bug. Now test08 and test09 in pipproblem2.cc are successful. --- src/PIP_Tree.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 13e572c..56c79b7 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1319,11 +1319,12 @@ PIP_Solution_Node::update_tableau(const PIP_Problem& problem, Row var(n_vars, tableau.s_capacity(), Row::Flags()); Row param(n_params+1, tableau.t_capacity(), Row::Flags()); Coefficient cnst_term = cst->inhomogeneous_term(); + dimension_type dim = cst->space_dimension(); if (cst->is_strict_inequality()) // convert c > 0 <=> c-1 >= 0 cnst_term -= 1; param[0] = cnst_term * denom; - for (i=0; i<internal_space_dim; i++) { + for (i=0; i<dim; i++) { if (parameters.count(i) == 1) { param[p++] = cst->coefficient(Variable(i)) * denom; } else {

1 0

[GIT] ppl/ppl(pip): Implemented an optional pivot row strategy for difficult problems.
by François Galea 04 Jan '10

04 Jan '10

Module: ppl/ppl Branch: pip Commit: e3db97de0e9371b4107ed479cd65cfa129ae5dc4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e3db97de0e93… Author: François Galea <francois.galea(a)uvsq.fr> Date: Mon Jan 4 08:33:04 2010 +0100 Implemented an optional pivot row strategy for difficult problems. It is deactivated by default as it is more compute intensive. --- demos/ppl_pips/ppl_pips.cc | 33 ++++++-- interfaces/C/ppl_c_header.h | 15 ++++ interfaces/C/ppl_c_implementation_common.cc | 6 ++ src/PIP_Problem.cc | 17 ++++ src/PIP_Problem.defs.hh | 7 ++ src/PIP_Tree.cc | 116 ++++++++++++++++++++++----- src/PIP_Tree.defs.hh | 55 +++++++++++++ 7 files changed, 221 insertions(+), 28 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=e3db97de…

1 0

[GIT] ppl/ppl(pip): Added a more aggressive cutting strategy which generates all possible cuts .
by François Galea 04 Jan '10

04 Jan '10

Module: ppl/ppl Branch: pip Commit: 37b1e615b392957dbf9a03cdfa0afc24afca7368 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37b1e615b392… Author: François Galea <francois.galea(a)uvsq.fr> Date: Wed Dec 16 08:32:19 2009 +0100 Added a more aggressive cutting strategy which generates all possible cuts. --- demos/ppl_pips/ppl_pips.cc | 14 ++++++++++---- interfaces/C/ppl_c_header.h | 5 +++++ interfaces/C/ppl_c_implementation_common.cc | 3 +++ src/PIP_Problem.cc | 10 +++++++++- src/PIP_Problem.defs.hh | 2 ++ src/PIP_Tree.cc | 18 ++++++++++++++---- 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index d7d191c..95668c0 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -436,6 +436,7 @@ struct option long_options[] = { #endif {"first", no_argument, 0, 'f'}, {"deepest", no_argument, 0, 'd'}, + {"all", no_argument, 0, 'a'}, {0, 0, 0, 0} }; #endif @@ -461,6 +462,7 @@ static const char* usage_string "\nCut generation options:\n" " -f, --first use the first non-integer row (default)\n" " -d, --deepest try to generate the deepest cut\n" +" -a, --all always generate all possible cuts\n" #ifndef PPL_HAVE_GETOPT_H "\n" "NOTE: this version does not support long options.\n" @@ -469,9 +471,9 @@ static const char* usage_string "Report bugs to <ppl-devel(a)cs.unipr.it>.\n"; #if defined(USE_PPL) -#define OPTION_LETTERS "R:ho:Pptvi:Vc:df" +#define OPTION_LETTERS "R:ho:Pptvi:Vc:fda" #else -#define OPTION_LETTERS "R:ho:Pptvi:df" +#define OPTION_LETTERS "R:ho:Pptvi:fda" #endif const char* program_name = 0; @@ -668,12 +670,16 @@ process_options(int argc, char* argv[]) { #endif + case 'f': + cutting_strategy = PPL::PIP_Problem::CUTTING_STRATEGY_FIRST; + break; + case 'd': cutting_strategy = PPL::PIP_Problem::CUTTING_STRATEGY_DEEPEST; break; - case 'f': - cutting_strategy = PPL::PIP_Problem::CUTTING_STRATEGY_FIRST; + case 'a': + cutting_strategy = PPL::PIP_Problem::CUTTING_STRATEGY_ALL; break; default: diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 1966dce..806b1ea 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2358,6 +2358,11 @@ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_FIRST; */ extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_DEEPEST; +/*! \relates ppl_PIP_Problem_tag \brief + Code of PIP problem's "all" cutting strategy. +*/ +extern int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL; + /*@}*/ /* Symbolic Constants */ /*! \brief \name Constructors, Assignment and Destructor */ diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index ba7b911..edd583e 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -167,6 +167,7 @@ int PPL_PIP_PROBLEM_STATUS_OPTIMIZED; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_NAME_CUTTING_STRATEGY; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_FIRST; int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_DEEPEST; +int PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL; int PPL_OPTIMIZATION_MODE_MINIMIZATION; int PPL_OPTIMIZATION_MODE_MAXIMIZATION; @@ -219,6 +220,8 @@ ppl_initialize(void) try { = PIP_Problem::CUTTING_STRATEGY_FIRST; PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_DEEPEST = PIP_Problem::CUTTING_STRATEGY_DEEPEST; + PPL_PIP_PROBLEM_CONTROL_PARAMETER_CUTTING_STRATEGY_ALL + = PIP_Problem::CUTTING_STRATEGY_ALL; PPL_OPTIMIZATION_MODE_MINIMIZATION = MINIMIZATION; PPL_OPTIMIZATION_MODE_MAXIMIZATION = MAXIMIZATION; diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index 4fc5607..9fb89e3 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -229,7 +229,8 @@ PPL::PIP_Problem::OK() const { // Test validity of control parameter values. Control_Parameter_Value strategy = control_parameters[CUTTING_STRATEGY]; if (strategy != CUTTING_STRATEGY_FIRST - && strategy != CUTTING_STRATEGY_DEEPEST) { + && strategy != CUTTING_STRATEGY_DEEPEST + && strategy != CUTTING_STRATEGY_ALL) { #ifndef NDEBUG cerr << "Invalid value for the CUTTING_STRATEGY control parameter." << endl; @@ -305,6 +306,9 @@ PPL::PIP_Problem::ascii_dump(std::ostream& s) const { case CUTTING_STRATEGY_DEEPEST: s << "CUTTING_STRATEGY_DEEPEST"; break; + case CUTTING_STRATEGY_ALL: + s << "CUTTING_STRATEGY_ALL"; + break; default: s << "Invalid control parameter value"; } @@ -406,6 +410,8 @@ PPL::PIP_Problem::ascii_load(std::istream& s) { value = CUTTING_STRATEGY_FIRST; if (str == "CUTTING_STRATEGY_DEEPEST") value = CUTTING_STRATEGY_DEEPEST; + if (str == "CUTTING_STRATEGY_ALL") + value = CUTTING_STRATEGY_ALL; else return false; control_parameters[i] = value; @@ -528,6 +534,8 @@ PPL::PIP_Problem::set_control_parameter(Control_Parameter_Value value) { case CUTTING_STRATEGY_FIRST: // Intentionally fall through. case CUTTING_STRATEGY_DEEPEST: + // Intentionally fall through. + case CUTTING_STRATEGY_ALL: control_parameters[CUTTING_STRATEGY] = value; break; default: diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index e98c66a..2dfe292 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -490,6 +490,8 @@ public: CUTTING_STRATEGY_FIRST, //! Choose row which generates the deepest cut CUTTING_STRATEGY_DEEPEST, + //! Always generate all possible cuts + CUTTING_STRATEGY_ALL, //! Number of different enumeration values. CONTROL_PARAMETER_VALUE_SIZE diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 6272b06..23fc4a6 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1802,10 +1802,11 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, best_i = i; } } - i = best_i; + generate_cut(best_i, parameters, context, space_dimension); } else { - assert(cutting_strategy == PIP_Problem::CUTTING_STRATEGY_DEEPEST); + assert(cutting_strategy == PIP_Problem::CUTTING_STRATEGY_DEEPEST + || cutting_strategy == PIP_Problem::CUTTING_STRATEGY_ALL); /* Find the row with simplest parametric part which will generate the "deepest" cut */ PPL_DIRTY_TEMP_COEFFICIENT(score); @@ -1815,6 +1816,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, dimension_type best_i = n_a_d; dimension_type best_pcount = n_a_d; dimension_type pcount; + std::vector<dimension_type> all_best_is; for (i_ = 0; i_ < num_vars; ++i_) { if (basis[i_]) continue; @@ -1849,14 +1851,22 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, && (best_i == n_a_d || (pcount < best_pcount) || (pcount == best_pcount && score > best_score))) { + if (pcount < best_pcount) + all_best_is.clear(); best_score = score; best_pcount = pcount; best_i = i; } + if (pcount > 0) + all_best_is.push_back(i); + } + if (cutting_strategy == PIP_Problem::CUTTING_STRATEGY_DEEPEST) + generate_cut(best_i, parameters, context, space_dimension); + else /* cutting_strategy == PIP_Problem::CUTTING_STRATEGY_ALL */ { + for (i = all_best_is.size(); i-- > 0; ) + generate_cut(all_best_is[i], parameters, context, space_dimension); } - i = best_i; } - generate_cut(i, parameters, context, space_dimension); } // if (i__ != n_a_d) } // Main loop of the simplex algorithm

1 0

[GIT] ppl/ppl(pip): Moved out the cut generation code into a separate method.
by François Galea 04 Jan '10

04 Jan '10

Module: ppl/ppl Branch: pip Commit: 9a6c37ff29503be50cb40043674515b2796c6dd1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a6c37ff2950… Author: François Galea <francois.galea(a)uvsq.fr> Date: Wed Dec 16 08:32:15 2009 +0100 Moved out the cut generation code into a separate method. --- src/PIP_Tree.cc | 305 ++++++++++++++++++++++++++------------------------ src/PIP_Tree.defs.hh | 23 ++++ 2 files changed, 182 insertions(+), 146 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=9a6c37ff…

1 0

[GIT] ppl/ppl(pip): Moved huge block of code out of useless 'else' block. Code reindentation.
by François Galea 04 Jan '10

04 Jan '10

Module: ppl/ppl Branch: pip Commit: 1f02dadae258476055124f88962e11e3daddd8b8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1f02dadae258… Author: François Galea <francois.galea(a)uvsq.fr> Date: Wed Dec 16 08:32:12 2009 +0100 Moved huge block of code out of useless 'else' block. Code reindentation. --- src/PIP_Tree.cc | 422 +++++++++++++++++++++++++++---------------------------- 1 files changed, 210 insertions(+), 212 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1f02dada…

1 0

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

04 Jan '10

Module: ppl/ppl Branch: master 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/w3ppl(master): Extended copyright years.
by Roberto Bagnara 01 Jan '10

01 Jan '10

Module: ppl/w3ppl Branch: master Commit: 11ee3a77b77214a188ee05afbf80643a7b8c5b6f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=11ee3a77b7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Jan 1 16:43:19 2010 +0100 Extended copyright years. --- bin/update_web_site | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/update_web_site b/bin/update_web_site index e241dee..6da7f90 100755 --- a/bin/update_web_site +++ b/bin/update_web_site @@ -2,7 +2,7 @@ # Build the PPL documentation and publish it on the web. # -# Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> +# Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> BRANCH=ppl-0_10-branch

1 0

[GIT] ppl/ppl(floating_point): New commits
by Roberto Bagnara 01 Jan '10

01 Jan '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4d6c6db0470e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Jan 1 16:36:10 2010 +0100 Extended copyright years. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=488f55fbe874… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Jan 1 16:28:45 2010 +0100 Extended copyright years. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=99a040ae53dd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 17:43:41 2009 +0100 Version number bumped. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=98369e2afded… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 17:35:21 2009 +0100 Support building the Java interface on MinGW. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=276db1f0bb1f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 17:35:01 2009 +0100 Document conditionals. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0741942dd929… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 16:19:32 2009 +0100 Restore the use of the `win32-dll' Libtool option. Use -no-undefined on all variants of Cygwin and MinGW. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa8f202b9935… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 11:23:40 2009 +0100 Correction for platforms where not all floating point types are supported. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d291e71b9e3f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Dec 30 11:00:42 2009 +0100 Use the right assignment operator. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2d797ef5eb5d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Dec 29 22:24:42 2009 +0100 Expected failures revised. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4fa0f5b2b45f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Dec 29 21:21:48 2009 +0100 Expected failured revised. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=90e5cd14f89d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Dec 29 21:11:08 2009 +0100 Typo fixed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=17ee1020a0d9… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Tue Dec 29 20:05:29 2009 +0100 Renamed affine_image on Linear Forms into affine_form_image. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=755fc746e12a… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Tue Dec 29 17:56:47 2009 +0100 Use the general assignment and comparison functions.

1 0