overload statistics mean var std cov

src/ApproxManifoldProducts.jl

@@ -25,9 +25,11 @@ using StaticArrays
 using Logging
 using Statistics
 
+import Random: rand
+
 import Base: *, isapprox, convert
 import LinearAlgebra: rotate!
-import Statistics: mean
+import Statistics: mean, std, cov, var
 import KernelDensityEstimate: getPoints, getBW
 import TransformUtils: rotate!
 
@@ -39,31 +41,8 @@ const CTs = CoordinateTransformations
 # TODO temporary for initial version of on-manifold products
 KDE.setForceEvalDirect!(true)
 
-export  
-  # new local features
-  AMP,
-  MKD,
-  AbstractManifold,
-  ManifoldKernelDensity,
-  get2DLambda,
-  get2DMu,
-  get2DMuMin,
-  resid2DLinear,
-  solveresid2DLinear!,
-  solveresid2DLinear,
-  *,
-  isapprox,
-
-  # APi and util functions
-  buildHybridManifoldCallbacks,
-  getKDEManifoldBandwidths,
-  manifoldProduct,
-  manikde!,
-  calcCovarianceBasic,
-  isPartial,
-  mean,
-  calcProductGaussians
-
+# the exported API
+include("ExportAPI.jl")
 
 # internal features not exported
 include("_BiMaps.jl")

src/ExportAPI.jl

@@ -0,0 +1,32 @@
+
+export  
+  # new local features
+  AMP,
+  MKD,
+  AbstractManifold,
+  ManifoldKernelDensity,
+  get2DLambda,
+  get2DMu,
+  get2DMuMin,
+  resid2DLinear,
+  solveresid2DLinear!,
+  solveresid2DLinear,
+  *,
+  isapprox,
+
+  # APi and util functions
+  buildHybridManifoldCallbacks,
+  getKDEManifoldBandwidths,
+  manifoldProduct,
+  manikde!,
+  calcCovarianceBasic,
+  isPartial,
+  calcProductGaussians
+
+export getPoints, getBW, Ndim, Npts
+export getKDERange, getKDEMax, getKDEMean, getKDEfit
+export sample, rand, resample, kld, minkld
+export calcMean
+export mean, cov, std, var
+export getInfoPerCoord, getBandwidth
+export antimarginal

src/services/ManifoldKernelDensity.jl

@@ -1,14 +1,4 @@
 
-import Random: rand
-
-export getPoints, getBW, Ndim, Npts
-export getKDERange, getKDEMax, getKDEMean, getKDEfit
-export sample, rand, resample, kld, minkld
-export calcMean
-export getInfoPerCoord, getBandwidth
-export antimarginal
-
-
 ## ==========================================================================================
 ## helper functions to contruct MKD objects
 ## ==========================================================================================
@@ -86,14 +76,18 @@ manikde!( M::MB.AbstractManifold,
 ## a few utilities
 ## ==========================================================================================
 
-function Statistics.mean(mkd::ManifoldKernelDensity, aspartial::Bool=true)
-  M = if aspartial && isPartial(mkd)
+# TODO this should be a public method relating to getManifold
+function _getManifoldFullOrPart(mkd::ManifoldKernelDensity, aspartial::Bool=true)
+  if aspartial && isPartial(mkd)
     getManifoldPartial(mkd.manifold, mkd._partial)
   else
     mkd.manifold
   end
+end
 
-  mean(mkd.manifold, getPoints(mkd, aspartial))
+function Statistics.mean(mkd::ManifoldKernelDensity, aspartial::Bool=true)
+  M = _getManifoldFullOrPart(mkd, aspartial)
+  mean(M, getPoints(mkd, aspartial))
 end
 
 """
@@ -103,6 +97,18 @@ Alias for overloaded `Statistics.mean`.
 """
 calcMean(mkd::ManifoldKernelDensity, aspartial::Bool=true) = mean(mkd, aspartial)
 
+function Statistics.std(mkd::ManifoldKernelDensity, aspartial::Bool=true; kwargs...)
+  std(_getManifoldFullOrPart(mkd,aspartial), getPoints(mkd, aspartial); kwargs...)
+end
+function Statistics.var(mkd::ManifoldKernelDensity, aspartial::Bool=true; kwargs...)
+  var(_getManifoldFullOrPart(mkd,aspartial), getPoints(mkd, aspartial); kwargs...)
+end
+
+function Statistics.cov(mkd::ManifoldKernelDensity, aspartial::Bool=true; basis::Manifolds.AbstractBasis = Manifolds.DefaultOrthogonalBasis(), kwargs...)
+  return cov(_getManifoldFullOrPart(mkd,aspartial), getPoints(mkd, aspartial); basis, kwargs... )
+end
+
+
 
 _getFieldPartials(mkd::ManifoldKernelDensity{M,B,Nothing}, field::Function, aspartial::Bool=true) where {M,B} = field(mkd)