diff --git a/wetb/gtsdf/gtsdf_load.m b/wetb/gtsdf/gtsdf_load.m index 2ff44d36ac0ff67ae135d3fa88f8091ef10f8b52..ea5b1175f73ecfee98d5f73ea0fb4dae491497a6 100644 --- a/wetb/gtsdf/gtsdf_load.m +++ b/wetb/gtsdf/gtsdf_load.m @@ -1,16 +1,16 @@ function [time, data, info] = gtsdf_load(filename) + +% gtsdf_load Load a General time series data format - file +% Example: +% [time, data, info] = gtsdf_load('tests/test_files/test.hdf5') +% + if nargin==0 filename = 'examples/all.hdf5'; end - - %h5disp('examples/minimum.hdf5'); - - %info = h5info(filename); - - function value = att_value(name, addr, default) try value = h5readatt(filename, addr,name); @@ -32,7 +32,7 @@ function [time, data, info] = gtsdf_load(filename) end - if not (strcmpi(att_value('type','/'), 'general time series data format')) + if not (strcmpi(lower(att_value('type','/')), 'general time series data format')) error('HDF5 file must contain a ''type''-attribute with the value ''General time series data format''') end if strcmp(att_value('no_blocks','/'),'') diff --git a/wetb/gtsdf/tests/test_files/test.hdf5 b/wetb/gtsdf/tests/test_files/test.hdf5 new file mode 100644 index 0000000000000000000000000000000000000000..f3106d4ffaac6d82aad233f09b5729fcc2cd74ed Binary files /dev/null and b/wetb/gtsdf/tests/test_files/test.hdf5 differ diff --git a/wetb/gtsdf/tests/test_gtsdf.py b/wetb/gtsdf/tests/test_gtsdf.py index 541cf073399bc6b44350b311a3f8c469512591f0..64a17022298f22c9fd302aff2bcd7996ecba96f8 100644 --- a/wetb/gtsdf/tests/test_gtsdf.py +++ b/wetb/gtsdf/tests/test_gtsdf.py @@ -13,6 +13,7 @@ import os import shutil tmp_path = os.path.dirname(__file__) + "/tmp/" +tfp = os.path.dirname(__file__) + "/test_files/" class Test_gsdf(unittest.TestCase): def setUp(self): unittest.TestCase.setUp(self) @@ -208,6 +209,13 @@ class Test_gsdf(unittest.TestCase): attribute_descriptions=['d1', 'd2']) df = gtsdf.load_pandas(fn) + def test_loadtesthdf5(self): + + time, data, info = gtsdf.load(tfp + 'test.hdf5') + self.assertEqual(time[1], 0.05) + self.assertEqual(data[1, 1], 11.986652374267578) + self.assertEqual(info['attribute_names'][1], "WSP gl. coo.,Vy") + if __name__ == "__main__":