From e2c0854cd4c33fa8a2aca09031075f9bd8503247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 16 Mar 2010 12:23:59 +0100
Subject: [PATCH] Preprocessor: removed useless version of
 DataTree::AddVariable()

---
 preprocessor/DataTree.cc      |  7 -------
 preprocessor/DataTree.hh      |  2 --
 preprocessor/ExprNode.cc      | 10 +++++-----
 preprocessor/ParsingDriver.cc |  3 ++-
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/preprocessor/DataTree.cc b/preprocessor/DataTree.cc
index 3026b029e..a10080f24 100644
--- a/preprocessor/DataTree.cc
+++ b/preprocessor/DataTree.cc
@@ -72,13 +72,6 @@ DataTree::AddVariableInternal(int symb_id, int lag)
     return new VariableNode(*this, symb_id, lag);
 }
 
-VariableNode *
-DataTree::AddVariable(const string &name, int lag)
-{
-  int symb_id = symbol_table.getID(name);
-  return AddVariable(symb_id, lag);
-}
-
 VariableNode *
 DataTree::AddVariable(int symb_id, int lag)
 {
diff --git a/preprocessor/DataTree.hh b/preprocessor/DataTree.hh
index 5e6e9f15e..c4801164e 100644
--- a/preprocessor/DataTree.hh
+++ b/preprocessor/DataTree.hh
@@ -112,8 +112,6 @@ public:
   //! Adds a variable
   /*! The default implementation of the method refuses any lag != 0 */
   virtual VariableNode *AddVariable(int symb_id, int lag = 0);
-  //! Adds a variable, using its symbol name
-  VariableNode *AddVariable(const string &name, int lag = 0);
   //! Adds "arg1+arg2" to model tree
   NodeID AddPlus(NodeID iArg1, NodeID iArg2);
   //! Adds "arg1-arg2" to model tree
diff --git a/preprocessor/ExprNode.cc b/preprocessor/ExprNode.cc
index 9a720b917..0d381ac5d 100644
--- a/preprocessor/ExprNode.cc
+++ b/preprocessor/ExprNode.cc
@@ -828,7 +828,7 @@ VariableNode::getChainRuleDerivative(int deriv_id, const map<int, NodeID> &recur
 NodeID
 VariableNode::toStatic(DataTree &static_datatree) const
 {
-  return static_datatree.AddVariable(datatree.symbol_table.getName(symb_id));
+  return static_datatree.AddVariable(symb_id);
 }
 
 int
@@ -2611,25 +2611,25 @@ BinaryOpNode::normalizeEquation(int var_endo, vector<pair<int, pair<NodeID, Node
       if (!is_endogenous_present_1 && !is_endogenous_present_2)
         {
           return (make_pair(0,
-                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getName(datatree.symbol_table.getID(eEndogenous, var_endo)), 0), datatree.AddMinus(NodeID_2, NodeID_1))
+                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getID(eEndogenous, var_endo), 0), datatree.AddMinus(NodeID_2, NodeID_1))
                             ));
         }
       else if (is_endogenous_present_1 && is_endogenous_present_2)
         {
           return (make_pair(0,
-                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getName(datatree.symbol_table.getID(eEndogenous, var_endo)), 0), datatree.Zero)
+                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getID(eEndogenous, var_endo), 0), datatree.Zero)
                             ));
         }
       else if (!is_endogenous_present_1 && is_endogenous_present_2)
         {
           return (make_pair(0,
-                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getName(datatree.symbol_table.getID(eEndogenous, var_endo)), 0), /*datatree.AddUMinus(NodeID_1)*/ NodeID_1)
+                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getID(eEndogenous, var_endo), 0), /*datatree.AddUMinus(NodeID_1)*/ NodeID_1)
                             ));
         }
       else if (is_endogenous_present_1 && !is_endogenous_present_2)
         {
           return (make_pair(0,
-                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getName(datatree.symbol_table.getID(eEndogenous, var_endo)), 0), NodeID_2)
+                            datatree.AddEqual(datatree.AddVariable(datatree.symbol_table.getID(eEndogenous, var_endo), 0), NodeID_2)
                             ));
         }
       break;
diff --git a/preprocessor/ParsingDriver.cc b/preprocessor/ParsingDriver.cc
index 7d8f5d1ce..4be917cbb 100644
--- a/preprocessor/ParsingDriver.cc
+++ b/preprocessor/ParsingDriver.cc
@@ -250,7 +250,8 @@ ParsingDriver::add_expression_variable(string *name)
   if (mod_file->symbol_table.getType(*name) == eModelLocalVariable)
     error("Variable " + *name + " not allowed outside model declaration. Its scope is only inside model.");
 
-  NodeID id = data_tree->AddVariable(*name);
+  int symb_id = mod_file->symbol_table.getID(*name);
+  NodeID id = data_tree->AddVariable(symb_id);
 
   delete name;
   return id;