From d5b44e77a0da3e46856d72b06e7a4aec623afb93 Mon Sep 17 00:00:00 2001
From: Michel Juillard <michel.juillard@ens.fr>
Date: Thu, 3 Nov 2011 10:18:39 +0100
Subject: [PATCH] improving data reading function to avoid name conflicts
(cherry picked from commit d6cff065357a54bfb05d064752d510e48cd20e5f)
---
matlab/read_variables.m | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/read_variables.m b/matlab/read_variables.m
index 06f6d2f84..c313a031e 100644
--- a/matlab/read_variables.m
+++ b/matlab/read_variables.m
@@ -44,7 +44,7 @@ end
dyn_size_01 = size(dyn_data_01,1);
var_size_01 = size(var_names_01,1);
-if exist(file_name_01)
+if exist([file_name_01 '.m'],'file')
file_name_02 = [file_name_01 '.m'];
dyn_instr_01 = file_name_01;
eval(dyn_instr_01);
@@ -56,7 +56,7 @@ if exist(file_name_01)
end
dyn_data_01(:,dyn_i_01) = dyn_tmp_01;
end
-elseif exist([file_name_01 '.mat'])
+elseif exist([file_name_01 '.mat'],'file')
file_name_02 = [file_name_01 '.mat'];
s = load(file_name_01);
for dyn_i_01=1:var_size_01
@@ -67,7 +67,7 @@ elseif exist([file_name_01 '.mat'])
end
dyn_data_01(:,dyn_i_01) = dyn_tmp_01;
end
-elseif exist([file_name_01 '.xls'])
+elseif exist([file_name_01 '.xls'],'file')
file_name_02 = [file_name_01 '.xls'];
[num,txt,raw] = xlsread(file_name_01,xls_sheet,xls_range);
for dyn_i_01=1:var_size_01
--
GitLab