[PPL-devel] [GIT] ppl/ppl(pip): Removed useless parameter in PIP_Tree_Node:: update_tableau method.

François Galea francois.galea at uvsq.fr
Wed Sep 23 11:16:48 CEST 2009


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

Author: François Galea <francois.galea at uvsq.fr>
Date:   Wed Sep 23 11:15:32 2009 +0200

Removed useless parameter in PIP_Tree_Node::update_tableau method.

---

 src/PIP_Problem.cc   |    3 +--
 src/PIP_Tree.cc      |   12 ++++--------
 src/PIP_Tree.defs.hh |   18 +++---------------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc
index a8925b5..ced38e3 100644
--- a/src/PIP_Problem.cc
+++ b/src/PIP_Problem.cc
@@ -79,8 +79,7 @@ PPL::PIP_Problem::solve() const {
       if (current_solution == 0)
         x.current_solution = new PIP_Solution_Node(&x);
 
-      x.current_solution->update_tableau(&x.current_solution,
-                                         external_space_dim,
+      x.current_solution->update_tableau(external_space_dim,
                                          first_pending_constraint,
                                          input_cs,
                                          parameters);
diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc
index 89f40f1..1f904eb 100644
--- a/src/PIP_Tree.cc
+++ b/src/PIP_Tree.cc
@@ -275,19 +275,16 @@ PIP_Decision_Node::OK() const {
 }
 
 void
-PIP_Decision_Node::update_tableau(PIP_Tree_Node ** /* parent_ref */,
-                                  dimension_type external_space_dim,
+PIP_Decision_Node::update_tableau(dimension_type external_space_dim,
                                   dimension_type first_pending_constraint,
                                   const Constraint_Sequence &input_cs,
                                   const Variables_Set &parameters) {
-  true_child->update_tableau(&true_child,
-                             external_space_dim,
+  true_child->update_tableau(external_space_dim,
                              first_pending_constraint,
                              input_cs,
                              parameters);
   if (false_child)
-    false_child->update_tableau(&false_child,
-                                external_space_dim,
+    false_child->update_tableau(external_space_dim,
                                 first_pending_constraint,
                                 input_cs,
                                 parameters);
@@ -558,8 +555,7 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) {
 }
 
 void
-PIP_Solution_Node::update_tableau(PIP_Tree_Node ** /* parent_ref */,
-                                  dimension_type external_space_dim,
+PIP_Solution_Node::update_tableau(dimension_type external_space_dim,
                                   dimension_type first_pending_constraint,
                                   const Constraint_Sequence &input_cs,
                                   const Variables_Set &parameters) {
diff --git a/src/PIP_Tree.defs.hh b/src/PIP_Tree.defs.hh
index 1893dd6..5f409f3 100644
--- a/src/PIP_Tree.defs.hh
+++ b/src/PIP_Tree.defs.hh
@@ -97,9 +97,6 @@ protected:
   /*! \brief
     Populates the parametric simplex tableau using external data, if necessary
 
-    \param parent_ref
-    a pointer to the parent reference to \p this
-
     \param external_space_dim
     size of constraints (variables and parameters added)
 
@@ -113,8 +110,7 @@ protected:
     \param parameters
     a \c std::set of indices of the parameters in the constraints
   */
-  virtual void update_tableau(PIP_Tree_Node **parent_ref,
-                              dimension_type external_space_dim,
+  virtual void update_tableau(dimension_type external_space_dim,
                               dimension_type first_pending_constraint,
                               const Constraint_Sequence &input_cs,
                               const Variables_Set &parameters) = 0;
@@ -305,9 +301,6 @@ protected:
   /*! \brief
     Populates the parametric simplex tableau using external data, if necessary
 
-    \param parent_ref
-    a pointer to the parent reference to \p this
-
     \param external_space_dim
     size of constraints (variables and parameters added)
 
@@ -321,8 +314,7 @@ protected:
     \param parameters
     a \c std::set of indices of the parameters in the constraints
   */
-  virtual void update_tableau(PIP_Tree_Node **parent_ref,
-                              dimension_type external_space_dim,
+  virtual void update_tableau(dimension_type external_space_dim,
                               dimension_type first_pending_constraint,
                               const Constraint_Sequence &input_cs,
                               const Variables_Set &parameters);
@@ -400,9 +392,6 @@ protected:
   /*! \brief
     Populates the parametric simplex tableau using external data, if necessary
 
-    \param parent_ref
-    a pointer to the parent reference to \p this
-
     \param external_space_dim
     size of constraints (variables and parameters added)
 
@@ -416,8 +405,7 @@ protected:
     \param parameters
     a \c std::set of indices of the parameters in the constraints
   */
-  virtual void update_tableau(PIP_Tree_Node **parent_ref,
-                              dimension_type external_space_dim,
+  virtual void update_tableau(dimension_type external_space_dim,
                               dimension_type first_pending_constraint,
                               const Constraint_Sequence &input_cs,
                               const Variables_Set &parameters);




More information about the PPL-devel mailing list