From e70d899c6699af534c43199bbf687ce834a3437b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 23 Feb 2010 16:45:56 +0100
Subject: [PATCH] Preprocessor: * in DataTree, new functions for testing if
 some opcode (unary, binary or trinary) is used somewhere in the tree *
 removed DataTree::containsSteadyState(), rather use a call to the new utility
 function

---
 DataTree.cc     | 26 ++++++++++++++++++++++++--
 DataTree.hh     |  9 ++++++---
 DynamicModel.cc |  2 +-
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/DataTree.cc b/DataTree.cc
index 01050a25..582aff41 100644
--- a/DataTree.cc
+++ b/DataTree.cc
@@ -490,11 +490,33 @@ DataTree::getDynJacobianCol(int deriv_id) const throw (UnknownDerivIDException)
 }
 
 bool
-DataTree::containsSteadyStateOperator() const
+DataTree::isUnaryOpUsed(UnaryOpcode opcode) const
 {
   for (unary_op_node_map_type::const_iterator it = unary_op_node_map.begin();
        it != unary_op_node_map.end(); it++)
-    if (it->first.second == oSteadyState)
+    if (it->first.second == opcode)
+      return true;
+
+  return false;
+}
+
+bool
+DataTree::isBinaryOpUsed(BinaryOpcode opcode) const
+{
+  for (binary_op_node_map_type::const_iterator it = binary_op_node_map.begin();
+       it != binary_op_node_map.end(); it++)
+    if (it->first.second == opcode)
+      return true;
+
+  return false;
+}
+
+bool
+DataTree::isTrinaryOpUsed(TrinaryOpcode opcode) const
+{
+  for (trinary_op_node_map_type::const_iterator it = trinary_op_node_map.begin();
+       it != trinary_op_node_map.end(); it++)
+    if (it->first.second == opcode)
       return true;
 
   return false;
diff --git a/DataTree.hh b/DataTree.hh
index 05fe6047..28d2e0cd 100644
--- a/DataTree.hh
+++ b/DataTree.hh
@@ -67,9 +67,6 @@ protected:
   //! Internal implementation of AddVariable(), without the check on the lag
   VariableNode *AddVariableInternal(int symb_id, int lag);
 
-  //! Is there a steady state operator in the tree?
-  bool containsSteadyStateOperator() const;
-
 private:
   typedef list<NodeID> node_list_type;
   //! The list of nodes
@@ -183,6 +180,12 @@ public:
   NodeID AddUnknownFunction(const string &function_name, const vector<NodeID> &arguments);
   //! Checks if a given symbol is used somewhere in the data tree
   bool isSymbolUsed(int symb_id) const;
+  //! Checks if a given unary op is used somewhere in the data tree
+  bool isUnaryOpUsed(UnaryOpcode opcode) const;
+  //! Checks if a given binary op is used somewhere in the data tree
+  bool isBinaryOpUsed(BinaryOpcode opcode) const;
+  //! Checks if a given trinary op is used somewhere in the data tree
+  bool isTrinaryOpUsed(TrinaryOpcode opcode) const;
   //! Thrown when trying to access an unknown variable by deriv_id
   class UnknownDerivIDException
   {
diff --git a/DynamicModel.cc b/DynamicModel.cc
index 92c63d2f..abbb3e6e 100644
--- a/DynamicModel.cc
+++ b/DynamicModel.cc
@@ -1136,7 +1136,7 @@ DynamicModel::writeDynamicMFile(const string &dynamic_basename) const
                     << "% Warning : this file is generated automatically by Dynare" << endl
                     << "%           from model file (.mod)" << endl << endl;
 
-  if (containsSteadyStateOperator())
+  if (isUnaryOpUsed(oSteadyState))
     mDynamicModelFile << "global oo_;" << endl << endl;
 
   writeDynamicModel(mDynamicModelFile, false);