Module: ppl/ppl Branch: master Commit: 13a2650b7180d9f372a061c2f34c4b92f2cf0059 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=13a2650b7180d...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Sat Feb 20 13:04:13 2010 +0100

Invalidate current solution at the start of PIP_Solution_Node::solve(). This fixes the bug in pipproblem3 test03.

---

src/PIP_Tree.cc | 4 +++- tests/PIP_Problem/pipproblem3.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ee05538..ba3d1ec 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1628,6 +1628,9 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, const Matrix& ctx, const Variables_Set& params, dimension_type space_dim) { + // Reset current solution as invalid. + solution_valid = false; + Matrix context(ctx); Variables_Set parameters(params); update_context(parameters, context, artificial_parameters, space_dim); @@ -1923,7 +1926,6 @@ PIP_Solution_Node::solve(const PIP_Problem& problem, }

// Pivoting process ended: jump to next iteration. - solution_valid = false; continue; } // if (first_negative != not_a_dim)

diff --git a/tests/PIP_Problem/pipproblem3.cc b/tests/PIP_Problem/pipproblem3.cc index 03bf580..2fe66e2 100644 --- a/tests/PIP_Problem/pipproblem3.cc +++ b/tests/PIP_Problem/pipproblem3.cc @@ -154,5 +154,5 @@ test03() { BEGIN_MAIN DO_TEST_F8(test01); DO_TEST_F8(test02); - // DO_TEST_F8(test03); + DO_TEST_F8(test03); END_MAIN