From a9658468c9f3172d50341672aa19d92d1a5570f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Fri, 3 Jan 2014 12:09:39 +0100
Subject: [PATCH] Remove more remnants from old deterministic conditional
forecast syntax. (cherry picked from commit
5bbfe9cd5a2dd6d3b3fb7cb1e13d317ffd36997d)
---
matlab/imcforecast.m | 12 ++----------
preprocessor/ComputingTasks.cc | 4 ++--
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/matlab/imcforecast.m b/matlab/imcforecast.m
index de69d7bcd..2fa56a2ba 100644
--- a/matlab/imcforecast.m
+++ b/matlab/imcforecast.m
@@ -1,4 +1,4 @@
-function imcforecast(constrained_paths, constrained_vars, options_cond_fcst, constrained_perfect_foresight)
+function imcforecast(constrained_paths, constrained_vars, options_cond_fcst)
% Computes conditional forecasts.
%
% INPUTS
@@ -26,7 +26,7 @@ function imcforecast(constrained_paths, constrained_vars, options_cond_fcst, con
% [1] Results are stored in a structure which is saved in a mat file called conditional_forecasts.mat.
% [2] Use the function plot_icforecast to plot the results.
-% Copyright (C) 2006-2013 Dynare Team
+% Copyright (C) 2006-2014 Dynare Team
%
% This file is part of Dynare.
%
@@ -46,14 +46,6 @@ function imcforecast(constrained_paths, constrained_vars, options_cond_fcst, con
global options_ oo_ M_ bayestopt_
-if isfield(options_cond_fcst, 'simulation_type')
- if strcmp(options_cond_fcst.simulation_type, 'deterministic')
- disp('deterministic condtional forecast');
- det_cond_forecast(constrained_paths, constrained_vars, options_cond_fcst, constrained_perfect_foresight);
- return;
- end
-end
-
if ~isfield(options_cond_fcst,'parameter_set') || isempty(options_cond_fcst.parameter_set)
options_cond_fcst.parameter_set = 'posterior_mode';
end
diff --git a/preprocessor/ComputingTasks.cc b/preprocessor/ComputingTasks.cc
index b56685497..ef6c1b97b 100644
--- a/preprocessor/ComputingTasks.cc
+++ b/preprocessor/ComputingTasks.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2013 Dynare Team
+ * Copyright (C) 2003-2014 Dynare Team
*
* This file is part of Dynare.
*
@@ -1338,7 +1338,7 @@ void
ConditionalForecastStatement::writeOutput(ostream &output, const string &basename) const
{
options_list.writeOutput(output, "options_cond_fcst_");
- output << "imcforecast(constrained_paths_, constrained_vars_, options_cond_fcst_, constrained_perfect_foresight_);" << endl;
+ output << "imcforecast(constrained_paths_, constrained_vars_, options_cond_fcst_);" << endl;
}
PlotConditionalForecastStatement::PlotConditionalForecastStatement(int periods_arg, const SymbolList &symbol_list_arg) :
--
GitLab