From 880bb58aefa6f879005037f18a8766a27023c1dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Tue, 17 Jun 2014 10:19:07 +0200 Subject: [PATCH] Fixed mode_check and prior_posterior_statistics routines (added dataset_info as an input). --- matlab/mode_check.m | 6 +++--- matlab/prior_posterior_statistics.m | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/matlab/mode_check.m b/matlab/mode_check.m index 786acb7da..2fa6f4a9d 100644 --- a/matlab/mode_check.m +++ b/matlab/mode_check.m @@ -1,4 +1,4 @@ -function mode_check(fun,x,hessian,DynareDataset,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults) +function mode_check(fun,x,hessian,DynareDataset,DatasetInfo,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults) % Checks the estimated ML mode or Posterior mode. %@info: @@ -62,7 +62,7 @@ if ~isempty(hessian); [ s_min, k ] = min(diag(hessian)); end -fval = feval(fun,x,DynareDataset,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults); +fval = feval(fun,x,DynareDataset,DatasetInfo,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults); if ~isempty(hessian); skipline() @@ -138,7 +138,7 @@ for plt = 1:nbplt, end for i=1:length(z) xx(kk) = z(i); - [fval, junk1, junk2, exit_flag] = feval(fun,xx,DynareDataset,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults); + [fval, junk1, junk2, exit_flag] = feval(fun,xx,DynareDataset,DatasetInfo,DynareOptions,Model,EstimatedParameters,BayesInfo,DynareResults); if exit_flag y(i,1) = fval; else diff --git a/matlab/prior_posterior_statistics.m b/matlab/prior_posterior_statistics.m index 7fc877878..723d7056f 100644 --- a/matlab/prior_posterior_statistics.m +++ b/matlab/prior_posterior_statistics.m @@ -1,4 +1,4 @@ -function prior_posterior_statistics(type,dataset) +function prior_posterior_statistics(type,dataset,dataset_info) % function prior_posterior_statistics(type,dataset) % Computes Monte Carlo filter smoother and forecasts @@ -41,10 +41,10 @@ global options_ estim_params_ oo_ M_ bayestopt_ localVars=[]; Y = dataset.data; -gend = dataset.info.ntobs; -data_index = dataset.missing.aindex; -missing_value = dataset.missing.state; -bayestopt_.mean_varobs = dataset.descriptive.mean'; +gend = dataset.nobs; +data_index = dataset_info.missing.aindex; +missing_value = dataset_info.missing.state; +bayestopt_.mean_varobs = dataset_info.descriptive.mean'; nvx = estim_params_.nvx; nvn = estim_params_.nvn;