diff --git a/README.md b/README.md index a5aec23b32b7e9f943d63bdccbd78234ba5706c4..923427bb108ba68697a389dd003a7a1f4c2da5b1 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ It is possible to instantiate a `dseries` object from a `.csv`, for a complete description of the constraints on the content of these files. - >> websave('US_CMR_data_t.csv', 'http://www.dynare.org/Datasets/US_CMR_data_t.csv'); + >> websave('US_CMR_data_t.csv', 'https://www.dynare.org/Datasets/US_CMR_data_t.csv'); >> d = dseries('US_CMR_data_t.csv'); >> d diff --git a/externals/x13/installx13.m b/externals/x13/installx13.m index d2a6817a9473cc97b256bcc5ea31a5e235a6d67b..09c49a4f4a77b6ffc842bae207cc305bd251093f 100644 --- a/externals/x13/installx13.m +++ b/externals/x13/installx13.m @@ -20,9 +20,9 @@ function installx13() if ~exist('x13.zip','file') if ( ~isoctave() && verLessThan('matlab', 'R2014b') ) - websave('x13.zip', 'http://www.dynare.org/x13/x13.zip'); + websave('x13.zip', 'https://www.dynare.org/x13/x13.zip'); else - urlwrite('http://www.dynare.org/x13/x13.zip', 'x13.zip'); + urlwrite('https://www.dynare.org/x13/x13.zip', 'x13.zip'); end unzip('x13.zip'); if ismac() diff --git a/src/@dseries/dseries.m b/src/@dseries/dseries.m index cb4257afeb322b80914f5119cd761cab79c3a26e..b9b199005a458984e87e79db383e179d17b575ca 100644 --- a/src/@dseries/dseries.m +++ b/src/@dseries/dseries.m @@ -245,7 +245,7 @@ end % classdef %$ t = zeros(8, 1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.m','dynseries_test_data.m'); %$ if ~status %$ error() %$ end @@ -273,7 +273,7 @@ end % classdef %$ t = zeros(8, 1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.mat','dynseries_test_data.mat'); %$ if ~status %$ error() %$ end @@ -301,7 +301,7 @@ end % classdef %$ t = zeros(10, 1); %$ %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); %$ if ~status %$ error() %$ end @@ -405,9 +405,9 @@ end % classdef %@test:9 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xlsx','dynseries_test_data-1.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-1.xls','dynseries_test_data-1.xls'); %$ end %$ if ~status %$ error() @@ -442,9 +442,9 @@ end % classdef %@test:10 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xlsx','dynseries_test_data-2.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-2.xls','dynseries_test_data-2.xls'); %$ end %$ if ~status %$ error() @@ -479,9 +479,9 @@ end % classdef %@test:11 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xlsx','dynseries_test_data-3.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-3.xls','dynseries_test_data-3.xls'); %$ end %$ if ~status %$ error() @@ -516,9 +516,9 @@ end % classdef %@test:12 %$ try %$ if isoctave() -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xlsx','dynseries_test_data-4.xlsx'); %$ else -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data-4.xls','dynseries_test_data-4.xls'); %$ end %$ if ~status %$ error() diff --git a/src/@dseries/subsref.m b/src/@dseries/subsref.m index 782701937ac588ef9b23efa2419cf74de3fc4027..63d9fa17d2ba0732a2511978540b29b07d6cdbdc 100644 --- a/src/@dseries/subsref.m +++ b/src/@dseries/subsref.m @@ -360,7 +360,7 @@ return t = zeros(5,1); try - [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); + [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dynseries_test_data.csv','dynseries_test_data.csv'); if ~status error() end diff --git a/src/read/load_csv_file_data.m b/src/read/load_csv_file_data.m index d796b08291bae5c1a4e1c1b7ce9a3bdb087b835f..77c08962e0ff6b89d74d5381494f066b66da7e3b 100644 --- a/src/read/load_csv_file_data.m +++ b/src/read/load_csv_file_data.m @@ -195,7 +195,7 @@ varlist = strrep(varlist,'"',''); %@test:1 %$ % Download csv file with data. -%$ urlwrite('http://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv'); +%$ urlwrite('https://www.dynare.org/Datasets/data_ca1_csv.csv','data_ca1_csv.csv'); %$ %$ % Instantiate a dseries from the data in the csv file. %$ try diff --git a/src/utilities/str/name2tex.m b/src/utilities/str/name2tex.m index 12dadc59be64000758740b8e3c8474255aa923d8..f1995e95c80846dab00e438c04e04285bfd1a1bb 100644 --- a/src/utilities/str/name2tex.m +++ b/src/utilities/str/name2tex.m @@ -189,7 +189,7 @@ end %@test:4 %$ try -%$ [strfile, status] = urlwrite('http://www.dynare.org/Datasets/dseries/dd.csv','dd.csv'); +%$ [strfile, status] = urlwrite('https://www.dynare.org/Datasets/dseries/dd.csv','dd.csv'); %$ if ~status %$ error() %$ end