diff --git a/doc/internals/build_internal_documentation.m b/doc/internals/build_internal_documentation.m index 35ff8c842..cbb83e6b9 100644 --- a/doc/internals/build_internal_documentation.m +++ b/doc/internals/build_internal_documentation.m @@ -2,7 +2,6 @@ function build_internal_documentation() % The name of the function should be explicit... datafiles = []; -datafiles = [ datafiles ; {'../../matlab/utilities/dataset'}, {'initialize_dataset'}]; datafiles = [ datafiles ; {'../../matlab/utilities/dataset'}, {'descriptive_statistics'}]; datafiles = [ datafiles ; {'../../matlab/utilities/dataset'}, {'compute_stdv'}]; datafiles = [ datafiles ; {'../../matlab/utilities/dataset'}, {'compute_cova'}]; @@ -81,4 +80,4 @@ if rows(miscfiles) fprintf(fid,'\n\n\n'); end end -fclose(fid); \ No newline at end of file +fclose(fid); diff --git a/matlab/utilities/dataset/descriptive_statistics.m b/matlab/utilities/dataset/descriptive_statistics.m index c93b975cd..2b849fe38 100644 --- a/matlab/utilities/dataset/descriptive_statistics.m +++ b/matlab/utilities/dataset/descriptive_statistics.m @@ -10,7 +10,7 @@ function dataset_ = descriptive_statistics(dataset_,statistic,varagin) %! @strong{Inputs} %! @table @var %! @item dataset_ -%! Dynare structure describing the dataset, built by @ref{initialize_dataset} +%! Dynare structure describing the dataset, built by @ref{makedataset} %! @item statistic %! String. The name of the statistic to be computed. Admissible values are: %! @table @var @@ -31,7 +31,7 @@ function dataset_ = descriptive_statistics(dataset_,statistic,varagin) %! @strong{Outputs} %! @table @var %! @item dataset_ -%! Dynare structure describing the dataset, built by @ref{initialize_dataset} +%! Dynare structure describing the dataset, built by @ref{makedataset} %! @end table %! %! @strong{This function is called by:} @@ -84,4 +84,4 @@ if strcmpi(statistic,'acov') nlag = varargin{1}; end dataset_ = compute_acov(dataset_,nlag); -end \ No newline at end of file +end diff --git a/matlab/utilities/dataset/initialize_dataset.m b/matlab/utilities/dataset/initialize_dataset.m deleted file mode 100644 index bbeb416f5..000000000 --- a/matlab/utilities/dataset/initialize_dataset.m +++ /dev/null @@ -1,102 +0,0 @@ -function dataset_ = initialize_dataset(datafile,varobs,first,nobs,logged_data_flag,prefilter,xls) -% Initializes a structure describing the dataset. - -% Copyright © 2011-2017 Dynare Team -% -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. -% -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see . - -if isempty(datafile) - error('Estimation::initialize_dataset: You have to declare a dataset file!') -end - -if isempty(varobs) - error('Estimation::initialize_dataset: You have to declare a set of observed variables') -end - -% Get raw data. -rawdata = read_variables(datafile,varobs,[],xls.sheet,xls.range); - -% Get the (default) number of observations. -if isempty(nobs) || rows(rawdata)