diff --git a/ExprNode.cc b/ExprNode.cc
index 8798d79671a18d7fdb086c1b228aedb784d6a106..b9c4405528ed4f596f0f159f00d71199d57e251e 100644
--- a/ExprNode.cc
+++ b/ExprNode.cc
@@ -2356,7 +2356,7 @@ UnaryOpNode::substituteExpectation(subst_table_t &subst_table, vector<BinaryOpNo
//Arriving here, we need to create an auxiliary variable for this Expectation Operator:
//AUX_EXPECT_(LEAD/LAG)_(period)_(arg.idx) OR
//AUX_EXPECT_(info_set_name)_(arg.idx)
- int symb_id = datatree.symbol_table.addExpectationAuxiliaryVar(expectation_information_set, arg->idx);
+ int symb_id = datatree.symbol_table.addExpectationAuxiliaryVar(expectation_information_set, arg->idx, arg);
expr_t newAuxE = datatree.AddVariable(symb_id, 0);
if (partial_information_model && expectation_information_set == 0)
diff --git a/SymbolTable.cc b/SymbolTable.cc
index 9d43b79114881831a6a2496d412ca89e5539d2d3..2c1a699c593433fb06dd58e6cb1245d328e363c9 100644
--- a/SymbolTable.cc
+++ b/SymbolTable.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 Dynare Team
+ * Copyright (C) 2003-2015 Dynare Team
*
* This file is part of Dynare.
*
@@ -25,12 +25,15 @@
#include "SymbolTable.hh"
AuxVarInfo::AuxVarInfo(int symb_id_arg, aux_var_t type_arg, int orig_symb_id_arg, int orig_lead_lag_arg,
- int equation_number_for_multiplier_arg) :
+ int equation_number_for_multiplier_arg, int information_set_arg,
+ expr_t expectation_expr_node_arg) :
symb_id(symb_id_arg),
type(type_arg),
orig_symb_id(orig_symb_id_arg),
orig_lead_lag(orig_lead_lag_arg),
- equation_number_for_multiplier(equation_number_for_multiplier_arg)
+ equation_number_for_multiplier(equation_number_for_multiplier_arg),
+ information_set(information_set_arg),
+ expectation_expr_node(expectation_expr_node_arg)
{
}
@@ -243,7 +246,6 @@ SymbolTable::writeOutput(ostream &output) const throw (NotYetFrozenException)
{
case avEndoLead:
case avExoLead:
- case avExpectation:
break;
case avEndoLag:
case avExoLag:
@@ -256,6 +258,13 @@ SymbolTable::writeOutput(ostream &output) const throw (NotYetFrozenException)
case avDiffForward:
output << "M_.aux_vars(" << i+1 << ").orig_index = " << getTypeSpecificID(aux_vars[i].get_orig_symb_id())+1 << ";" << endl;
break;
+ case avExpectation:
+ output << "M_.aux_vars(" << i+1 << ").orig_expr = '\\mathbb{E}_{t"
+ << (aux_vars[i].get_information_set() < 0 ? "" : "+")
+ << aux_vars[i].get_information_set() << "}(";
+ aux_vars[i].get_expectation_expr_node()->writeOutput(output, oLatexDynamicModel);
+ output << ")';" << endl;
+ break;
}
}
@@ -468,7 +477,7 @@ SymbolTable::addLeadAuxiliaryVarInternal(bool endo, int index) throw (FrozenExce
exit(EXIT_FAILURE);
}
- aux_vars.push_back(AuxVarInfo(symb_id, (endo ? avEndoLead : avExoLead), 0, 0, 0));
+ aux_vars.push_back(AuxVarInfo(symb_id, (endo ? avEndoLead : avExoLead), 0, 0, 0, 0, NULL));
return symb_id;
}
@@ -494,7 +503,7 @@ SymbolTable::addLagAuxiliaryVarInternal(bool endo, int orig_symb_id, int orig_le
exit(EXIT_FAILURE);
}
- aux_vars.push_back(AuxVarInfo(symb_id, (endo ? avEndoLag : avExoLag), orig_symb_id, orig_lead_lag, 0));
+ aux_vars.push_back(AuxVarInfo(symb_id, (endo ? avEndoLag : avExoLag), orig_symb_id, orig_lead_lag, 0, 0, NULL));
return symb_id;
}
@@ -524,7 +533,7 @@ SymbolTable::addExoLagAuxiliaryVar(int orig_symb_id, int orig_lead_lag) throw (F
}
int
-SymbolTable::addExpectationAuxiliaryVar(int information_set, int index) throw (FrozenException)
+SymbolTable::addExpectationAuxiliaryVar(int information_set, int index, expr_t exp_arg) throw (FrozenException)
{
ostringstream varname;
int symb_id;
@@ -542,7 +551,7 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index) throw (F
exit(EXIT_FAILURE);
}
- aux_vars.push_back(AuxVarInfo(symb_id, avExpectation, 0, 0, 0));
+ aux_vars.push_back(AuxVarInfo(symb_id, avExpectation, 0, 0, 0, information_set, exp_arg));
return symb_id;
}
@@ -564,7 +573,7 @@ SymbolTable::addMultiplierAuxiliaryVar(int index) throw (FrozenException)
exit(EXIT_FAILURE);
}
- aux_vars.push_back(AuxVarInfo(symb_id, avMultiplier, 0, 0, index));
+ aux_vars.push_back(AuxVarInfo(symb_id, avMultiplier, 0, 0, index, 0, NULL));
return symb_id;
}
@@ -585,7 +594,7 @@ SymbolTable::addDiffForwardAuxiliaryVar(int orig_symb_id) throw (FrozenException
exit(EXIT_FAILURE);
}
- aux_vars.push_back(AuxVarInfo(symb_id, avDiffForward, orig_symb_id, 0, 0));
+ aux_vars.push_back(AuxVarInfo(symb_id, avDiffForward, orig_symb_id, 0, 0, 0, NULL));
return symb_id;
}
diff --git a/SymbolTable.hh b/SymbolTable.hh
index 3e4c47e126940efb470002e6a81b597ba22330f8..4be960a1c87bb6265a977ee2af25b0ff166801a3 100644
--- a/SymbolTable.hh
+++ b/SymbolTable.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 Dynare Team
+ * Copyright (C) 2003-2015 Dynare Team
*
* This file is part of Dynare.
*
@@ -29,6 +29,9 @@ using namespace std;
#include <ostream>
#include "CodeInterpreter.hh"
+#include "ExprNode.hh"
+
+typedef class ExprNode *expr_t;
//! Types of auxiliary variables
enum aux_var_t
@@ -51,13 +54,17 @@ private:
int orig_symb_id; //!< Symbol ID of the endo of the original model represented by this aux var. Only used for avEndoLag and avExoLag.
int orig_lead_lag; //!< Lead/lag of the endo of the original model represented by this aux var. Only used for avEndoLag and avExoLag.
int equation_number_for_multiplier; //!< Stores the original constraint equation number associated with this aux var. Only used for avMultiplier.
+ int information_set; //! Argument of expectation operator. Only used for avExpectation.
+ expr_t expectation_expr_node; //! Argument of expectation operator. Only used for avExpectation.
public:
- AuxVarInfo(int symb_id_arg, aux_var_t type_arg, int orig_symb_id, int orig_lead_lag, int equation_number_for_multiplier_arg);
+ AuxVarInfo(int symb_id_arg, aux_var_t type_arg, int orig_symb_id, int orig_lead_lag, int equation_number_for_multiplier_arg, int information_set_arg, expr_t expectation_expr_node_arg);
int get_symb_id() const { return symb_id; };
aux_var_t get_type() const { return type; };
int get_orig_symb_id() const { return orig_symb_id; };
int get_orig_lead_lag() const { return orig_lead_lag; };
int get_equation_number_for_multiplier() const { return equation_number_for_multiplier; };
+ int get_information_set() const { return information_set; };
+ expr_t get_expectation_expr_node() const { return expectation_expr_node; } ;
};
//! Stores the symbol table
@@ -216,7 +223,7 @@ public:
\param[in] index Used to construct the variable name
\return the symbol ID of the new symbol
*/
- int addExpectationAuxiliaryVar(int information_set, int index) throw (FrozenException);
+ int addExpectationAuxiliaryVar(int information_set, int index, expr_t arg) throw (FrozenException);
//! Adds an auxiliary variable for the multiplier for the FOCs of the Ramsey Problem
/*!
\param[in] index Used to construct the variable name