Merge pull request #249 from JuliaRobotics/23Q4/enh/miniclean

mini cleanup
JuliaRobotics · Oct 5, 2023 · 8bf8254 · 8bf8254
2 parents bd5c45c + 4b110aa
commit 8bf8254
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/API.jl b/src/API.jl
@@ -112,18 +112,19 @@ function manifoldProduct( ff::AbstractVector{<:ManifoldKernelDensity},
   ## TODO check both _ff and inplace use a matrix of coordinates (columns)
   # expects Matrix with columns as samples and rows are coordinate dimensions
   pGM, = prodAppxMSGibbsS(inplace, _ff,
-                          nothing, nothing, Niter=Niter,
-                          partialDimMask=partialDimMask,
+                          nothing, nothing; 
+                          Niter,
+                          partialDimMask,
                           addop=addopT,
                           diffop=diffopT,
                           getMu=getManiMu,
-                          glbs=glbs,
-                          addEntropy=addEntropy,
-                          ndims=ndims,
-                          Ndens=Ndens,
-                          Np=Np,
-                          maxNp=maxNp,
-                          Nlevels=Nlevels,
+                          glbs,
+                          addEntropy,
+                          ndims,
+                          Ndens,
+                          Np,
+                          maxNp,
+                          Nlevels,
                           randU=_randU,
                           randN=_randN  );
   #

diff --git a/src/services/ManifoldKernelDensity.jl b/src/services/ManifoldKernelDensity.jl
@@ -187,7 +187,12 @@ Random.rand(mkd::ManifoldKernelDensity, N::Integer=1) = sample(mkd, N)[1]
 
 
 function resample(x::ManifoldKernelDensity, N::Int)
-  pts, = sample(x, N)
+  pts = if N < Npts(x)
+    shuffle(getPoints(x))[1:N]
+  else
+    _pts, = sample(x, N)
+    _pts
+  end
   ManifoldKernelDensity(x.manifold, pts, x._u0, partial=x._partial, infoPerCoord=x.infoPerCoord)
 end
 
@@ -296,7 +301,7 @@ function antimarginal(newM::AbstractManifold,
   ipc = zeros(manifold_dimension(newM))
   ipc[finalpartial] .= getInfoPerCoord(mkd, true)
 
-  manikde!(newM, nPts, u0, bw=bw, partial=finalpartial, infoPerCoord=ipc)
+  manikde!(newM, nPts, u0; bw, partial=finalpartial, infoPerCoord=ipc)
 end