- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): For checking purposes, use the exact LP solver of GLPK.
by Roberto Bagnara 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: sparse_matrices Commit: 108769b7f3ca869c9c852da8f0fdaed22d4e6d64 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=108769b7f3ca… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 29 14:10:03 2010 +0200 For checking purposes, use the exact LP solver of GLPK. --- demos/ppl_lpsol/ppl_lpsol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 5b8abed..abf9fbd 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -589,7 +589,7 @@ maybe_check_results(const int ppl_status, const double ppl_optimum_value) { /* Set the problem class to LP: MIP problems are thus treated as LP ones. */ lpx_set_class(glpk_lp, LPX_LP); - lpx_simplex(glpk_lp); + lpx_exact(glpk_lp); glpk_status = lpx_get_status(glpk_lp); } else {

1 0

[GIT] ppl/ppl(sparse_matrices): When the `--check' option is used, input data is perturbed the same way as GLPK does.
by Roberto Bagnara 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: sparse_matrices Commit: 12f60158e2122303413a67c19425ba8714196f1e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=12f60158e212… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 29 12:10:11 2010 +0200 When the `--check' option is used, input data is perturbed the same way as GLPK does. --- README | 3 +- demos/ppl_lpsol/Makefile.am | 1 + demos/ppl_lpsol/glpk_set_d_eps.c | 285 ++++++++++++++++++++++++++++++++++++++ demos/ppl_lpsol/ppl_lpsol.1 | 7 +- demos/ppl_lpsol/ppl_lpsol.c | 41 ++++-- doc/ppl-config.1 | 2 +- 6 files changed, 319 insertions(+), 20 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=12f60158…

1 0

[GIT] ppl/ppl(sparse_matrices): Do also read the inhomogeneous term of the objective function.
by Enea Zaffanella 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: sparse_matrices Commit: c82a27391846139072cadf0754f59f4805f4f99b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c82a27391846… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Aug 29 11:01:58 2010 +0200 Do also read the inhomogeneous term of the objective function. This should allow for a (almost) meaningful comparison with the optimizied value computed by glpk when using command line option -c. Also corrected a minor bug in the output routine for the objective function (an open parenthesis was sometimes missing). --- demos/ppl_lpsol/ppl_lpsol.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 3828f6e..fb44b4a 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -1172,7 +1172,12 @@ solve(char* file_name) { /* Set the ppl_objective_le to be the objective function. */ ppl_new_Linear_Expression_with_dimension(&ppl_objective_le, dimension); - /* The inhomogeneous term is completely useless for our purpose. */ + /* Set value for objective function's inhomogeneous term. */ + mpz_mul(tmp_z, den_lcm, mpq_numref(objective[0])); + mpz_divexact(tmp_z, tmp_z, mpq_denref(objective[0])); + ppl_assign_Coefficient_from_mpz_t(ppl_coeff, tmp_z); + ppl_Linear_Expression_add_to_inhomogeneous(ppl_objective_le, ppl_coeff); + /* Set values for objective function's variable coefficients. */ for (i = 1; i <= dimension; ++i) { mpz_mul(tmp_z, den_lcm, mpq_numref(objective[i])); mpz_divexact(tmp_z, tmp_z, mpq_denref(objective[i])); @@ -1182,6 +1187,8 @@ solve(char* file_name) { if (verbosity >= 4) { fprintf(output_file, "Objective function:\n"); + if (mpz_cmp_si(den_lcm, 1) != 0) + fprintf(output_file, "("); ppl_io_fprint_Linear_Expression(output_file, ppl_objective_le); }

1 0

[GIT] ppl/ppl(master): Started revising the expected results.
by Roberto Bagnara 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: master Commit: f078b9a6bcc0c1fa82d474e676e82a8e5dd8d319 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f078b9a6bcc0… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 29 14:32:07 2010 +0200 Started revising the expected results. --- demos/ppl_lpsol/.gitignore | 2 +- demos/ppl_lpsol/Makefile.am | 44 +- demos/ppl_lpsol/expected_mpz | 1852 +++++++++++++++++++++++++++++++--------- demos/ppl_lpsol/expected_mpz_a | 1796 +++++++++++++++++++++++++++++++-------- 4 files changed, 2912 insertions(+), 782 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f078b9a6…

1 0

[GIT] ppl/ppl(master): For checking purposes, use the exact LP solver of GLPK.
by Roberto Bagnara 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: master Commit: 108769b7f3ca869c9c852da8f0fdaed22d4e6d64 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=108769b7f3ca… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 29 14:10:03 2010 +0200 For checking purposes, use the exact LP solver of GLPK. --- demos/ppl_lpsol/ppl_lpsol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 5b8abed..abf9fbd 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -589,7 +589,7 @@ maybe_check_results(const int ppl_status, const double ppl_optimum_value) { /* Set the problem class to LP: MIP problems are thus treated as LP ones. */ lpx_set_class(glpk_lp, LPX_LP); - lpx_simplex(glpk_lp); + lpx_exact(glpk_lp); glpk_status = lpx_get_status(glpk_lp); } else {

1 0

[GIT] ppl/ppl(master): When the `--check' option is used, input data is perturbed the same way as GLPK does.
by Roberto Bagnara 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: master Commit: 12f60158e2122303413a67c19425ba8714196f1e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=12f60158e212… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Aug 29 12:10:11 2010 +0200 When the `--check' option is used, input data is perturbed the same way as GLPK does. --- README | 3 +- demos/ppl_lpsol/Makefile.am | 1 + demos/ppl_lpsol/glpk_set_d_eps.c | 285 ++++++++++++++++++++++++++++++++++++++ demos/ppl_lpsol/ppl_lpsol.1 | 7 +- demos/ppl_lpsol/ppl_lpsol.c | 41 ++++-- doc/ppl-config.1 | 2 +- 6 files changed, 319 insertions(+), 20 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=12f60158…

1 0

[GIT] ppl/ppl(master): Do also read the inhomogeneous term of the objective function.
by Enea Zaffanella 29 Aug '10

29 Aug '10

Module: ppl/ppl Branch: master Commit: c82a27391846139072cadf0754f59f4805f4f99b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c82a27391846… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Aug 29 11:01:58 2010 +0200 Do also read the inhomogeneous term of the objective function. This should allow for a (almost) meaningful comparison with the optimizied value computed by glpk when using command line option -c. Also corrected a minor bug in the output routine for the objective function (an open parenthesis was sometimes missing). --- demos/ppl_lpsol/ppl_lpsol.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 3828f6e..fb44b4a 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -1172,7 +1172,12 @@ solve(char* file_name) { /* Set the ppl_objective_le to be the objective function. */ ppl_new_Linear_Expression_with_dimension(&ppl_objective_le, dimension); - /* The inhomogeneous term is completely useless for our purpose. */ + /* Set value for objective function's inhomogeneous term. */ + mpz_mul(tmp_z, den_lcm, mpq_numref(objective[0])); + mpz_divexact(tmp_z, tmp_z, mpq_denref(objective[0])); + ppl_assign_Coefficient_from_mpz_t(ppl_coeff, tmp_z); + ppl_Linear_Expression_add_to_inhomogeneous(ppl_objective_le, ppl_coeff); + /* Set values for objective function's variable coefficients. */ for (i = 1; i <= dimension; ++i) { mpz_mul(tmp_z, den_lcm, mpq_numref(objective[i])); mpz_divexact(tmp_z, tmp_z, mpq_denref(objective[i])); @@ -1182,6 +1187,8 @@ solve(char* file_name) { if (verbosity >= 4) { fprintf(output_file, "Objective function:\n"); + if (mpz_cmp_si(den_lcm, 1) != 0) + fprintf(output_file, "("); ppl_io_fprint_Linear_Expression(output_file, ppl_objective_le); }

1 0

[GIT] ppl/ppl(sparse_matrices): Merge branch 'master' into sparse_matrices
by Roberto Bagnara 28 Aug '10

28 Aug '10

Module: ppl/ppl Branch: sparse_matrices Commit: 9f4e0a36e31e7b45b71f284e0d70fb84cccebf13 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f4e0a36e31e… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Aug 28 14:31:52 2010 +0200 Merge branch 'master' into sparse_matrices ---

1 0

[GIT] ppl/ppl(sparse_matrices): Tightened the implementation of the `--max-memory' option.
by Roberto Bagnara 28 Aug '10

28 Aug '10

Module: ppl/ppl Branch: sparse_matrices Commit: f75832a600dfb6af890af3fb94cb99500d7e5de4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f75832a600df… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Aug 28 14:31:18 2010 +0200 Tightened the implementation of the `--max-memory' option. --- demos/ppl_lcdd/ppl_lcdd.cc | 3 +++ demos/ppl_lpsol/ppl_lpsol.c | 3 +++ demos/ppl_pips/ppl_pips.cc | 4 +++- 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 54516b2..3b1f222 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -92,6 +92,7 @@ typedef Polyhedron* POLYHEDRON_TYPE; #include <vector> #include <set> #include <limits> +#include <climits> #include <cassert> #include <cstdarg> #include <csignal> @@ -415,6 +416,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break; diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index ec4a5d6..3828f6e 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -26,6 +26,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <gmp.h> #include <stdio.h> #include <assert.h> +#include <limits.h> #include <time.h> #include <stdarg.h> #include <stdlib.h> @@ -337,6 +338,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break; diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 72502ab..0fb1b8e 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -56,7 +56,7 @@ ppl_set_GMP_memory_allocation_functions(void) { #include <gmpxx.h> #include <vector> #include <set> -#include <limits> +#include <climits> #include <cassert> #include <cstdarg> #include <csignal> @@ -669,6 +669,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break;

1 0

[GIT] ppl/ppl(master): Tightened the implementation of the `--max-memory' option.
by Roberto Bagnara 28 Aug '10

28 Aug '10

Module: ppl/ppl Branch: master Commit: f75832a600dfb6af890af3fb94cb99500d7e5de4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f75832a600df… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Aug 28 14:31:18 2010 +0200 Tightened the implementation of the `--max-memory' option. --- demos/ppl_lcdd/ppl_lcdd.cc | 3 +++ demos/ppl_lpsol/ppl_lpsol.c | 3 +++ demos/ppl_pips/ppl_pips.cc | 4 +++- 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/demos/ppl_lcdd/ppl_lcdd.cc b/demos/ppl_lcdd/ppl_lcdd.cc index 54516b2..3b1f222 100644 --- a/demos/ppl_lcdd/ppl_lcdd.cc +++ b/demos/ppl_lcdd/ppl_lcdd.cc @@ -92,6 +92,7 @@ typedef Polyhedron* POLYHEDRON_TYPE; #include <vector> #include <set> #include <limits> +#include <climits> #include <cassert> #include <cstdarg> #include <csignal> @@ -415,6 +416,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break; diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index ec4a5d6..3828f6e 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -26,6 +26,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <gmp.h> #include <stdio.h> #include <assert.h> +#include <limits.h> #include <time.h> #include <stdarg.h> #include <stdlib.h> @@ -337,6 +338,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break; diff --git a/demos/ppl_pips/ppl_pips.cc b/demos/ppl_pips/ppl_pips.cc index 72502ab..0fb1b8e 100644 --- a/demos/ppl_pips/ppl_pips.cc +++ b/demos/ppl_pips/ppl_pips.cc @@ -56,7 +56,7 @@ ppl_set_GMP_memory_allocation_functions(void) { #include <gmpxx.h> #include <vector> #include <set> -#include <limits> +#include <climits> #include <cassert> #include <cstdarg> #include <csignal> @@ -669,6 +669,8 @@ process_options(int argc, char* argv[]) { l = strtol(optarg, &endptr, 10); if (*endptr || l < 0) fatal("a non-negative integer must follow `-R'"); + else if (((unsigned long) l) > ULONG_MAX/(1024*1024)) + max_bytes_of_virtual_memory = ULONG_MAX; else max_bytes_of_virtual_memory = l*1024*1024; break;

1 0