Module: ppl/ppl Branch: pip Commit: 91de7841156c141b9c0935e673b6c29fbb3e7859 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=91de7841156c1... Author: François Galea <francois.galea@uvsq.fr> Date: Wed Jan 20 08:23:22 2010 +0100 Fixed bugs. Now test07 in pipproblem2.cc is successful. --- src/PIP_Problem.cc | 3 +++ src/PIP_Tree.cc | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index d08a633..a4b0b2d 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -524,6 +524,9 @@ PPL::PIP_Problem::add_constraint(const Constraint& c) { throw std::invalid_argument(s.str()); } input_cs.push_back(c); + // Update problem status. + if (status != UNSATISFIABLE) + status = PARTIALLY_SATISFIABLE; } void diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 56c79b7..36a60a8 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1257,7 +1257,8 @@ PIP_Solution_Node::update_tableau(const PIP_Problem& problem, dimension_type i; dimension_type n_params = parameters.size(); dimension_type n_vars = external_space_dim - n_params; - dimension_type internal_space_dim = tableau.t.num_columns()-1; + dimension_type internal_space_dim = tableau.s.num_columns() + + tableau.t.num_columns() - 1; Constraint_Sequence::const_iterator cst; // Create the parameter column, corresponding to the constant term