November 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): In PIP_Problem::clear(), do also reset the big parameter dimension.
by Enea Zaffanella 23 Nov '09

23 Nov '09

Module: ppl/ppl Branch: pip Commit: 07821ad5d5aded366e0f556b332dbd93ec4bef7d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=07821ad5d5ad… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Nov 23 14:17:42 2009 +0100 In PIP_Problem::clear(), do also reset the big parameter dimension. Added C language functions for getting/setting the big parameter dimension. --- interfaces/C/ppl_c_header.h | 14 ++++++++++++++ interfaces/C/ppl_c_implementation_common.cc | 17 +++++++++++++++++ src/PIP_Problem.cc | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 4bb6a18..c3e1f1e 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -2832,6 +2832,20 @@ int ppl_PIP_Problem_set_control_parameter PPL_PROTO((ppl_PIP_Problem_t pip, int value)); +/*! \relates ppl_PIP_Problem_tag \brief + Writes into \p *pd the big parameter dimension of PIP problem \p pip. +*/ +int +ppl_PIP_Problem_get_big_parameter_dimension +PPL_PROTO((ppl_const_PIP_Problem_t pip, ppl_dimension_type* pd)); + +/*! \relates ppl_PIP_Problem_tag \brief + Sets the big parameter dimension of PIP problem \p pip to \p d. +*/ +int +ppl_PIP_Problem_set_big_parameter_dimension +PPL_PROTO((ppl_PIP_Problem_t pip, ppl_dimension_type d)); + /*@}*/ /* Querying/Setting Control Parameters */ diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 3aea5d8..ad5440e 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -2290,6 +2290,23 @@ ppl_PIP_Problem_set_control_parameter(ppl_PIP_Problem_t pip, CATCH_ALL int +ppl_PIP_Problem_get_big_parameter_dimension(ppl_const_PIP_Problem_t pip, + ppl_dimension_type* pd) try { + *pd = to_const(pip)->get_big_parameter_dimension(); + return 0; +} +CATCH_ALL + +int +ppl_PIP_Problem_set_big_parameter_dimension(ppl_PIP_Problem_t pip, + ppl_dimension_type d) try { + to_nonconst(pip)->set_big_parameter_dimension(d); + return 0; +} +CATCH_ALL + + +int ppl_PIP_Tree_Node_as_solution(ppl_const_PIP_Tree_Node_t spip_tree, ppl_const_PIP_Solution_Node_t* dpip_tree) try { *dpip_tree = to_const(to_const(spip_tree)->as_solution()); diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index cf19147..6f4c01c 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -447,6 +447,7 @@ PPL::PIP_Problem::clear() { parameters.clear(); initial_context.clear(); control_parameters_init(); + big_parameter_dimension = 0; } void

1 0

[GIT] ppl/ppl(pip): Enumerations for control parameters put inside class PIP_Problem.
by Enea Zaffanella 23 Nov '09

23 Nov '09

Module: ppl/ppl Branch: pip Commit: e1518687e622e9b3317d33fca4e7f1c6371b19b0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e1518687e622… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Nov 23 13:13:38 2009 +0100 Enumerations for control parameters put inside class PIP_Problem. Interfaced methods for getting/setting control parameters (in C). Other minor stylistic improvements here and there. --- demos/ppl_pips/Makefile.am | 6 +- demos/ppl_pips/ppl_pips.cc | 86 +++++++++++++-------------- interfaces/C/ppl_c_header.h | 35 +++++++++++ interfaces/C/ppl_c_implementation_common.cc | 30 +++++++++ src/PIP_Problem.cc | 59 ++++++++---------- src/PIP_Problem.defs.hh | 35 ++++++++--- src/PIP_Problem.inlines.hh | 9 +-- src/PIP_Problem.types.hh | 24 -------- src/PIP_Tree.cc | 9 ++- 9 files changed, 172 insertions(+), 121 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=e1518687…

1 0

[GIT] ppl/ppl(pip): Corrected a bug in method swap.
by Enea Zaffanella 23 Nov '09

23 Nov '09

Module: ppl/ppl Branch: pip Commit: b92ce985bab65b699479f1a1cde20ee43fdd08ed URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b92ce985bab6… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Nov 23 10:32:56 2009 +0100 Corrected a bug in method swap. Several minor stylistic improvements. --- src/PIP_Problem.cc | 73 ++++++++++++++++++++++-------------------- src/PIP_Problem.inlines.hh | 10 +++-- src/PIP_Problem.templates.hh | 2 +- src/PIP_Problem.types.hh | 6 +-- 4 files changed, 47 insertions(+), 44 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b92ce985…

1 0

[GIT] ppl/ppl(master): Item added.
by Roberto Bagnara 23 Nov '09

23 Nov '09

Module: ppl/ppl Branch: master Commit: 134489d82662c07fc03fdc579264e6a0933469c3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=134489d82662… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Nov 23 07:28:50 2009 +0100 Item added. --- TODO | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/TODO b/TODO index 1a63c8d..f11abd9 100644 --- a/TODO +++ b/TODO @@ -4,6 +4,7 @@ Enhancements for PPL 0.11 - Make all the *affine*image() methods uniform as far as the specification is concerned. +- Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 Commits to consider should we release PPL 0.10.3

1 0

[GIT] ppl/w3ppl(master): Added Francois Galea to the list of current contributors.
by Roberto Bagnara 22 Nov '09

22 Nov '09

Module: ppl/w3ppl Branch: master Commit: f63af4c6c52b8bc105956778b4484525372aa04a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=f63af4c6c5… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Nov 22 18:37:17 2009 +0100 Added Francois Galea to the list of current contributors. --- htdocs/Credits/Credits.raw | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/htdocs/Credits/Credits.raw b/htdocs/Credits/Credits.raw index a824435..016c81d 100644 --- a/htdocs/Credits/Credits.raw +++ b/htdocs/Credits/Credits.raw @@ -67,6 +67,12 @@ maintained and improved by the following people: and polyhedra. </LI> <LI> + <A HREF="http://www.prism.uvsq.fr/~fgalea/">François Galea</A> + (University of Versailles) is working + at the implementation of the Parametric Integer + Programming solver. + </LI> + <LI> <A HREF="http://www.lsi.upc.edu/~erodri/">Enric Rodríguez Carbonell</A> is working on the implementation of

1 0

Parametric integer linear programming solver
by Sebastian Pop 22 Nov '09

22 Nov '09

Hello, I would like to know whether there exists a parametric integer linear programming solver that can be called from the PPL interface, or how we could use from PPL an existing solver, like http://piplib.org We would need such a tool to improve the precision of the data dependence analysis of Graphite by computing the reaching definitions of array accesses. Thank you, Sebastian Pop -- AMD - GNU Tools

4 10

[GIT] ppl/ppl(floating_point): Modified tests on rate limiter. Removed useless comments.
by Roberto Amadini 22 Nov '09

22 Nov '09

Module: ppl/ppl Branch: floating_point Commit: b521d8e6b10bcc30111a6f2d8087c96a3a1aa50f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b521d8e6b10b… Author: Roberto Amadini <r.amadini(a)virgilio.it> Date: Sun Nov 22 17:38:50 2009 +0100 Modified tests on rate limiter. Removed useless comments. --- src/Variable_Floating_Point_Expression.inlines.hh | 10 +-- tests/Floating_Point_Expression/Makefile.am | 2 +- tests/Floating_Point_Expression/digitalfilters1.cc | 127 ++++++++++++-------- 3 files changed, 77 insertions(+), 62 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=b521d8e6…

1 0

[GIT] ppl/ppl(pip): Optimized the solver main loop using PPL_DIRTY_TEMP_COEFFICIENT's.
by François Galea 20 Nov '09

20 Nov '09

Module: ppl/ppl Branch: pip Commit: 8fcb1702a990a056b5ae539d6a47260dd00ff08c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8fcb1702a990… Author: François Galea <francois.galea(a)uvsq.fr> Date: Fri Nov 20 09:58:38 2009 +0100 Optimized the solver main loop using PPL_DIRTY_TEMP_COEFFICIENT's. --- src/PIP_Tree.cc | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index e868427..b6f065d 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1409,10 +1409,10 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, << std::endl; #endif dimension_type k; - Coefficient z(0); - Coefficient sij, cij, cij_; - Coefficient c; - Row &row = tableau.s[i_]; + const Row& row = tableau.s[i_]; + PPL_DIRTY_TEMP_COEFFICIENT(sij); + PPL_DIRTY_TEMP_COEFFICIENT(cij); + PPL_DIRTY_TEMP_COEFFICIENT(cij_); /* Look for a positive S_ij such as the j^th column/S_ij is lexico-minimal */ @@ -1461,6 +1461,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, #endif /* ** Perform pivot operation ** */ + PPL_DIRTY_TEMP_COEFFICIENT(c); /* update basis */ dimension_type var_j = var_column[j_]; @@ -1481,8 +1482,10 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, prt.swap(tableau.t[i_]); sign[i_] = ZERO; /* save current denominator corresponding to sij */ - Coefficient sij_denom = tableau.get_denominator(); + PPL_DIRTY_TEMP_COEFFICIENT(sij_denom); + sij_denom = tableau.get_denominator(); /* Compute columns s[*][j] : s[k][j] -= s[k][j_] * prs[j] / sij */ + PPL_DIRTY_TEMP_COEFFICIENT(scale_factor); for (j=0; j<num_vars; ++j) { if (j==j_) continue; @@ -1491,11 +1494,12 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, // if element j of pivot row is zero, nothing to do for this column continue; for (k=0; k<num_rows; ++k) { - Coefficient mult = prsj * tableau.s[k][j_]; + PPL_DIRTY_TEMP_COEFFICIENT(mult); + mult = prsj * tableau.s[k][j_]; if (mult % sij != 0) { // Must scale matrix to stay in integer case gcd_assign(gcd, mult, sij); - Coefficient scale_factor = sij/gcd; + scale_factor = sij/gcd; tableau.scale(scale_factor); mult *= scale_factor; } @@ -1510,11 +1514,11 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, // if element j of pivot row is zero, nothing to do for this column continue; for (k=0; k<num_rows; ++k) { - Coefficient c = prtj * tableau.s[k][j_]; + c = prtj * tableau.s[k][j_]; if (c % sij != 0) { // Must scale matrix to stay in integer case gcd_assign(gcd, c, sij); - Coefficient scale_factor = sij/gcd; + scale_factor = sij/gcd; tableau.scale(scale_factor); c *= scale_factor; } @@ -1550,11 +1554,12 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, // Update column only if pivot != 1 for (k=0; k<num_rows; ++k) { Coefficient& c = tableau.s[k][j_]; - Coefficient numerator = c * sij_denom; + PPL_DIRTY_TEMP_COEFFICIENT(numerator); + numerator = c * sij_denom; if (numerator % sij != 0) { - Coefficient gcd; + PPL_DIRTY_TEMP_COEFFICIENT(gcd); gcd_assign(gcd, numerator, sij); - Coefficient scale_factor = sij/gcd; + scale_factor = sij/gcd; tableau.scale(scale_factor); numerator *= scale_factor; } @@ -1567,7 +1572,8 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, /* Otherwise, we have found a row i__ with mixed parameter sign. */ else if (i__ != n_a_d) { dimension_type neg = n_a_d; - Coefficient ns, score; + PPL_DIRTY_TEMP_COEFFICIENT(ns); + PPL_DIRTY_TEMP_COEFFICIENT(score); /* Look for a constraint with mixed parameter sign with no positive * variable coefficients */ @@ -1613,8 +1619,9 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, #endif } else { /* Heuristically choose "best" pivoting row. */ - Coefficient score; - Coefficient best = 0; + PPL_DIRTY_TEMP_COEFFICIENT(score); + PPL_DIRTY_TEMP_COEFFICIENT(best); + best = 0; dimension_type best_i = n_a_d; for (i = i__; i < num_rows; ++i) { if (sign[i] != MIXED) @@ -1762,7 +1769,8 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, the "deepest" cut */ PPL_DIRTY_TEMP_COEFFICIENT(score); PPL_DIRTY_TEMP_COEFFICIENT(score2); - Coefficient best_score = 0; + PPL_DIRTY_TEMP_COEFFICIENT(best_score); + best_score = 0; dimension_type best_i = n_a_d; dimension_type best_pcount = n_a_d; dimension_type pcount;

1 0

[GIT] ppl/ppl(pip): Added a rule to the cut methods to always choose the simplest parametric part .
by François Galea 19 Nov '09

19 Nov '09

Module: ppl/ppl Branch: pip Commit: b326ccf6d4297944eb51347295a37d492534400e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b326ccf6d429… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 19 15:20:58 2009 +0100 Added a rule to the cut methods to always choose the simplest parametric part. This tends to provide simpler solution trees on some problems. --- src/PIP_Tree.cc | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 138a215..e868427 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1736,14 +1736,36 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, PPL_DIRTY_TEMP_COEFFICIENT(mod); if (problem.control_parameters[PIP_CUTTING_STRATEGY] == PIP_CUTTING_STRATEGY_FIRST) { - /* Just choose the row corresponding to variable i */ - i = mapping[i]; + // Find the first row with simplest parametric part. + dimension_type best_i = n_a_d; + dimension_type best_pcount = n_a_d; + dimension_type pcount; + for (i_ = 0; i_ < num_vars; ++i_) { + if (basis[i_]) + continue; + i = mapping[i_]; + const Row& row_t = tableau.t[i]; + pcount = 0; + for (j = 0; j < num_params; ++j) { + mod_assign(mod, row_t[j], d); + if (mod != 0) + ++pcount; + } + if (pcount != 0 && (best_i == n_a_d || (pcount < best_pcount))) { + best_pcount = pcount; + best_i = i; + } + } + i = best_i; } else /* PIP_CUTTING_STRATEGY_DEEPEST */ { - /* Look for the row which will generate the "deepest" cut */ + /* Find the row with simplest parametric part which will generate + the "deepest" cut */ PPL_DIRTY_TEMP_COEFFICIENT(score); PPL_DIRTY_TEMP_COEFFICIENT(score2); - Coefficient best = 0; + Coefficient best_score = 0; dimension_type best_i = n_a_d; + dimension_type best_pcount = n_a_d; + dimension_type pcount; for (i_ = 0; i_ < num_vars; ++i_) { if (basis[i_]) continue; @@ -1751,10 +1773,13 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, const Row& row_t = tableau.t[i]; const Row& row_s = tableau.s[i]; score = 0; + pcount = 0; for (j = 0; j < num_params; ++j) { mod_assign(mod, row_t[j], d); - if (mod != 0) + if (mod != 0) { score += d - mod; + ++pcount; + } } score2 = 0; for (j = 0; j < num_vars; ++j) { @@ -1762,8 +1787,21 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, score2 += d - mod; } score *= score2; - if (best_i == n_a_d || score > best) { - best = score; + /* Choose row i if: + row i is non-integer + AND (no row has been chosen yet + OR row i has number of non-integer parameter + coefficients lower than the current best row + OR row i has the same number of non-integer parameter + coefficients as the current best row, and its score is + better) + */ + if (pcount != 0 + && (best_i == n_a_d + || (pcount < best_pcount) + || (pcount == best_pcount && score > best_score))) { + best_score = score; + best_pcount = pcount; best_i = i; } }

1 0

[GIT] ppl/ppl(pip): Added a mechanism to avoid generating the same Artificial_Parameter twice.
by François Galea 19 Nov '09

19 Nov '09

Module: ppl/ppl Branch: pip Commit: 548215a3de60a7e5d74a4826a687d08be38e9719 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=548215a3de60… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 19 11:59:57 2009 +0100 Added a mechanism to avoid generating the same Artificial_Parameter twice. --- src/PIP_Tree.cc | 92 ++++++++++++++++++++++++++++++++++++++++++-------- src/PIP_Tree.defs.hh | 4 ++ 2 files changed, 82 insertions(+), 14 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 64a65b9..138a215 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -179,6 +179,22 @@ PIP_Tree_Node::Artificial_Parameter return denominator; } +bool +operator==(const PIP_Tree_Node::Artificial_Parameter& x, + const PIP_Tree_Node::Artificial_Parameter& y) { + using namespace IO_Operators; + if (x.space_dimension() != y.space_dimension()) + return false; + if (x.denominator != y.denominator) + return false; + if (x.inhomogeneous_term() != y.inhomogeneous_term()) + return false; + for (dimension_type i = x.space_dimension(); i-- > 0; ) + if (x.coefficient(Variable(i)) != y.coefficient(Variable(i))) + return false; + return true; +} + void PIP_Tree_Node::Artificial_Parameter::ascii_dump(std::ostream& s) const { s << "\ndenominator " << denominator << "\n"; @@ -1123,6 +1139,10 @@ PIP_Solution_Node::update_tableau(const PIP_Problem& problem, } // add new columns to the tableau + /* FIXME: when the node or its parents have artificial parameters, we + must insert new parameter columns before the columns corresponding to + the artificial parameters. Meanwhile parameter insertion after a first + solve (incremental solving) is broken. */ for (i=internal_space_dim; i<external_space_dim; ++i) { if (parameters.count(i) == 1) tableau.t.add_zero_columns(1); @@ -1760,21 +1780,22 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, // Test if cut to be generated must be parametric or not const Row& row_t1 = tableau.t[i]; + bool gen_parametric_cut = false; for (j=1; j<num_params; ++j) { if (row_t1[j] % d != 0) { - tableau.t.add_zero_columns(1); - context.add_zero_columns(1); + gen_parametric_cut = true; break; } } - const Row& row_t = tableau.t[i]; - Row& cut_s = tableau.s[num_rows]; - Row& cut_t = tableau.t[num_rows]; + // Column index of already existing Artificial_Parameter + dimension_type ap_column = n_a_d; + bool reuse_ap = false; - if (j < num_params) { + if (gen_parametric_cut) { // Fractional parameter coefficient found: generate parametric cut // Generate new artificial parameter + const Row& row_t = tableau.t[i]; Linear_Expression e; Variables_Set::const_iterator p; mod_assign(mod, row_t[0], d); @@ -1785,16 +1806,55 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, if (mod != 0) e += (d-mod) * Variable(*p); } - artificial_parameters.push_back(Artificial_Parameter(e, d)); - parameters.insert(space_dimension); + Artificial_Parameter ap(e, d); + + // Search if the Artificial_Parameter has already been generated + ap_column = space_dimension; + const PIP_Tree_Node* node = this; + do { + for (j = node->artificial_parameters.size(); j-- > 0; ) { + --ap_column; + if (node->artificial_parameters[j] == ap) { + reuse_ap = true; + break; + } + } + node = node->parent(); + } while (!reuse_ap && node != 0); + + if (!reuse_ap) { + // The Artificial_Parameter does not exist yet + tableau.t.add_zero_columns(1); + context.add_zero_columns(1); + artificial_parameters.push_back(ap); + parameters.insert(space_dimension); #ifdef NOISY_PIP - using namespace IO_Operators; - std::cout << "Creating new parameter " << Variable(space_dimension) - << " = (" << e << ")/" << d - << std::endl; + using namespace IO_Operators; + std::cout << "Creating new parameter " + << Variable(space_dimension) + << " = (" << e << ")/" << d + << std::endl; +#endif + ++space_dimension; + ap_column = num_params; + } else { + // We can re-use the existing Artificial_Parameter +#ifdef NOISY_PIP + using namespace IO_Operators; + std::cout << "Re-using parameter " << Variable(ap_column) + << " = (" << e << ")/" << d + << std::endl; #endif - ++space_dimension; + ap_column = ap_column-num_vars+1; + } + } + // Get reference to tableau rows after eventual resize + const Row& row_t = tableau.t[i]; + Row& cut_s = tableau.s[num_rows]; + Row& cut_t = tableau.t[num_rows]; + + if (gen_parametric_cut && !reuse_ap) { // Update current context with constraints on the new parameter Row ctx1(num_params+1, Row::Flags()); Row ctx2(num_params+1, Row::Flags()); @@ -1813,6 +1873,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, ctx2[0] += d-1; #ifdef NOISY_PIP { + using namespace IO_Operators; Variables_Set::const_iterator p = parameters.begin(); Linear_Expression e1; Linear_Expression e2; @@ -1829,7 +1890,6 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, #endif context.add_row(ctx1); context.add_row(ctx2); - cut_t[num_params] = d; } // Generate new cut @@ -1845,6 +1905,10 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, else cut_t[j] = 0; } + if (ap_column != n_a_d) + // If we re-use an existing Artificial_Parameter + cut_t[ap_column] = d; + #ifdef NOISY_PIP { using namespace IO_Operators; diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index 1e2e01a..3de1cb6 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -85,6 +85,10 @@ public: const Coefficient& get_denominator() const; + //! Returns \b true if \p x and \p y are equal. + friend bool operator==(const Artificial_Parameter& x, + const Artificial_Parameter& y); + void ascii_dump(std::ostream& s) const; bool ascii_load(std::istream& s);

1 0