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

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Tue Feb 16 09:58:05 2010 +0100

Got rid of unused Boolean flag PIP_Problem::initialized.

---

src/PIP_Problem.cc | 16 ---------------- src/PIP_Problem.defs.hh | 7 ------- src/PIP_Problem.inlines.hh | 1 - src/PIP_Problem.templates.hh | 1 - 4 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index e17619a..c91abbb 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -38,7 +38,6 @@ PPL::PIP_Problem::PIP_Problem(const dimension_type dim) internal_space_dim(0), status(PARTIALLY_SATISFIABLE), current_solution(0), - initialized(false), input_cs(), first_pending_constraint(0), parameters(), @@ -58,7 +57,6 @@ PPL::PIP_Problem::PIP_Problem(const PIP_Problem &y) internal_space_dim(y.internal_space_dim), status(y.status), current_solution(0), - initialized(y.initialized), input_cs(y.input_cs), first_pending_constraint(y.first_pending_constraint), parameters(y.parameters), @@ -298,8 +296,6 @@ PPL::PIP_Problem::ascii_dump(std::ostream& s) const {

s << "\nfirst_pending_constraint: " << first_pending_constraint << "\n";

- s << "\ninitialized: " << (initialized ? "YES" : "NO") << "\n"; - s << "\nstatus: "; switch (status) { case UNSATISFIABLE: @@ -403,17 +399,6 @@ PPL::PIP_Problem::ascii_load(std::istream& s) { if (!(s >> first_pending_constraint)) return false;

- if (!(s >> str) || str != "initialized:") - return false; - if (!(s >> str)) - return false; - if (str == "YES") - initialized = true; - else if (str == "NO") - initialized = false; - else - return false; - if (!(s >> str) || str != "status:") return false;

@@ -505,7 +490,6 @@ PPL::PIP_Problem::clear() { delete current_solution; current_solution = 0; } - initialized = false; input_cs.clear(); first_pending_constraint = 0; parameters.clear(); diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index e12fb0e..e7d908b 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -553,13 +553,6 @@ private: //! The current solution decision tree PIP_Tree_Node* current_solution;

- /*! \brief - A Boolean encoding whether or not internal data structures have - already been properly sized and populated: useful to allow for - deeper checks in method OK(). - */ - bool initialized; - //! The sequence of constraints describing the feasible region. Constraint_Sequence input_cs;

diff --git a/src/PIP_Problem.inlines.hh b/src/PIP_Problem.inlines.hh index fc67f13..d09b3c3 100644 --- a/src/PIP_Problem.inlines.hh +++ b/src/PIP_Problem.inlines.hh @@ -56,7 +56,6 @@ PIP_Problem::swap(PIP_Problem& y) { std::swap(internal_space_dim, y.internal_space_dim); std::swap(status, y.status); std::swap(current_solution, y.current_solution); - std::swap(initialized, y.initialized); std::swap(input_cs, y.input_cs); std::swap(first_pending_constraint, y.first_pending_constraint); std::swap(parameters, y.parameters); diff --git a/src/PIP_Problem.templates.hh b/src/PIP_Problem.templates.hh index 3197e87..9faa49d 100644 --- a/src/PIP_Problem.templates.hh +++ b/src/PIP_Problem.templates.hh @@ -36,7 +36,6 @@ PIP_Problem::PIP_Problem(dimension_type dim, internal_space_dim(0), status(PARTIALLY_SATISFIABLE), current_solution(0), - initialized(false), input_cs(), first_pending_constraint(0), parameters(p_vars),