From 347ab4d0c0c79ae9a42898c1d5409d78708bb8a8 Mon Sep 17 00:00:00 2001
From: Michel Juillard <michel.juillard@mjui.fr>
Date: Sun, 25 Sep 2011 20:21:30 +0200
Subject: [PATCH] preprocessor: modified order of auxiliary variables
definitions
---
preprocessor/StaticModel.cc | 4 ++--
preprocessor/SteadyStateModel.cc | 2 +-
tests/{ => expectations}/expectation.mod | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename tests/{ => expectations}/expectation.mod (100%)
diff --git a/preprocessor/StaticModel.cc b/preprocessor/StaticModel.cc
index 09bfeb573..adc84c23e 100644
--- a/preprocessor/StaticModel.cc
+++ b/preprocessor/StaticModel.cc
@@ -1702,7 +1702,7 @@ StaticModel::writeLatexFile(const string &basename) const
void
StaticModel::writeAuxVarInitval(ostream &output, ExprNodeOutputType output_type) const
{
- for (int i = 0; i < (int) aux_equations.size(); i++)
+ for (int i = (int) aux_equations.size()-1; i >= 0; i--)
{
dynamic_cast<ExprNode *>(aux_equations[i])->writeOutput(output, output_type);
output << ";" << endl;
@@ -1730,7 +1730,7 @@ void StaticModel::writeAuxVarRecursiveDefinitions(const string &basename) const
<< "% from model file (.mod)" << endl
<< endl;
- for (int i = 0; i < (int) aux_equations.size(); i++)
+ for (int i = (int) aux_equations.size()-1; i >= 0; i--)
{
dynamic_cast<ExprNode *>(aux_equations[i])->writeOutput(output, oMatlabStaticModel);
output << ";" << endl;
diff --git a/preprocessor/SteadyStateModel.cc b/preprocessor/SteadyStateModel.cc
index a222aa327..d665428bb 100644
--- a/preprocessor/SteadyStateModel.cc
+++ b/preprocessor/SteadyStateModel.cc
@@ -121,7 +121,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_polic
output << ", exo_)" << endl
<< "% Steady state generated by Dynare preprocessor" << endl;
if (!ramsey_policy)
- output << " ys_=zeros(" << symbol_table.orig_endo_nbr() << ",1);" << endl;
+ output << " ys_=zeros(" << symbol_table.endo_nbr() << ",1);" << endl;
output << " global M_" << endl;
for (size_t i = 0; i < recursive_order.size(); i++)
diff --git a/tests/expectation.mod b/tests/expectations/expectation.mod
similarity index 100%
rename from tests/expectation.mod
rename to tests/expectations/expectation.mod
--
GitLab