restore tests, upstream setPointMani!, AMP compat

Author: dehann

Project.toml

@@ -43,7 +43,7 @@ TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-ApproxManifoldProducts = "0.4.12"
+ApproxManifoldProducts = "0.4.13"
 BSON = "0.2, 0.3"
 Combinatorics = "1.0"
 DataStructures = "0.16, 0.17, 0.18"

src/Factors/Mixture.jl

@@ -87,7 +87,7 @@ function getSample( cf::CalcFactor{<:Mixture},
   for i in 1:N
     mixComponent = cf.factor.components[cf.factor.labels[i]]
     # measurements relate to the factor's manifold (either tangent vector or manifold point)
-    _setPointsMani!(smpls[1][i], randToPoints(mixComponent,1)[1])
+    setPointsMani!(smpls[1][i], randToPoints(mixComponent,1)[1])
   end
 
   # TODO only does first element of meas::Tuple at this stage, see #1099

src/SolverUtilities.jl

@@ -22,55 +22,6 @@ randToPoints(distr::SamplableBelief, N::Int=1) = [rand(distr,1)[:] for i in 1:N]
 randToPoints(distr::ManifoldKernelDensity, N::Int=1) = rand(distr,N)
 
 
-_setPointsMani!(dest::AbstractVector, src::AbstractVector) = (dest .= src)
-_setPointsMani!(dest::AbstractMatrix, src::AbstractMatrix) = (dest .= src)
-function _setPointsMani!(dest::AbstractVector, src::AbstractMatrix)
-  @assert size(src,2) == 1 "Workaround _setPointsMani! currently only allows size(::Matrix, 2) == 1"
-  _setPointsMani!(dest, src[:])
-end
-function _setPointsMani!(dest::AbstractMatrix, src::AbstractVector)
-  @assert size(dest,2) == 1 "Workaround _setPointsMani! currently only allows size(::Matrix, 2) == 1"
-  _setPointsMani!(view(dest,:,1), src)
-end
-
-function _setPointsMani!(dest::AbstractVector, src::AbstractVector{<:AbstractVector})
-  @assert length(src) == 1 "Workaround _setPointsMani! currently only allows Vector{Vector{P}}(...) |> length == 1"
-  _setPointsMani!(dest, src[1])
-end
-
-function _setPointsMani!(dest::ProductRepr, src::ProductRepr)
-  for (k,prt) in enumerate(dest.parts)
-    _setPointsMani!(prt, src.parts[k])
-  end
-end
-
-# asPartial=true indicates that src coords are smaller than dest coords, and false implying src has dummy values in placeholder dimensions
-function _setPointsManiPartial!(Mdest::AbstractManifold, 
-                                dest, 
-                                Msrc::AbstractManifold, 
-                                src, 
-                                partial::AbstractVector{<:Integer},
-                                asPartial::Bool=true )
-  #
-
-  e0 = identity(Mdest, dest)
-  dest_ = vee(Mdest, e0, log(Mdest, e0, dest))
-
-  e0s = identity(Msrc, src)
-  src_ = vee(Msrc, e0s, log(Msrc, e0s, src))
-
-  # do the copy in coords 
-  dest_[partial] .= asPartial ? src_ : view(src_, partial)
-
-  # update points base in original
-  dest__ = exp(Mdest, e0, hat(Mdest, e0, dest_))
-  _setPointsMani!(dest, dest__)
-
-  #
-  return dest 
-end
-
-
 
 """
     $TYPEDSIGNATURES
@@ -79,10 +30,11 @@ Calculate the Kernel Embedding MMD 'distance' between sample points (or kernel d
 
 Notes
 - `bw::Vector=[0.001;]` controls the mmd kernel bandwidths.
+- Overloading from ApproxManifoldProducts
 
 Related
 
-`KDE.kld`
+`AMP.kld`
 """
 function mmd( p1::AbstractVector{P1}, 
               p2::AbstractVector{P2}, 

src/services/EvalFactor.jl

@@ -364,7 +364,7 @@ function evalPotentialSpecific( Xi::AbstractVector{<:DFGVariable},
     for m in (1:length(addEntr))[ahmask]
       # FIXME, selection for all measurement::Tuple elements
       # @info "check broadcast" ccwl.usrfnc! addEntr[m] ccwl.measurement[1][m]
-      _setPointsMani!(addEntr[m], ccwl.measurement[1][m])
+      setPointsMani!(addEntr[m], ccwl.measurement[1][m])
     end
     # ongoing part of RoME.jl #244
     addEntropyOnManifold!(mani, addEntrNH, 1:getDimension(mani), spreadDist)
@@ -380,7 +380,7 @@ function evalPotentialSpecific( Xi::AbstractVector{<:DFGVariable},
         # FIXME, need ability to replace partial points
         partialCoords = ccwl.partialDims
         Msrc, = getManifoldPartial(mani,partialCoords)
-        _setPointsManiPartial!(mani, addEntr[m], Msrc, ccwl.measurement[1][m], partialCoords)
+        setPointsManiPartial!(mani, addEntr[m], Msrc, ccwl.measurement[1][m], partialCoords)
         # addEntr[m][dimnum] = ccwl.measurement[1][m][i]
       # end
     end

src/services/FactorGradients.jl

@@ -108,7 +108,7 @@ end
 getCoordSizes(fgc::FactorGradientsCached!) = fgc._coord_sizes
 
 
-_setFGCSlack!(fgc::FactorGradientsCached!{F}, slack) where F = _setPointsMani!(fgc.slack_residual, slack)
+_setFGCSlack!(fgc::FactorGradientsCached!{F}, slack) where F = setPointsMani!(fgc.slack_residual, slack)
 
 function _setFGCSlack!(fgc::FactorGradientsCached!{F,S}, slack::Number) where {F,S<:Number}
   fgc.slack_residual = slack
@@ -121,7 +121,7 @@ function (fgc::FactorGradientsCached!)(meas_pts...)
 
   # update in-place the new measurement value in preparation for new gradient calculation
   for (m, tup_m) in enumerate(fgc.measurement)
-    _setPointsMani!(tup_m, meas_pts[m])
+    setPointsMani!(tup_m, meas_pts[m])
   end
 
   # update the residual _slack in preparation for new gradient calculation
@@ -132,12 +132,12 @@ function (fgc::FactorGradientsCached!)(meas_pts...)
   new_slack = calcFactorResidualTemporary(fct, varTypes, measurement, pts; tfg=fgc._tfg)
   # TODO make sure slack_residual is properly wired up with all the lambda functions as expected
   _setFGCSlack!(fgc, new_slack)
-  # _setPointsMani!(fgc.slack_residual, new_slack)
+  # setPointsMani!(fgc.slack_residual, new_slack)
 
   # set new points in preparation for new gradient calculation
   for (s,pt) in enumerate(meas_pts[(lenm+1):end])
     # update the local memory in fgc to take the values of incoming `pts`
-    _setPointsMani!(fgc.currentPoints[s], pt)
+    setPointsMani!(fgc.currentPoints[s], pt)
   end
 
   # update the gradients at new values contained in fgc