general cleanup

JuliaManifolds · Jun 29, 2019 · d8f1766 · d8f1766
1 parent eaef0bc
commit d8f1766
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/ArrayManifold.jl b/src/ArrayManifold.jl
@@ -12,10 +12,6 @@ end
 convert(::Type{M},m::ArrayManifold{M}) where M <: Manifold = m.manifold
 convert(::Type{ArrayManifold{M}},m::M) where M <: Manifold = ArrayManifold(M)
 
-function representation_size(M::ArrayManifold, ::Type{T}) where {T}
-    return representation_size(M.manifold, T)
-end
-
 manifold_dimension(M::ArrayManifold) = manifold_dimension(M.manifold)
 
 @traitimpl IsDecoratorManifold{ArrayManifold}

diff --git a/src/Manifolds.jl b/src/Manifolds.jl
@@ -122,10 +122,16 @@ function manifold_dimension end
 The size of array representing an object of type `T` on manifold `M`,
 for example point, tangent vector or cotangent vector.
 """
-function representation_size(M::Manifold, ::Type{T}) where {T}
+function representation_size end
+
+@traitfn function representation_size(M::MT, ::Type{T}) where {MT<:Manifold,T;!IsDecoratorManifold{MT}}
     error("representation_size not implemented for manifold $(typeof(M)) and type $(T).")
 end
 
+@traitfn function representation_size(M::MT, ::Type{T}) where {MT<:Manifold,T;IsDecoratorManifold{MT}}
+    return representation_size(base_manifold(M), T)
+end
+
 @traitfn function manifold_dimension(M::MT) where {MT<:Manifold;!IsDecoratorManifold{MT}}
     error("manifold_dimension not implemented for a $(typeof(M)).")
 end

diff --git a/src/Metric.jl b/src/Metric.jl
@@ -40,11 +40,6 @@ struct MetricManifold{M<:Manifold,G<:Metric} <: Manifold
     metric::G
 end
 
-function representation_size(M::MetricManifold, ::Type{T}) where {T}
-    return representation_size(M.manifold, T)
-end
-
-
 convert(::Type{MT},M::MetricManifold{MT,GT}) where {MT,GT} = M.manifold
 
 @traitimpl IsDecoratorManifold{MetricManifold}

diff --git a/src/ProductManifold.jl b/src/ProductManifold.jl
@@ -18,7 +18,7 @@ end
 
 function ProductManifold(manifolds...)
     sizes = map(m -> representation_size(m, MPoint), manifolds)
-    lengths = map(s -> prod(s), sizes)
+    lengths = map(prod, sizes)
     ranges = UnitRange{Int64}[]
     k = 1
     for len ∈ lengths
@@ -31,7 +31,7 @@ function ProductManifold(manifolds...)
 end
 
 function representation_size(M::ProductManifold, ::Type{T}) where {T}
-    return (sum(map(m -> representation_size(m, T), M.manifolds)),)
+    return (mapreduce(m -> representation_size(m, T), +, M.manifolds),)
 end
 
 manifold_dimension(M::ProductManifold) = sum(map(m -> manifold_dimension(m), M.manifolds))