diff --git a/matlab/@dynSeries/dynSeries.m b/matlab/@dynSeries/dynSeries.m index 98c5cfc2a1e287c6799e4e991d0eea524879cdd5..9d56f5b5f72b43bd6d3a9258ace80597861c43a1 100644 --- a/matlab/@dynSeries/dynSeries.m +++ b/matlab/@dynSeries/dynSeries.m @@ -357,7 +357,6 @@ ts.time = ts.init:(ts.init+ts.nobs); %$ T = all(t); %@eof:7 - %@test:8 %$ t = zeros(8,1); %$ @@ -381,3 +380,86 @@ ts.time = ts.init:(ts.init+ts.nobs); %$ T = all(t); %@eof:8 +%@test:9 +%$ try +%$ ts = dynSeries('dynseries_test_data-1.xls'); +%$ t(1) = 1; +%$ catch +%$ t(1) = 0; +%$ end +%$ +%$ if t(1) +%$ t(2) = dyn_assert(ts.freq,4); +%$ t(3) = dyn_assert(ts.init.freq,4); +%$ t(4) = dyn_assert(ts.init.time,[1990, 1]); +%$ t(5) = dyn_assert(ts.vobs,3); +%$ t(6) = dyn_assert(ts.nobs,5); +%$ t(7) = dyn_assert(ts.name,{'GDP';'Consumption';'CPI'}); +%$ t(8) = dyn_assert(ts.tex,{'GDP';'Consumption';'CPI'}); +%$ end +%$ +%$ T = all(t); +%@eof:9 + +%@test:10 +%$ try +%$ ts = dynSeries('dynseries_test_data-2.xls'); +%$ t(1) = 1; +%$ catch +%$ t(1) = 0; +%$ end +%$ +%$ if t(1) +%$ t(2) = dyn_assert(ts.freq,4); +%$ t(3) = dyn_assert(ts.init.freq,4); +%$ t(4) = dyn_assert(ts.init.time,[1990, 1]); +%$ t(5) = dyn_assert(ts.vobs,3); +%$ t(6) = dyn_assert(ts.nobs,5); +%$ t(7) = dyn_assert(ts.name,{'Variable_1';'Variable_2';'Variable_3'}); +%$ t(8) = dyn_assert(ts.tex,{'Variable\\_1';'Variable\\_2';'Variable\\_3'}); +%$ end +%$ +%$ T = all(t); +%@eof:10 + +%@test:11 +%$ try +%$ ts = dynSeries('dynseries_test_data-3.xls'); +%$ t(1) = 1; +%$ catch +%$ t(1) = 0; +%$ end +%$ +%$ if t(1) +%$ t(2) = dyn_assert(ts.freq,1); +%$ t(3) = dyn_assert(ts.init.freq,1); +%$ t(4) = dyn_assert(ts.init.time,[1, 1]); +%$ t(5) = dyn_assert(ts.vobs,3); +%$ t(6) = dyn_assert(ts.nobs,5); +%$ t(7) = dyn_assert(ts.name,{'Variable_1';'Variable_2';'Variable_3'}); +%$ t(8) = dyn_assert(ts.tex,{'Variable\\_1';'Variable\\_2';'Variable\\_3'}); +%$ end +%$ +%$ T = all(t); +%@eof:11 + +%@test:12 +%$ try +%$ ts = dynSeries('dynseries_test_data-4.xls'); +%$ t(1) = 1; +%$ catch +%$ t(1) = 0; +%$ end +%$ +%$ if t(1) +%$ t(2) = dyn_assert(ts.freq,1); +%$ t(3) = dyn_assert(ts.init.freq,1); +%$ t(4) = dyn_assert(ts.init.time,[1, 1]); +%$ t(5) = dyn_assert(ts.vobs,3); +%$ t(6) = dyn_assert(ts.nobs,5); +%$ t(7) = dyn_assert(ts.name,{'GDP';'Consumption';'CPI'}); +%$ t(8) = dyn_assert(ts.tex,{'GDP';'Consumption';'CPI'}); +%$ end +%$ +%$ T = all(t); +%@eof:12 \ No newline at end of file diff --git a/tests/dynseries_test_data-1.xls b/tests/dynseries_test_data-1.xls new file mode 100644 index 0000000000000000000000000000000000000000..fe75d170d1f4519ab8fcb2fe1287ae71763535bf Binary files /dev/null and b/tests/dynseries_test_data-1.xls differ diff --git a/tests/dynseries_test_data-2.xls b/tests/dynseries_test_data-2.xls new file mode 100644 index 0000000000000000000000000000000000000000..1090339482977ee6ec2b332f4dec1dca8ca28039 Binary files /dev/null and b/tests/dynseries_test_data-2.xls differ diff --git a/tests/dynseries_test_data-3.xls b/tests/dynseries_test_data-3.xls new file mode 100644 index 0000000000000000000000000000000000000000..69589b55beaac25bc2a0cbf9b6acab53cb5be48d Binary files /dev/null and b/tests/dynseries_test_data-3.xls differ diff --git a/tests/dynseries_test_data-4.xls b/tests/dynseries_test_data-4.xls new file mode 100644 index 0000000000000000000000000000000000000000..39d5534fe7a76ce893bec43f5da5617111f35732 Binary files /dev/null and b/tests/dynseries_test_data-4.xls differ