From 47eac6ac88923f62346230e306a572eb123329a5 Mon Sep 17 00:00:00 2001
From: Marco Ratto <marco.ratto@jrc.ec.europa.eu>
Date: Wed, 14 Apr 2010 17:20:29 +0200
Subject: [PATCH] 1) copy metropolis files 2) bug fix with mh_drop
---
matlab/McMCDiagnostics.m | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/matlab/McMCDiagnostics.m b/matlab/McMCDiagnostics.m
index 997422bc76..ebbf80c226 100644
--- a/matlab/McMCDiagnostics.m
+++ b/matlab/McMCDiagnostics.m
@@ -102,7 +102,13 @@ if isnumeric(options_.parallel),
UDIAG = fout.UDIAG;
clear fout
else
- [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, 1, npar,{},'McMCDiagnostics_core', localVars, [], options_.parallel_info);
+ ModelName = M_.fname;
+ if ~isempty(M_.bvar)
+ ModelName = [M_.fname '_bvar'];
+ end
+ NamFileInput={[M_.dname '/metropolis/'],[ModelName '_mh*_blck*.mat']};
+
+ [fout, nBlockPerCPU, totCPU] = masterParallel(options_.parallel, 1, npar,NamFileInput,'McMCDiagnostics_core', localVars, [], options_.parallel_info);
UDIAG = fout(1).UDIAG;
for j=2:totCPU,
UDIAG = cat(3,UDIAG ,fout(j).UDIAG);
@@ -295,7 +301,7 @@ tmp = sortrows(tmp,1);
ligne = 0;
for iter = Origin:StepSize:NumberOfDraws
ligne = ligne+1;
- linea = ceil(0.5*iter);
+ linea = ceil(options_.mh_drop*iter);
n = iter-linea+1;
cinf = round(n*ALPHA/2);
csup = round(n*(1-ALPHA/2));
--
GitLab