From f9ecc164ce4b2b9e5ac51da02af4485b362c9114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Tue, 27 Sep 2011 16:59:21 +0200
Subject: [PATCH] Move 'nanmean' under 'matlab/missing' and add the necessary
 logic

---
 matlab/dynare_config.m                               | 12 ++++++++++++
 .../{utilities/general => missing/nanmean}/nanmean.m |  0
 2 files changed, 12 insertions(+)
 rename matlab/{utilities/general => missing/nanmean}/nanmean.m (100%)

diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 6c25e61db..738737200 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -88,6 +88,18 @@ if ~exist('OCTAVE_VERSION') && matlab_ver_less_than('7.4')
     addpath([dynareroot '/missing/bsxfun'])
 end
 
+% nanmean is in Octave Forge Statistics package and in MATLAB Statistics
+% toolbox
+if exist('OCTAVE_VERSION')
+    [desc,flag] = pkg('describe', 'statistics');
+    if ~isequal(flag{1,1}, 'Loaded')
+        addpath([dynareroot '/missing/nanmean'])
+    end
+else
+    if ~license('test', 'statistics_toolbox')
+        addpath([dynareroot '/missing/nanmean'])
+    end
+end
 
 % Add path to MEX files
 if exist('OCTAVE_VERSION')
diff --git a/matlab/utilities/general/nanmean.m b/matlab/missing/nanmean/nanmean.m
similarity index 100%
rename from matlab/utilities/general/nanmean.m
rename to matlab/missing/nanmean/nanmean.m