From c88a8aaaa63b79d6c2d0f826751f3f132cfb83ee Mon Sep 17 00:00:00 2001
From: Michel Juillard <michel.juillard@mjui.fr>
Date: Mon, 8 Oct 2012 11:50:48 +0200
Subject: [PATCH] changed warnings into errors when load_mh_file or recovery is
used and there is no metropolis history file
---
matlab/CutSample.m | 6 ++----
matlab/metropolis_hastings_initialization.m | 9 +++------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/matlab/CutSample.m b/matlab/CutSample.m
index 7beb9993d..5caf2237d 100644
--- a/matlab/CutSample.m
+++ b/matlab/CutSample.m
@@ -37,12 +37,10 @@ DirectoryName = CheckPath('metropolis',M_.dname);
file = dir([ DirectoryName ,filesep, M_.fname '_mh_history.mat']);
files = dir([ DirectoryName ,filesep, M_.fname '_mh*.mat' ]);
if ~length(files)
- disp('MH:: FAILURE! there is no MH file to load here!')
- return
+ error('MH:: FAILURE! there is no MH file to load here!')
end
if ~length(file)
- disp('MH:: FAILURE! there is no MH-history file!')
- return
+ error('MH:: FAILURE! there is no MH-history file!')
else
load([ DirectoryName '/' M_.fname '_mh_history.mat'])
end
diff --git a/matlab/metropolis_hastings_initialization.m b/matlab/metropolis_hastings_initialization.m
index bcbd7cac4..c196d227d 100644
--- a/matlab/metropolis_hastings_initialization.m
+++ b/matlab/metropolis_hastings_initialization.m
@@ -221,12 +221,10 @@ elseif options_.load_mh_file && ~options_.mh_recover
file = dir([ MhDirectoryName '/' ModelName '_mh_history.mat' ]);
files = dir([ MhDirectoryName filesep ModelName '_mh*.mat']);
if ~length(files)
- disp('MH:: FAILURE! there is no MH file to load here!')
- return
+ error('MH:: FAILURE! there is no MH file to load here!')
end
if ~length(file)
- disp('MH:: FAILURE! there is no MH-history file!')
- return
+ error('MH:: FAILURE! there is no MH-history file!')
else
load([ MhDirectoryName '/' ModelName '_mh_history.mat'])
end
@@ -281,8 +279,7 @@ elseif options_.mh_recover
disp(' ')
file = dir([MhDirectoryName '/' ModelName '_mh_history.mat']);
if ~length(file)
- disp('MH:: FAILURE! there is no MH-history file!')
- return
+ error('MH:: FAILURE! there is no MH-history file!')
else
load([ MhDirectoryName '/' ModelName '_mh_history.mat'])
end
--
GitLab