stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preprocessor: removed unfinished 'prior_analysis' and 'posterior_analysis' statements

time-shift
Sébastien Villemot 2010-03-18 14:56:22 +01:00
parent 127e5ca05a
commit 41343575a7
7 changed files with 1 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
doc/manual.xml
View File

@ -2228,8 +2228,6 @@ stoch_simul(linear,irf=60) y k;
<listitem><para><xref linkend='estimated_params_init'/></para></listitem>
<listitem><para><xref linkend='estimated_params_bounds'/></para></listitem>
<listitem><para><xref linkend='estimation'/></para></listitem>
<listitem><para><xref linkend='prior_analysis'/></para></listitem>
<listitem><para><xref linkend='posterior_analysis'/></para></listitem>
<listitem><para><xref linkend='model_comparison'/></para></listitem>
<listitem><para><xref linkend='shock_decomposition'/></para></listitem>
<listitem><para><xref linkend='unit_root_vars'/> (deprecated)</para></listitem>
@ -2960,104 +2958,6 @@ oo_.posterior_hpdsup.measurement_errors_corr.gdp_conso
</refsect1>
</refentry>
<refentry id="prior_analysis">
<refmeta>
<refentrytitle>prior_analysis</refentrytitle>
</refmeta>
<refnamediv>
<refname>prior_analysis</refname>
<refpurpose>Prior distribution analysis</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>prior_analysis</command>
<arg>(<replaceable>OPTION</replaceable><arg rep="repeat">, <replaceable>OPTION</replaceable></arg>)</arg><arg choice="plain">;</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1><title>Options</title>
<variablelist>
<varlistentry>
<term><option>nograph</option></term>
<listitem><para>See <link linkend="nograph">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>conf_sig</option> = <replaceable>DOUBLE</replaceable></term>
<listitem><para>See <link linkend="conf_sig">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>prior_trunc</option> = <replaceable>DOUBLE</replaceable></term>
<listitem><para>See <link linkend="prior_trunc">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>bayesian_irf</option></term>
<listitem><para>See <link linkend="bayesian_irf">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>irf</option> = <replaceable>INTEGER</replaceable></term>
<listitem><para>See <link linkend="irf">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>tex</option></term>
<listitem><para>See <link linkend="tex">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>forecast</option> = <replaceable>INTEGER</replaceable></term>
<listitem><para>See <link linkend="forecast_opt">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>smoother</option></term>
<listitem><para>See <link linkend="smoother">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>moments_varendo</option></term>
<listitem><para>See <link linkend="moments_varendo">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>filtered_vars</option></term>
<listitem><para>See <link linkend="filtered_vars">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>xls_sheet</option> = <replaceable>NAME</replaceable></term>
<listitem><para>See <link linkend="xls_sheet">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>xls_range</option> = <replaceable>RANGE</replaceable></term>
<listitem><para>See <link linkend="xls_range">there</link></para></listitem>
</varlistentry>
<varlistentry>
<term><option>filter_step_ahead</option> = [<replaceable>INTEGER_1</replaceable>:<replaceable>INTEGER_2</replaceable>]</term>
<listitem><para>See <link linkend="filter_step_ahead">there</link></para></listitem>
</varlistentry>
</variablelist>
</refsect1>
</refentry>
<refentry id="posterior_analysis">
<refmeta>
<refentrytitle>posterior_analysis</refentrytitle>
</refmeta>
<refnamediv>
<refname>posterior_analysis</refname>
<refpurpose>Posterior distribution analysis</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>posterior_analysis</command>
<arg>(<replaceable>OPTION</replaceable><arg rep="repeat">, <replaceable>OPTION</replaceable></arg>)</arg><arg choice="plain">;</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1><title>Options</title>
<para>This command accepts exactly the same options than <xref linkend="prior_analysis"/></para>
</refsect1>
</refentry>
<refentry id="model_comparison">
<refmeta>
<refentrytitle>model_comparison</refentrytitle>

30
preprocessor/ComputingTasks.cc
View File

@ -229,36 +229,6 @@ EstimationStatement::writeOutput(ostream &output, const string &basename) const
output << "dynare_estimation(var_list_);\n";
}
PriorAnalysisStatement::PriorAnalysisStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg) :
symbol_list(symbol_list_arg),
options_list(options_list_arg)
{
}
void
PriorAnalysisStatement::writeOutput(ostream &output, const string &basename) const
{
options_list.writeOutput(output);
symbol_list.writeOutput("var_list_", output);
output << "prior_analysis(var_list_);\n";
}
PosteriorAnalysisStatement::PosteriorAnalysisStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg) :
symbol_list(symbol_list_arg),
options_list(options_list_arg)
{
}
void
PosteriorAnalysisStatement::writeOutput(ostream &output, const string &basename) const
{
options_list.writeOutput(output);
symbol_list.writeOutput("var_list_", output);
output << "posterior_analysis(var_list_);\n";
}
DynareSensitivityStatement::DynareSensitivityStatement(const OptionsList &options_list_arg) :
options_list(options_list_arg)
{

22
preprocessor/ComputingTasks.hh
View File

@ -154,28 +154,6 @@ public:
virtual void writeOutput(ostream &output, const string &basename) const;
};
class PriorAnalysisStatement : public Statement
{
private:
const SymbolList symbol_list;
const OptionsList options_list;
public:
PriorAnalysisStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
};
class PosteriorAnalysisStatement : public Statement
{
private:
const SymbolList symbol_list;
const OptionsList options_list;
public:
PosteriorAnalysisStatement(const SymbolList &symbol_list_arg,
const OptionsList &options_list_arg);
virtual void writeOutput(ostream &output, const string &basename) const;
};
class DynareSensitivityStatement : public Statement
{
private:

35
preprocessor/DynareBison.yy
View File

@ -115,7 +115,7 @@ class ParsingDriver;
%token NOGRAPH NOMOMENTS NOPRINT NORMAL_PDF
%token OBSERVATION_TRENDS OPTIM OPTIM_WEIGHTS ORDER OSR OSR_PARAMS
%token PARAMETERS PARAMETER_SET PARTIAL_INFORMATION PERIODS PLANNER_OBJECTIVE PLOT_CONDITIONAL_FORECAST PLOT_PRIORS PREFILTER PRESAMPLE
%token PRINT PRIOR_MC PRIOR_TRUNC PRIOR_ANALYSIS PRIOR_MODE PRIOR_MEAN POSTERIOR_ANALYSIS POSTERIOR_MODE POSTERIOR_MEAN POSTERIOR_MEDIAN
%token PRINT PRIOR_MC PRIOR_TRUNC PRIOR_MODE PRIOR_MEAN POSTERIOR_MODE POSTERIOR_MEAN POSTERIOR_MEDIAN
%token <string_val> QUOTED_STRING
%token QZ_CRITERIUM FULL
%token RELATIVE_IRF REPLIC RPLOT SAVE_PARAMS_AND_STEADY_STATE
@ -200,8 +200,6 @@ statement : parameters
| simul
| stoch_simul
| estimation
| prior_analysis
| posterior_analysis
| estimated_params
| estimated_params_bounds
| estimated_params_init
@ -1147,37 +1145,6 @@ estimation_options : o_datafile
| o_partial_information
;
prior_analysis : PRIOR_ANALYSIS '(' prior_posterior_options_list ')' ';'
{ driver.run_prior_analysis(); }
| PRIOR_ANALYSIS '(' prior_posterior_options_list ')' symbol_list ';'
{ driver.run_prior_analysis(); }
;
prior_posterior_options_list : prior_posterior_options_list COMMA prior_posterior_options
| prior_posterior_options
;
prior_posterior_options : o_nograph
| o_conf_sig
| o_prior_trunc
| o_bayesian_irf
| o_irf
| o_tex
| o_forecast
| o_smoother
| o_moments_varendo
| o_filtered_vars
| o_xls_sheet
| o_xls_range
| o_filter_step_ahead
;
posterior_analysis : POSTERIOR_ANALYSIS '(' prior_posterior_options_list ')' ';'
{ driver.run_posterior_analysis(); }
| POSTERIOR_ANALYSIS '(' prior_posterior_options_list ')' symbol_list ';'
{ driver.run_posterior_analysis(); }
;
list_optim_option : QUOTED_STRING COMMA QUOTED_STRING
{ driver.optim_options_string($1, $3); }
| QUOTED_STRING COMMA value

2
preprocessor/DynareFlex.ll
View File

@ -104,8 +104,6 @@ int sigma_e = 0;
<INITIAL>periods {BEGIN DYNARE_STATEMENT; return token::PERIODS;}
<INITIAL>model_info {BEGIN DYNARE_STATEMENT; return token::MODEL_INFO;}
<INITIAL>estimation {BEGIN DYNARE_STATEMENT; return token::ESTIMATION;}
<INITIAL>prior_analysis {BEGIN DYNARE_STATEMENT; return token::PRIOR_ANALYSIS;}
<INITIAL>posterior_analysis {BEGIN DYNARE_STATEMENT; return token::POSTERIOR_ANALYSIS;}
<INITIAL>varobs {BEGIN DYNARE_STATEMENT; return token::VAROBS;}
<INITIAL>unit_root_vars {BEGIN DYNARE_STATEMENT; return token::UNIT_ROOT_VARS;}
<INITIAL>rplot {BEGIN DYNARE_STATEMENT; return token::RPLOT;}

16
preprocessor/ParsingDriver.cc
View File

@ -897,22 +897,6 @@ ParsingDriver::run_estimation()
options_list.clear();
}
void
ParsingDriver::run_prior_analysis()
{
mod_file->addStatement(new PriorAnalysisStatement(symbol_list, options_list));
symbol_list.clear();
options_list.clear();
}
void
ParsingDriver::run_posterior_analysis()
{
mod_file->addStatement(new PosteriorAnalysisStatement(symbol_list, options_list));
symbol_list.clear();
options_list.clear();
}
void
ParsingDriver::dynare_sensitivity()
{

4
preprocessor/ParsingDriver.hh
View File

@ -331,10 +331,6 @@ public:
void add_estimated_params_element();
//! Runs estimation process
void run_estimation();
//! Runs prior_analysis();
void run_prior_analysis();
//! Runs posterior_analysis();
void run_posterior_analysis();
//! Runs dynare_sensitivy()
void dynare_sensitivity();
//! Adds an optimization option (string value)