From fb08f5c1332ed461b06d5d7cb6b05913b06528a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Wed, 16 Oct 2013 12:03:39 +0200 Subject: [PATCH] dynDate --> dates in load_mat_file_data routine. Fixed unitary test. --- matlab/load_mat_file_data.m | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/matlab/load_mat_file_data.m b/matlab/load_mat_file_data.m index 5f33f12ea..861427bc7 100644 --- a/matlab/load_mat_file_data.m +++ b/matlab/load_mat_file_data.m @@ -36,10 +36,14 @@ function [freq,init,data,varlist,tex] = load_mat_file_data(file) datafile = load(file); if isfield(datafile,'INIT__') - init = dynDate(datafile.INIT__); - datafile = rmfield(datafile, 'INIT__'); + if isdate(datafile.INIT__) + init = dates(datafile.INIT__); + datafile = rmfield(datafile, 'INIT__'); + else + error('load_mat_file_data: INIT__ cannot be interpreted as a date.') + end else - init = dynDate(1); + init = dates(1,1); end if isfield(datafile,'FREQ__') @@ -100,7 +104,7 @@ end %$ %$ % Check the results. %$ t(2) = dyn_assert(freq,12); -%$ t(3) = dyn_assert(isa(init,'dynDate'),1); +%$ t(3) = dyn_assert(isa(init,'dates'),1); %$ t(4) = dyn_assert(init.freq,12); %$ t(5) = dyn_assert(init.time,[1938 11]); %$ t(6) = dyn_assert(varlist,{'hagop';'bedros'});