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.

Sign up for GitHub

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

Bugfix manifoldProduct oldpoints to coordinates #94

Merged
merged 3 commits into from
Jul 8, 2021
Merged

Bugfix manifoldProduct oldpoints to coordinates #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
817a988
Bugfix manifoldProduct oldpoints to coordinates
Affie Jul 7, 2021
1bc8f77
fix manifoldProduct oldPoints
dehann Jul 7, 2021
2c5ca42
maniProd must have full density first
dehann Jul 7, 2021
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: 11 additions & 5 deletions src/API.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function manifoldProduct( ff::AbstractVector{<:ManifoldKernelDensity},
# partialDimsWorkaround=1:MB.manifold_dimension(mani),
ndims::Int=maximum(Ndim.(ff)),
N::Int = maximum(Npts.(ff)),
oldPoints::AbstractVector{P}=[randn(ndims) for _ in 1:N],
oldPoints::AbstractVector{P}=[identity(mani, getPoints(ff[1])[1]) for _ in 1:N],
addEntropy::Bool=true,
recordLabels::Bool=false,
selectedLabels::Vector{Vector{Int}}=Vector{Vector{Int}}()) where {M <: MB.AbstractManifold, P}
Expand All @@ -73,9 +73,12 @@ function manifoldProduct( ff::AbstractVector{<:ManifoldKernelDensity},
addopT, diffopT, getManiMu, _ = buildHybridManifoldCallbacks(manif)

bws = ones(ndims)
@cast oldpts_[i,j] := oldPoints[j][i]
oldpts = collect(oldpts_)
dummy = kde!(oldpts, bws, addopT, diffopT ); # rand(ndims,N)
# MAKE SURE inplace ends up as matrix of coordinates from incoming ::Vector{P}
oldpts = _pointsToMatrixCoords(mani, oldPoints)
# FIXME currently assumes oldPoints are in coordinates...
# @cast oldpts_[i,j] := oldPoints[j][i]
# oldpts = collect(oldpts_)
inplace = kde!(oldpts, bws, addopT, diffopT ); # rand(ndims,N)

# TODO REMOVE
_ff = (x->x.belief).(ff)
Expand All @@ -90,7 +93,10 @@ function manifoldProduct( ff::AbstractVector{<:ManifoldKernelDensity},
end
end
end
pGM, = prodAppxMSGibbsS(dummy, _ff,

## 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,
addop=addopT,
Expand Down
1 change: 1 addition & 0 deletions src/entities/ManifoldKernelDensity.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

struct ManifoldKernelDensity{M <: MB.AbstractManifold{MB.ℝ}, B <: BallTreeDensity, L, P}
manifold::M
""" legacy expects matrix of coordinates (as columns) """
belief::B
_partial::L
""" just an example point for local access to the point data type"""
Expand Down
5 changes: 4 additions & 1 deletion test/testMarginalProducts.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ P3 = marginal(manikde!(pts3, M), [2;])

##

P = manifoldProduct([P1;P2;P3])
@test_broken false
# P = manifoldProduct([P1;P2;P3])
@error "manifoldProduct needs complete point type for keyword `oldPoints`, current tests assume no marginal beliefs at front of product array"
P = manifoldProduct([P2;P1;P3])


## check the results
Expand Down