🧹 no need to call SSDML.transform

Author: tpoisot

src/SimpleSDMLayers.jl

@@ -99,7 +99,7 @@ isdir(_layers_assets_path) || mkpath(_layers_assets_path)
 export clip
 
 function __init__()
-    @require GBIF="ee291a33-5a6c-5552-a3c8-0f29a1181037" begin
+    @require GBIF = "ee291a33-5a6c-5552-a3c8-0f29a1181037" begin
         @info "Loading GBIF support for SimpleSDMLayers.jl"
         include("integrations/GBIF.jl")
     end
@@ -111,7 +111,6 @@ function __init__()
     @require MultivariateStats = "6f286f6a-111f-5878-ab1e-185364afe411" begin
         @info "Loading MultivariateStats support for SimpleSDMLayers.jl"
         include("integrations/MultivariateStats.jl")
-        export transform
     end
 
 end

src/integrations/MultivariateStats.jl

@@ -1,44 +1,44 @@
 # WARNING this file is only loaded if MultivariateStats.jl is also active
 # This all happens thanks to the Requires.jl package
 
+_allowed_transforms = (MultivariateStats.PCA, MultivariateStats.PPCA, MultivariateStats.KernelPCA, MultivariateStats.Whitening)
+AllowedMultivariateTransforms = Union{_allowed_transforms...}
+
 """
 	MultivariateStats.fit(a, layers::Vector{T}, kwargs...) where T <: SimpleSDMLayer
 
-	Overloads the `fit` function from `MultivariateStats.jl`.
+Overloads the `fit` function from `MultivariateStats.jl`.
 """
-function MultivariateStats.fit(a, layers::Vector{T}, kwargs...) where {T<:SimpleSDMLayer}
+function MultivariateStats.fit(proj::Type{K}, layers::Vector{T}; kwargs...) where {T<:SimpleSDMLayer, K <: AllowedMultivariateTransforms}
     _layers_are_compatible(layers) || return ArgumentError("layers are not compatible")
     common_keys = reduce(∩, keys.(layers))
     input = hcat([vcat([layer[key] for layer in layers]...) for key in common_keys]...)
-    proj = MultivariateStats.fit(a, input, kwargs...)
+    proj = MultivariateStats.fit(proj, input; kwargs...)
     return proj
 end
 
 """
     transform(proj, layers::Vector{V}, 
     kwargs...) where {PT<:Union{MultivariateStats.PCA, MultivariateStats.PPCA},V<:SimpleSDMLayer} 
 
-	Overload of the `transform` function from `MultivariateStats.jl`. Here `proj` is a 
-	and output object from `MultivariateStats.fit` (see above). 
+Overload of the `transform` function from `MultivariateStats.jl`. Here `proj` is an output object from `MultivariateStats.fit` (see above). 
 """
-function transform(
-    proj,
-    layers::AbstractVecOrMat{U};
-    kwargs...,
+function MultivariateStats.transform(
+    proj, layers::AbstractVecOrMat{U}; kwargs...
 ) where {U<:SimpleSDMLayer}
-    outdim = MultivariateStats.outdim(proj)
-    newlayers = [similar(layers[begin]) for i = 1:outdim]
+    _layers_are_compatible(layers) || return ArgumentError("layers are not compatible")
+    
+    newlayers = [similar(first(layers)) for i in 1:MultivariateStats.outdim(proj)]
     common_keys = reduce(∩, keys.(layers))
 
     input = hcat([vcat([layer[key] for layer in layers]...) for key in common_keys]...)
 
     for (ct, key) in enumerate(common_keys)
         pcaproj = MultivariateStats.transform(proj, input[:, ct])
-        for i = 1:outdim
+        for i in 1:length(newlayers)
             newlayers[i][key] = pcaproj[i]
         end
     end
+
     return newlayers
 end
-
-

test/extensions/multivariatestats.jl

@@ -1,23 +1,22 @@
 module SSLTestMVStats
-    using SimpleSDMLayers
-    using MultivariateStats
-    using NeutralLandscapes
-    using Test
+using SimpleSDMLayers
+using MultivariateStats
+using NeutralLandscapes
+using Test
 
-    TEST_DIMS = (150,150)
-    TEST_AUTOCORRELATION = 0.9
-    TEST_NUM_LAYERS = 10
+TEST_DIMS = (150, 150)
+TEST_AUTOCORRELATION = 0.9
+TEST_NUM_LAYERS = 10
 
-    layers = [SimpleSDMResponse(rand(MidpointDisplacement(TEST_AUTOCORRELATION), TEST_DIMS...)) for i in 1:TEST_NUM_LAYERS]
+layers = [
+    SimpleSDMResponse(rand(MidpointDisplacement(TEST_AUTOCORRELATION), TEST_DIMS...)) for
+    i in 1:TEST_NUM_LAYERS
+]
 
+@test typeof(transform(fit(PCA, layers), layers)) <: Vector{T} where {T<:SimpleSDMLayer}
+#@test typeof(transform(fit(PPCA, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
 
-    @test typeof(SimpleSDMLayers.transform(fit(PCA, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
-#    @test typeof(transform(fit(PPCA, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
-
-
-
-#    @assert typeof(transform(fit(KernelPCA, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
-#    @assert typeof(transform(fit(Whitening, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
+#@assert typeof(transform(fit(KernelPCA, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
+#@assert typeof(transform(fit(Whitening, layers),layers)) <: Vector{T} where T<:SimpleSDMLayer
 
 end
-