Merge pull request #43 from JuliaAI/expose-unmixing-matrix

Re-instate projection for ICA

Author: ablaom

src/models/decomposition_models.jl

@@ -340,8 +340,13 @@ model_types = [
 ]
 
 for (M, MFitResultType) in model_types
-    @eval function MMI.fitted_params(::$M, fr)
-        return (projection=copy(MS.projection(fr)),)
+
+    if M !== ICA # special cased below
+        quote
+            function MMI.fitted_params(::$M, fr)
+                return (projection=copy(MS.projection(fr)),)
+            end
+        end |> eval
     end
 
     @eval function MMI.transform(::$M, fr::$MFitResultType, X)
@@ -360,3 +365,5 @@ for (M, MFitResultType) in model_types
         end
     end
 end
+
+MMI.fitted_params(::ICA, fr) = (projection=copy(fr.W), mean = copy(MS.mean(fr)))

test/models/decomposition_models.jl

@@ -75,7 +75,6 @@ end
     test_composition_model(ica_ms, ica_mlj, X, X_array, test_inverse=false)
 end
 
-
 @testset "PPCA" begin
     X_array = matrix(X)
     tolerance = 5.0

test/testutils.jl

@@ -39,4 +39,8 @@ function test_composition_model(ms_model, mlj_model, X, X_array ; test_inverse=t
         Xinv_mlj = matrix(Xinv_mlj_table)
         @test Xinv_ms ≈ Xinv_mlj
     end
+
+    # smoke test for issue #42
+    fp = MLJBase.fitted_params(mlj_model, fitresult)
+    :projection in keys(fp)
 end