Skip to content

D
dseries
Verified Commit 69541132 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files
Options

Put test data in the git repository 

MATLAB R2009b is not able to handle HTTPS requests.

Also, having the data in the git makes the testsuite robust to network failures.
parent a647577d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 83 deletions
src/@dseries/dseries.m
View file @ 69541132
...@@ -216,12 +216,8 @@ end % classdef ...@@ -216,12 +216,8 @@ end % classdef
%$ t = zeros(8, 1); %$ t = zeros(8, 1);
%$ %$
%$ try %$ try
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m'); %$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if ~status %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data.m' ]);
%$ error()
%$ end
%$ ts = dseries('dynseries_test_data.m');
%$ delete('dynseries_test_data.m');
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
%$ t = 0; %$ t = 0;
...@@ -244,12 +240,8 @@ end % classdef ...@@ -244,12 +240,8 @@ end % classdef
%$ t = zeros(8, 1); %$ t = zeros(8, 1);
%$ %$
%$ try %$ try
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat'); %$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if ~status %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data.mat' ]);
%$ error()
%$ end
%$ ts = dseries('dynseries_test_data.mat');
%$ delete('dynseries_test_data.mat');
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
%$ t = 0; %$ t = 0;
...@@ -272,12 +264,8 @@ end % classdef ...@@ -272,12 +264,8 @@ end % classdef
%$ t = zeros(10, 1); %$ t = zeros(10, 1);
%$ %$
%$ try %$ try
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); %$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if ~status %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data.csv' ]);
%$ error()
%$ end
%$ ts = dseries('dynseries_test_data.csv');
%$ delete('dynseries_test_data.csv');
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
%$ t = 0; %$ t = 0;
...@@ -375,20 +363,11 @@ end % classdef ...@@ -375,20 +363,11 @@ end % classdef
%@test:9 %@test:9
%$ try %$ try
%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if isoctave() %$ if isoctave()
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-1.xlsx' ]);
%$ else
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls');
%$ end
%$ if ~status
%$ error()
%$ end
%$ if isoctave()
%$ ts = dseries('dynseries_test_data-1.xlsx');
%$ delete('dynseries_test_data-1.xlsx');
%$ else %$ else
%$ ts = dseries('dynseries_test_data-1.xls'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-1.xls' ]);
%$ delete('dynseries_test_data-1.xls');
%$ end %$ end
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
...@@ -412,20 +391,11 @@ end % classdef ...@@ -412,20 +391,11 @@ end % classdef
%@test:10 %@test:10
%$ try %$ try
%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if isoctave() %$ if isoctave()
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-2.xlsx' ]);
%$ else %$ else
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-2.xls' ]);
%$ end
%$ if ~status
%$ error()
%$ end
%$ if isoctave()
%$ ts = dseries('dynseries_test_data-2.xlsx');
%$ delete('dynseries_test_data-2.xlsx');
%$ else
%$ ts = dseries('dynseries_test_data-2.xls');
%$ delete('dynseries_test_data-2.xls');
%$ end %$ end
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
...@@ -449,20 +419,11 @@ end % classdef ...@@ -449,20 +419,11 @@ end % classdef
%@test:11 %@test:11
%$ try %$ try
%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if isoctave() %$ if isoctave()
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-3.xlsx' ]);
%$ else
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls');
%$ end
%$ if ~status
%$ error()
%$ end
%$ if isoctave()
%$ ts = dseries('dynseries_test_data-3.xlsx');
%$ delete('dynseries_test_data-3.xlsx');
%$ else %$ else
%$ ts = dseries('dynseries_test_data-3.xls'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-3.xls' ]);
%$ delete('dynseries_test_data-3.xls');
%$ end %$ end
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
...@@ -486,20 +447,11 @@ end % classdef ...@@ -486,20 +447,11 @@ end % classdef
%@test:12 %@test:12
%$ try %$ try
%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if isoctave() %$ if isoctave()
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-4.xlsx' ]);
%$ else
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls');
%$ end
%$ if ~status
%$ error()
%$ end
%$ if isoctave()
%$ ts = dseries('dynseries_test_data-4.xlsx');
%$ delete('dynseries_test_data-4.xlsx');
%$ else %$ else
%$ ts = dseries('dynseries_test_data-4.xls'); %$ ts = dseries([ dseries_src_root '../tests/data/dynseries_test_data-4.xls' ]);
%$ delete('dynseries_test_data-4.xls');
%$ end %$ end
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
......
src/@dseries/subsref.m
View file @ 69541132
...@@ -367,12 +367,8 @@ return ...@@ -367,12 +367,8 @@ return
t = zeros(5,1); t = zeros(5,1);
try try
[strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
if ~status A = dseries([ dseries_src_root '../tests/data/dynseries_test_data.csv' ]);
error()
end
A = dseries('dynseries_test_data.csv');
delete('dynseries_test_data.csv');
t(1) = 1; t(1) = 1;
catch catch
t = 0; t = 0;
...@@ -725,4 +721,4 @@ return ...@@ -725,4 +721,4 @@ return
end end
T = all(t); T = all(t);
%@eof:19 %@eof:19
\ No newline at end of file
src/read/load_csv_file_data.m
View file @ 69541132
...@@ -195,12 +195,11 @@ varlist = strrep(varlist,'"',''); ...@@ -195,12 +195,11 @@ varlist = strrep(varlist,'"','');
%@test:1 %@test:1
%$ % Download csv file with data. %$ % Download csv file with data.
%$ urlwrite('https://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv'); %$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ %$
%$ % Instantiate a dseries from the data in the csv file. %$ % Instantiate a dseries from the data in the csv file.
%$ try %$ try
%$ d = dseries('data_ca1_csv.csv'); %$ d = dseries([ dseries_src_root '../tests/data/data_ca1_csv.csv' ]);
%$ delete('data_ca1_csv.csv');
%$ t(1) = true; %$ t(1) = true;
%$ catch %$ catch
%$ t(1) = false; %$ t(1) = false;
...@@ -211,4 +210,4 @@ varlist = strrep(varlist,'"',''); ...@@ -211,4 +210,4 @@ varlist = strrep(varlist,'"','');
%$ end %$ end
%$ %$
%$ T = all(t); %$ T = all(t);
%@eof:1 %@eof:1
\ No newline at end of file
src/utilities/str/name2tex.m
View file @ 69541132
...@@ -189,12 +189,8 @@ end ...@@ -189,12 +189,8 @@ end
%@test:4 %@test:4
%$ try %$ try
%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dd.csv','dd.csv'); %$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m','');
%$ if ~status %$ db = dseries([ dseries_src_root '../tests/data/dd.csv' ]);
%$ error()
%$ end
%$ db = dseries('dd.csv');
%$ delete('dd.csv');
%$ t(1) = 1; %$ t(1) = 1;
%$ catch %$ catch
%$ t(1) = 0; %$ t(1) = 0;
......
tests/data/data_ca1_csv.csv 0 → 100644
View file @ 69541132
y_obs,pie_obs,R_obs,de,dq
0.9284676465,11.8716889412,20,0.4180375074,0.2273823775
-0.7059940631,11.7522582094,21.25,1.0925442451,-1.2948827499
-0.5118953519,9.6814402563,17.25,-1.6615040841,0.3315083931
-0.9909559713,10.0890781236,17,1.4301627525,-2.4358967014
-0.9812330618,12.1094840679,18.25,2.9129328873,-0.7902465769
-0.8821828445,8.5455946041,15,0.4195791395,0.3587297196
-0.9308930028,6.1923837442,12.5,-1.4884745796,0.7397799388
1.5315820695,2.7654427189,11.5,-0.3362167697,0.4555599188
2.2659052834,5.4741816251,11,0.3064367898,-0.0707985731
1.054198038,6.3569842619,11,0.1407002505,0.6204014872
1.2016107679,3.4253301593,11,0.4612964924,0.1435432399
1.7393407797,4.7092607032,11.5,1.3579828298,0.3856469444
1.7173526258,3.5423207975,12.5,2.9097529155,-0.8043085833
0.4263436578,3.327191089,13,1.6421486265,-1.182146647
1.6775181232,2.9344472734,11.25,0.3444349107,-1.6529373719
1.370133011,4.7230336192,11.75,2.6151152658,0.327684243
0.2812310738,4.4893853071,10.5,1.1704344926,1.1285510665
1.5363899283,3.7325309699,10.25,-0.6839470467,0.1194353874
1.6808143146,3.3472996913,10,1.4115934211,-1.5906568085
-0.3433216011,5.0556351356,12,1.751173665,-2.4012776464
0.8734156087,3.2779996255,10.25,-1.3989586671,0.0971444398
0.2639969654,4.7822941983,9.75,0.0914692438,0.2993104576
-0.5622336248,3.8859863824,9.75,-0.0505384765,0.3328267082
2.1516191494,3.8485971013,8.75,-3.4481108049,0.7891386788
1.2345093726,5.6222503094,9.5,-0.3669454074,2.329749812
1.6255496746,4.2466713283,10,-0.8009583714,0.0293183771
1.3303540253,2.7524897925,9.75,-0.8557231132,0.8524939398
1.5207881408,3.5341598583,9.75,-3.379634692,-1.0513395812
1.167049837,4.9275407946,10.75,-3.0142303324,0.459907432
0.2772135721,4.5553213304,11.75,-0.8519955994,2.0324203485
0.842215069,3.1116450965,12.25,-1.082904217,0.014323282
1.0532502861,4.9288264758,13.5,-1.1953883867,0.7067647507
0.4530512536,6.829989501,13.5,0.1118036565,0.0884625932
0.1998859955,5.8264335466,13.5,-0.9205015184,-0.2650495867
0.1379079996,2.6607636913,13.5,-1.1712292981,-0.9956424305
0.7219496867,5.7049787682,14.25,1.1937816902,-1.1064483965
-0.4184652492,3.7586111023,14.75,-1.0313167482,0.1885076758
-0.6440283421,4.1510478815,13.75,-1.4891175655,0.2045609138
-0.8482138527,5.6558032403,12.75,0.6770117039,-0.8496280545
-1.5195407693,11.4866911266,11.25,-0.4460246808,-0.4563423508
0.2652750552,2.8547274959,9.75,-0.5987782024,-0.9073116408
0.3561625291,2.2961401566,9.5,-0.4682078843,-1.2213088344
0.3683088644,-0.5390835047,8,-0.781333992,0.3740072465
-0.1457514127,1.6150762179,8.25,3.6829193263,1.3243839985
0.2854572837,2.1433405599,7,1.4281940538,-0.0081866084
0.3723901294,1.6000021333,6.25,0.6261064241,-0.1013677277
0.3827202031,1.7261424326,7.25,4.8963194102,-1.1006071192
0.7379575156,2.9043058285,6,-0.042272101,0.4178952497
0.6495325817,0.6571356825,6,0.692066154,0.4222991203
0.627159202,1.7035268991,5.75,2.6206671131,-1.2923730403
0.9054412998,1.9566319727,5.5,1.5949697565,-0.271158307
1.493225779,-2.0874176531,6.25,1.230276948,0.4183368895
1.4875073157,-1.5727412187,8,3.0166055099,-0.8939582544
1.3978385809,2.2262306643,7,-0.8084231921,1.4762545389
0.8927483632,1.3037808174,8,-0.2494850587,0.1598712042
0.9206522461,4.1437741965,9.75,2.8204453623,0.1781492397
-0.0026427664,3.0798997205,8.75,-2.5634246154,2.105998353
0.0198190462,0.7662837593,8,-1.1583886599,1.5688888342
0.4400505153,0.1275700858,7.5,0.040075357,0.0289143335
0.1295366379,1.7817414153,6.75,0.9599439628,0.3077812244
0.3985498272,3.0360677067,6.5,-0.3402097947,0.1009794695
1.1717477543,0.629625188,5.75,0.4030036868,0.9023945794
0.9911639813,2.5086291068,4.75,-1.4496399698,1.1615098695
0.9676035661,2.1200373901,4.75,0.6108460308,-0.8899948961
1.146893836,1.2418501146,4.75,2.0109809131,-1.73846431
1.3259382405,0.9907138207,4.75,-0.0955142989,-0.0369257308
0.8611350026,-0.2474494361,6,1.7279310714,-0.6915067896
1.2687085015,2.0984476489,6.5,1.5072021757,-1.3139918708
0.2603649877,1.1065013972,6.5,1.136590475,0.0720441665
1.0973124221,0.4907963813,7.25,4.5912389415,-2.1407307076
1.6379284178,0.6126525943,6.75,1.7960460504,-0.6443639954
1.4846557603,0.9782958087,6.75,-2.007536209,1.3943753496
1.0987608663,4.2521256909,6.25,-2.589011965,2.560543208
1.4259217813,2.7698451831,6.25,0.8881957524,1.0311454927
1.5295823946,1.3179595549,6.5,-0.9029075641,-0.0952198894
1.0170168994,2.1473358992,7,-1.3054866978,2.6880373847
0.7232536523,3.4355288935,7.5,1.8213700853,0.5925935862
1.2472080601,3.8738380658,7.5,0.0522300654,0.9888712387
0.4825314712,2.6779328703,7.5,2.9693944293,-0.1085911661
0.1540561004,0.9272690317,6.75,0.1192220576,3.3048920945
0.0694865769,6.6591652679,6.25,0.8890144761,-2.8397684904
-0.1212674349,0.3414426157,5.25,0.3230532392,-3.4928922901
0.7264736904,-3.5423730964,4,2.1914929045,-3.20855054
1.3927170911,2.6312108572,3.75,0.8840657774,0.756225802
1.0750207773,5.885788368,4.25,-2.5508827335,2.8901811637
0.7590492516,4.2470360422,4.5,0.5756876657,-0.3882925062
tests/data/dd.csv 0 → 100644
View file @ 69541132
This diff is collapsed.
tests/data/dynseries_test_data.csv 0 → 100644
View file @ 69541132
,azert,yuiop,qsdfg,jklm
1990Q1,NaN,456,678,NaN
1990Q2,NaN,458,125,NaN
1990Q3,983,395,109,456
1990Q4,768,377,980,NaN
tests/data/dynseries_test_data.m 0 → 100644
View file @ 69541132
FREQ__ = 4;
INIT__ = '1994Q3';
NAMES__ = {'azert';'yuiop'};
TEX__ = {'azert';'yuiop'};
azert = randn(100,1);
yuiop = randn(100,1);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment