Module: ppl/ppl Branch: pip Commit: aa7e6d41189ddb3217c285569c828c418a725657 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa7e6d41189dd...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Thu Sep 10 16:11:39 2009 +0200

Identifiers starting with an underscore are reserved: avoid them.

---

src/PIP_Tree.cc | 6 +++--- src/PIP_Tree.defs.hh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 42a903e..9f039ea 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -120,14 +120,14 @@ PIP_Decision_Node::solve(PIP_Tree_Node **parent_ref, PIP_Problem_Status stt; PIP_Problem_Status stf = UNFEASIBLE_PIP_PROBLEM; Constraint_System context_true(context); - merge(context_true, _constraints); + merge(context_true, constraints_); stt = true_child->solve(&true_child, context_true); if (false_child) { // Decision nodes with false child must have exactly one constraint - PPL_ASSERT(_constraints.num_rows() == 1); + PPL_ASSERT(constraints_.num_rows() == 1); Constraint_System context_false(context); //FIXME: not implemented yet (constraint negation) - //context_false.insert(!_constraints[0]); + //context_false.insert(!constraints_[0]); stf = false_child->solve(&false_child, context_false); }

diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh index f02631a..e1555a2 100644 --- a/src/PIP_Tree.defs.hh +++ b/src/PIP_Tree.defs.hh @@ -227,7 +227,7 @@ private: std::vector<dimension_type> mapping;

//! The local system of parameter constraints - Constraint_System _constraints; + Constraint_System constraints_;

protected: /*! \brief @@ -309,7 +309,7 @@ private: PIP_Tree_Node* false_child;

//! The local system of parameter constraints - Constraint_System _constraints; + Constraint_System constraints_;

/*! \brief Constructs if \p cs then \p tcp \p else \p fcp.