From e045d42c12da1bea7d00432cbead9fab1d76717d Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Wed, 15 Apr 2015 16:16:26 +0200
Subject: [PATCH] preprocessor: remove resetDataTree method

---
 DynamicModel.cc | 12 ------------
 DynamicModel.hh |  3 ---
 ModFile.cc      |  1 -
 ModelTree.cc    |  8 ++++++++
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/DynamicModel.cc b/DynamicModel.cc
index c6c308e1..1de6bc8c 100644
--- a/DynamicModel.cc
+++ b/DynamicModel.cc
@@ -3429,18 +3429,6 @@ DynamicModel::writeDynamicFile(const string &basename, bool block, bool bytecode
     writeDynamicMFile(t_basename);
 }
 
-void
-DynamicModel::resetDataTree()
-{
-  variable_node_map.clear();
-  unary_op_node_map.clear();
-  binary_op_node_map.clear();
-  trinary_op_node_map.clear();
-  external_function_node_map.clear();
-  first_deriv_external_function_node_map.clear();
-  second_deriv_external_function_node_map.clear();
-}
-
 void
 DynamicModel::cloneDynamic(DynamicModel &dynamic_model) const
 {
diff --git a/DynamicModel.hh b/DynamicModel.hh
index e6a56675..7c4b5e0e 100644
--- a/DynamicModel.hh
+++ b/DynamicModel.hh
@@ -235,9 +235,6 @@ public:
   /*! It assumes that the dynamic model given in argument has just been allocated */
   void cloneDynamic(DynamicModel &dynamic_model) const;
 
-  //! reset DataTree vars
-  void resetDataTree();
-
   //! Replaces model equations with derivatives of Lagrangian w.r.t. endogenous
   void computeRamseyPolicyFOCs(const StaticModel &static_model);
   //! Replaces the model equations in dynamic_model with those in this model
diff --git a/ModFile.cc b/ModFile.cc
index d9f36dbb..c1c345ff 100644
--- a/ModFile.cc
+++ b/ModFile.cc
@@ -313,7 +313,6 @@ ModFile::transformPass(bool nostrict)
     {
       SymbolTable orig_symbol_table = symbol_table;
       symbol_table.rmExo(unusedExo);
-      dynamic_model.resetDataTree();
       dynamic_model.reindex(orig_symbol_table);
       vector<Statement *> orig_statements = statements;
       statements.clear();
diff --git a/ModelTree.cc b/ModelTree.cc
index b252d96d..6f3a10e5 100644
--- a/ModelTree.cc
+++ b/ModelTree.cc
@@ -1416,6 +1416,14 @@ ModelTree::addAuxEquation(expr_t eq)
 void
 ModelTree::reindex(SymbolTable &orig_symbol_table)
 {
+  variable_node_map.clear();
+  unary_op_node_map.clear();
+  binary_op_node_map.clear();
+  trinary_op_node_map.clear();
+  external_function_node_map.clear();
+  first_deriv_external_function_node_map.clear();
+  second_deriv_external_function_node_map.clear();
+
   reindexEquations(orig_symbol_table);
   reindexTrendSymbolsMap(orig_symbol_table);
   reindexNonstationarySymbolsMap(orig_symbol_table);