From b88a08d627cd9b02a2ebdfc50831996e6ac4af93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Wed, 6 Jun 2018 13:02:42 +0200 Subject: [PATCH] Move some functions out of missing/stats/, since they are only needed for MATLAB (cherry picked from commit 57f6183d2f84c18ab1e7435f33610d29c665b993) --- license.txt | 7 ++++--- matlab/dynare_config.m | 3 +++ matlab/missing/{stats => stats-matlab}/common_size.m | 0 matlab/missing/{stats => stats-matlab}/corr.m | 0 matlab/missing/{stats => stats-matlab}/quantile.m | 0 5 files changed, 7 insertions(+), 3 deletions(-) rename matlab/missing/{stats => stats-matlab}/common_size.m (100%) rename matlab/missing/{stats => stats-matlab}/corr.m (100%) rename matlab/missing/{stats => stats-matlab}/quantile.m (100%) diff --git a/license.txt b/license.txt index f841846a2..fe34d7334 100644 --- a/license.txt +++ b/license.txt @@ -143,23 +143,24 @@ Copyright: 2005 Henning Schmidt, FCC, henning@fcc.chalmers.se License: GPL-3+ Files: matlab/missing/stats/normpdf.m matlab/missing/stats/gamcdf.m - matlab/missing/stats/common_size.m matlab/missing/stats/chi2inv.m + matlab/missing/stats/chi2inv.m matlab/missing/stats/gaminv.m matlab/missing/stats/gampdf.m matlab/missing/stats/stdnormal_inv.m matlab/missing/stats/betacdf.m matlab/missing/stats/betapdf.m matlab/missing/stats/normcdf.m matlab/missing/stats/stdnormal_cdf.m matlab/missing/stats/norminv.m matlab/missing/stats/stdnormal_pdf.m matlab/missing/stats/betainv.m + matlab/missing/stats-matlab/common_size.m Copyright: 1995-2007 Kurt Hornik 2008-2011 Dynare Team License: GPL-3+ -Files: matlab/missing/stats/quantile.m +Files: matlab/missing/stats-matlab/quantile.m Copyright: 2014-2016 Christopher Hummersone 2016 Dynare Team License: GPL-3+ -Files: matlab/missing/stats/corr.m +Files: matlab/missing/stats-matlab/corr.m Copyright: 1993-1996 Kurt Hornik 1996-2015 John W. Eaton 2013-2015 Julien Bect diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index ddacb977c..d8a6f7b21 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -118,6 +118,9 @@ end if (isoctave && ~octave_ver_less_than('4.4') && ~user_has_octave_forge_package('statistics')) ... || (~isoctave && ~user_has_matlab_license('statistics_toolbox')) p{end+1} = '/missing/stats/'; + if ~isoctave + p{end+1} = '/missing/stats-matlab/'; + end end % Check if struct2array is available. diff --git a/matlab/missing/stats/common_size.m b/matlab/missing/stats-matlab/common_size.m similarity index 100% rename from matlab/missing/stats/common_size.m rename to matlab/missing/stats-matlab/common_size.m diff --git a/matlab/missing/stats/corr.m b/matlab/missing/stats-matlab/corr.m similarity index 100% rename from matlab/missing/stats/corr.m rename to matlab/missing/stats-matlab/corr.m diff --git a/matlab/missing/stats/quantile.m b/matlab/missing/stats-matlab/quantile.m similarity index 100% rename from matlab/missing/stats/quantile.m rename to matlab/missing/stats-matlab/quantile.m -- GitLab