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 05d6576da..8f549dbf5 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) :