From 707702a4478960776d455e9fdec702349b74886d Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 14 Jan 2015 15:14:57 +0100 Subject: [PATCH] Revert "preprocessor: replace oo_.exo_steady_state with steady_state_x, #825" This reverts commit 2bb97a90d6a346244ca992b9caff6e4c55dd7f66. --- preprocessor/DynamicModel.cc | 2 +- preprocessor/ExprNode.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc index e613fedc5..eaf0a9438 100644 --- a/preprocessor/DynamicModel.cc +++ b/preprocessor/DynamicModel.cc @@ -1532,7 +1532,7 @@ DynamicModel::writeDynamicMFile(const string &dynamic_basename) const cerr << "Error: Can't open file " << filename << " for writing" << endl; exit(EXIT_FAILURE); } - mDynamicModelFile << "function [residual, g1, g2, g3] = " << dynamic_basename << "(y, x, params, steady_state, steady_state_x, it_)" << endl + mDynamicModelFile << "function [residual, g1, g2, g3] = " << dynamic_basename << "(y, x, params, steady_state, it_)" << endl << "%" << endl << "% Status : Computes dynamic model for Dynare" << endl << "%" << endl diff --git a/preprocessor/ExprNode.cc b/preprocessor/ExprNode.cc index 22cfd2a06..d4121b729 100644 --- a/preprocessor/ExprNode.cc +++ b/preprocessor/ExprNode.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2015 Dynare Team + * Copyright (C) 2007-2014 Dynare Team * * This file is part of Dynare. * @@ -712,10 +712,10 @@ VariableNode::writeOutput(ostream &output, ExprNodeOutputType output_type, break; case oMatlabOutsideModel: assert(lag == 0); - output << "steady_state_x(" << i << ")"; + output << "oo_.exo_steady_state(" << i << ")"; break; case oMatlabDynamicSteadyStateOperator: - output << "steady_state_x(" << i << ")"; + output << "oo_.exo_steady_state(" << i << ")"; break; case oSteadyStateFile: output << "exo_(" << i << ")";