Group utilities in utils.jl

Author: juliohm

src/TableTransforms.jl

@@ -32,6 +32,7 @@ import Distributions: quantile, cdf
 import TransformsBase: assertions, parameters, isrevertible, isinvertible
 import TransformsBase: apply, revert, reapply, preprocess, inverse
 
+include("utils.jl")
 include("tabletraits.jl")
 include("distributions.jl")
 include("tableselection.jl")

src/transforms/dropunits.jl

@@ -38,10 +38,6 @@ DropUnits(cols::C...) where {C<:Column} = DropUnits(selector(cols))
 
 isrevertible(::Type{<:DropUnits}) = true
 
-_dropunit(x) = _dropunit(x, nonmissingtype(eltype(x)))
-_dropunit(x, ::Type{Q}) where {Q<:AbstractQuantity} = (map(ustrip, x), unit(Q))
-_dropunit(x, ::Type) = (x, NoUnits)
-
 function applyfeat(transform::DropUnits, feat, prep)
   cols = Tables.columns(feat)
   names = Tables.columnnames(cols)
@@ -60,17 +56,14 @@ function applyfeat(transform::DropUnits, feat, prep)
   newfeat, (snames, units)
 end
 
-_addunit(x, ::typeof(NoUnits)) = x
-_addunit(x, u::Units) = map(v -> v * u, x)
-
 function revertfeat(::DropUnits, newfeat, fcache)
   cols = Tables.columns(newfeat)
   names = Tables.columnnames(cols)
 
   snames, units = fcache
   columns = map(names, units) do name, unit
     x = Tables.getcolumn(cols, name)
-    name ∈ snames ? _addunit(x, unit) : x
+    name ∈ snames ? _withunit(x, unit) : x
   end
 
   𝒯 = (; zip(names, columns)...)

src/transforms/unitify.jl

@@ -45,7 +45,7 @@ function applyfeat(::Unitify, feat, prep)
   pairs = map(names) do name
     x = Tables.getcolumn(cols, name)
     newname, unit = _unitify(name)
-    newname => _addunit(x, unit)
+    newname => _withunit(x, unit)
   end
 
   newfeat = (; pairs...) |> Tables.materializer(feat)

src/utils.jl

@@ -0,0 +1,10 @@
+# ------------------------------------------------------------------
+# Licensed under the MIT License. See LICENSE in the project root.
+# ------------------------------------------------------------------
+
+_dropunit(x) = _dropunit(x, nonmissingtype(eltype(x)))
+_dropunit(x, ::Type{Q}) where {Q<:AbstractQuantity} = (map(ustrip, x), unit(Q))
+_dropunit(x, ::Type) = (x, NoUnits)
+
+_withunit(x, ::typeof(NoUnits)) = x
+_withunit(x, u::Units) = map(v -> v * u, x)