Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and test mkd stats #221

Merged
merged 2 commits into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/CommonUtils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,20 @@ function updateProductSample( dest::BallTreeDensity,
manikde!(pts, manifolds)
end

function Statistics.cov(mkd::ManifoldKernelDensity, args...; kwargs...)
cov(mkd.manifold, getPoints(mkd), args...; kwargs...)
function Statistics.cov(mkd::ManifoldKernelDensity; kwargs...)
cov(mkd.manifold, getPoints(mkd); kwargs...)
end

function Statistics.mean(mkd::ManifoldKernelDensity, args...; kwargs...)
return mean(mkd.manifold, getPoints(mkd), args...; kwargs...)
function Statistics.mean(mkd::ManifoldKernelDensity; kwargs...)
return mean(mkd.manifold, getPoints(mkd); kwargs...)
end

function Statistics.std(mkd::ManifoldKernelDensity, args...; kwargs...)
return std(mkd.manifold, getPoints(mkd), args...; kwargs...)
function Statistics.std(mkd::ManifoldKernelDensity; kwargs...)
return std(mkd.manifold, getPoints(mkd); kwargs...)
end

function Statistics.var(mkd::ManifoldKernelDensity, args...; kwargs...)
return var(mkd.manifold, getPoints(mkd), args...; kwargs...)
function Statistics.var(mkd::ManifoldKernelDensity; kwargs...)
return var(mkd.manifold, getPoints(mkd); kwargs...)
end


Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ include("testPartialProductSE2.jl")
include("basic_se3.jl")
include("testSymmetry.jl")
include("testUpdateMKD.jl")
include("testMKDStats.jl")

#
21 changes: 21 additions & 0 deletions test/testMKDStats.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using Test
using ApproxManifoldProducts
using Manifolds

@testset "Test basic MKD statistics" begin


M = SpecialEuclidean(2)
u0 = ArrayPartition(zeros(2),[1 0; 0 1.0])
ϵ = identity_element(M, u0)

pts = [exp(M, ϵ, hat(M, ϵ, [0.05*randn(2);0.75*randn()])) for i in 1:100]

P = manikde!(M, pts)

@test isapprox(M, mean(P), mean(M, pts))
@test isapprox(var(P), var(M, pts))
@test isapprox(std(P), std(M, pts))
@test isapprox(cov(P), cov(M, pts))

end