Undo changes in LogRatio because Closure is not revertible

Author: juliohm

src/transforms/logratio.jl

@@ -26,9 +26,6 @@ function applyfeat(transform::LogRatio, feat, prep)
   names = Tables.columnnames(cols)
   vars = collect(names)
 
-  # perform closure for full revertibility
-  cfeat, ccache = apply(Closure(), feat)
-
   # reference variable
   rvar = refvar(transform, vars)
   _assert(rvar ∈ vars, "invalid reference variable")
@@ -41,9 +38,9 @@ function applyfeat(transform::LogRatio, feat, prep)
   pfeat = if perm
     popat!(vars, rind)
     push!(vars, rvar)
-    cfeat |> Select(vars)
+    feat |> Select(vars)
   else
-    cfeat
+    feat
   end
 
   # apply transform
@@ -57,20 +54,22 @@ function applyfeat(transform::LogRatio, feat, prep)
   𝒯 = (; zip(newnames, eachcol(Y))...)
   newfeat = 𝒯 |> Tables.materializer(feat)
 
-  newfeat, (ccache, perm, rind, vars)
+  newfeat, (perm, rind, vars)
 end
 
 function revertfeat(transform::LogRatio, newfeat, fcache)
   # retrieve cache
-  ccache, perm, rind, vars = fcache
+  perm, rind, vars = fcache
 
   # revert transform
   Y = Tables.matrix(newfeat)
   X = revertmatrix(transform, Y)
+
+  # reinsert variable names
   pfeat = (; zip(vars, eachcol(X))...)
 
   # revert the permutation if necessary
-  cfeat = if perm
+  feat = if perm
     n = length(vars)
     inds = collect(1:(n - 1))
     insert!(inds, rind, n)
@@ -79,11 +78,8 @@ function revertfeat(transform::LogRatio, newfeat, fcache)
     pfeat
   end
 
-  # revert closure for full revertibility
-  𝒯 = revert(Closure(), cfeat, ccache)
-
   # return same table type
-  𝒯 |> Tables.materializer(newfeat)
+  feat |> Tables.materializer(newfeat)
 end
 
 # ----------------

test/transforms/logratio.jl

@@ -13,20 +13,20 @@
   @test Tables.schema(n).names == (:ARL1, :ARL2)
   @test n == t |> ALR(:c)
   r = revert(T, n, c)
-  @test Tables.matrix(r) ≈ Tables.matrix(t)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r))
 
   T = CLR()
   n, c = apply(T, t)
   @test Tables.schema(n).names == (:CLR1, :CLR2, :CLR3)
   r = revert(T, n, c)
-  @test Tables.matrix(r) ≈ Tables.matrix(t)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r))
 
   T = ILR()
   n, c = apply(T, t)
   @test Tables.schema(n).names == (:ILR1, :ILR2)
   @test n == t |> ILR(:c)
   r = revert(T, n, c)
-  @test Tables.matrix(r) ≈ Tables.matrix(t)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r))
 
   a = [1.0, 0.0, 1.0]
   b = [2.0, 2.0, 2.0]
@@ -40,9 +40,9 @@
   n2, c2 = apply(T, t2)
   r2 = revert(T, n2, c2)
   @test n1 == n2
-  @test Tables.matrix(r1) ≈ Tables.matrix(t1)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r1))
   @test Tables.schema(r1).names == (:a, :c, :b)
-  @test Tables.matrix(r2) ≈ Tables.matrix(t2)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r2))
   @test Tables.schema(r2).names == (:c, :a, :b)
 
   T = ILR(:c)
@@ -51,8 +51,8 @@
   n2, c2 = apply(T, t2)
   r2 = revert(T, n2, c2)
   @test n1 == n2
-  @test Tables.matrix(r1) ≈ Tables.matrix(t1)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r1))
   @test Tables.schema(r1).names == (:a, :c, :b)
-  @test Tables.matrix(r2) ≈ Tables.matrix(t2)
+  @test all(x -> 0 ≤ x ≤ 1, Tables.matrix(r2))
   @test Tables.schema(r2).names == (:c, :a, :b)
 end