break out aes operators into separate file, fix mistakes in subtract …

…and divide implementations
TidierOrg · Apr 8, 2024 · 60aeb97 · 60aeb97
1 parent 828db2b
commit 60aeb97
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 136 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "TidierPlots"
 uuid = "337ecbd1-5042-4e2a-ae6f-ca776f97570a"
 authors = ["Randall Boyes <[email protected]> and contributors"]
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"

diff --git a/src/TidierPlots.jl b/src/TidierPlots.jl
@@ -27,6 +27,7 @@ include("structs.jl")
 
 include("addplots.jl")
 include("aes.jl")
+include("aes_ops.jl")
 include("draw.jl")
 include("extract_aes.jl")
 #include("facets.jl")

diff --git a/src/aes.jl b/src/aes.jl
@@ -38,7 +38,10 @@ macro aes(exprs...)
     positional = Symbol[]
     for aes_ex in exprs
         if aes_ex isa Expr
-            if aes_ex.args[2] isa QuoteNode
+            if aes_ex.args[2] isa Expr
+
+
+            elseif aes_ex.args[2] isa QuoteNode
                 aes_dict[String(aes_ex.args[1])] = aes_ex.args[2].value
             elseif aes_ex.args[2] isa String
                 aes_dict[String(aes_ex.args[1])] = Symbol(aes_ex.args[2])

diff --git a/src/aes_ops.jl b/src/aes_ops.jl
@@ -0,0 +1,134 @@
+import Base.:>> 
+
+Base.:>>(sym::Symbol, fn::Function) = aesthetics_function(fn)(sym)
+
+# 'rithm'tic (dubious implementation)
+
+import Base.:+
+
+function add_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+    result = data[!, source[1]] .+ data[!, source[2]]
+    return Dict{Symbol, PlottableData}(
+        target => PlottableData(
+            result,        
+            identity,                
+            nothing,            
+            nothing                   
+        )
+    )
+end
+
+function make_add_const_function(constant::Real)
+    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+        result = data[!, source[1]] .+ constant
+        return Dict{Symbol, PlottableData}(
+            target => PlottableData(
+                result,        # get the column out of the dataframe
+                identity,      # apply generic_fn to it
+                nothing,            
+                nothing                   
+            )
+        )
+    end
+end
+
+Base.:+(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(add_cols_fn)
+Base.:+(s1::Symbol, s2::Real) = [s1] => AesTransform(make_add_const_function(s2))
+Base.:+(s2::Real, s1::Symbol) = [s1] => AesTransform(make_add_const_function(s2))
+
+import Base.:-
+
+function subtract_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+    result = data[!, source[1]] .- data[!, source[2]]
+    return Dict{Symbol, PlottableData}(
+        target => PlottableData(
+            result,        
+            identity,                
+            nothing,            
+            nothing                   
+        )
+    )
+end
+
+function make_subtract_const_function(constant::Real)
+    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+        result = constant .- data[!, source[1]]
+        return Dict{Symbol, PlottableData}(
+            target => PlottableData(
+                result,        # get the column out of the dataframe
+                identity,      # apply generic_fn to it
+                nothing,            
+                nothing                   
+            )
+        )
+    end
+end
+
+Base.:-(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(subtract_cols_fn)
+Base.:-(s1::Symbol, s2::Real) = [s1] => AesTransform(make_add_const_function(-s2))
+Base.:-(s2::Real, s1::Symbol) = [s1] => AesTransform(make_subtract_const_function(s2))
+
+import Base.:*
+
+function multiply_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+    result = data[!, source[1]] .* data[!, source[2]]
+    return Dict{Symbol, PlottableData}(
+        target => PlottableData(
+            result,        
+            identity,                
+            nothing,            
+            nothing                   
+        )
+    )
+end
+
+function make_multiply_const_function(constant::Real)
+    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+        result = data[!, source[1]] .* constant
+        return Dict{Symbol, PlottableData}(
+            target => PlottableData(
+                result,        # get the column out of the dataframe
+                identity,      # apply generic_fn to it
+                nothing,            
+                nothing                   
+            )
+        )
+    end
+end
+
+Base.:*(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(multiply_cols_fn)
+Base.:*(s1::Symbol, s2::Real) = [s1] => AesTransform(make_multiply_const_function(s2))
+Base.:*(s2::Real, s1::Symbol) = [s1] => AesTransform(make_multiply_const_function(s2))
+
+
+import Base.:/
+
+function divide_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+    result = data[!, source[1]] ./ data[!, source[2]]
+    return Dict{Symbol, PlottableData}(
+        target => PlottableData(
+            result,        
+            identity,                
+            nothing,            
+            nothing                   
+        )
+    )
+end
+
+function make_divide_const_function(constant::Real)
+    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
+        result = constant ./ data[!, source[1]]
+        return Dict{Symbol, PlottableData}(
+            target => PlottableData(
+                result,        # get the column out of the dataframe
+                identity,      # apply generic_fn to it
+                nothing,            
+                nothing                   
+            )
+        )
+    end
+end
+
+Base.:/(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(divide_cols_fn)
+Base.:/(s1::Symbol, s2::Real) = [s1] => AesTransform(make_multiply_const_function(1/s2))
+Base.:/(s2::Real, s1::Symbol) = [s1] => AesTransform(make_divide_const_function(s2))
diff --git a/src/transforms.jl b/src/transforms.jl
@@ -165,140 +165,6 @@ function aesthetics_function(generic_fn::Function)
     return AesTransform(aes_fn)
 end
 
-import Base.:>> 
-
-Base.:>>(sym::Symbol, fn::Function) = aesthetics_function(fn)(sym)
-
-# 'rithm'tic (dubious implementation)
-
-import Base.:+
-
-function add_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    result = data[!, source[1]] .+ data[!, source[2]]
-    return Dict{Symbol, PlottableData}(
-        target => PlottableData(
-            result,        
-            identity,                
-            nothing,            
-            nothing                   
-        )
-    )
-end
-
-function make_add_const_function(constant::Real)
-    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-        result = data[!, source[1]] .+ constant
-        return Dict{Symbol, PlottableData}(
-            target => PlottableData(
-                result,        # get the column out of the dataframe
-                identity,      # apply generic_fn to it
-                nothing,            
-                nothing                   
-            )
-        )
-    end
-end
-
-Base.:+(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(add_cols_fn)
-Base.:+(s1::Symbol, s2::Real) = [s1] => AesTransform(make_add_const_function(s2))
-Base.:+(s2::Real, s1::Symbol) = [s1] => AesTransform(make_add_const_function(s2))
-
-import Base.:-
-
-function subtract_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    result = data[!, source[1]] .- data[!, source[2]]
-    return Dict{Symbol, PlottableData}(
-        target => PlottableData(
-            result,        
-            identity,                
-            nothing,            
-            nothing                   
-        )
-    )
-end
-
-function make_subtract_const_function(constant::Real)
-    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-        result = data[!, source[1]] .- constant
-        return Dict{Symbol, PlottableData}(
-            target => PlottableData(
-                result,        # get the column out of the dataframe
-                identity,      # apply generic_fn to it
-                nothing,            
-                nothing                   
-            )
-        )
-    end
-end
-
-Base.:-(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(subtract_cols_fn)
-Base.:-(s1::Symbol, s2::Real) = [s1] => AesTransform(make_subtract_const_function(s2))
-Base.:-(s2::Real, s1::Symbol) = [s1] => AesTransform(make_subtract_const_function(s2))
-
-import Base.:/
-
-function divide_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    result = data[!, source[1]] ./ data[!, source[2]]
-    return Dict{Symbol, PlottableData}(
-        target => PlottableData(
-            result,        
-            identity,                
-            nothing,            
-            nothing                   
-        )
-    )
-end
-
-function make_divide_const_function(constant::Real)
-    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-        result = data[!, source[1]] ./ constant
-        return Dict{Symbol, PlottableData}(
-            target => PlottableData(
-                result,        # get the column out of the dataframe
-                identity,      # apply generic_fn to it
-                nothing,            
-                nothing                   
-            )
-        )
-    end
-end
-
-Base.:/(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(divide_cols_fn)
-Base.:/(s1::Symbol, s2::Real) = [s1] => AesTransform(make_divide_const_function(s2))
-Base.:/(s2::Real, s1::Symbol) = [s1] => AesTransform(make_divide_const_function(s2))
-
-import Base.:*
-
-function multiply_cols_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-    result = data[!, source[1]] .* data[!, source[2]]
-    return Dict{Symbol, PlottableData}(
-        target => PlottableData(
-            result,        
-            identity,                
-            nothing,            
-            nothing                   
-        )
-    )
-end
-
-function make_multiply_const_function(constant::Real)
-    return function add_const_fn(target::Symbol, source::Vector{Symbol}, data::DataFrame)
-        result = data[!, source[1]] .* constant
-        return Dict{Symbol, PlottableData}(
-            target => PlottableData(
-                result,        # get the column out of the dataframe
-                identity,      # apply generic_fn to it
-                nothing,            
-                nothing                   
-            )
-        )
-    end
-end
-
-Base.:*(s1::Symbol, s2::Symbol) = [s1, s2] => AesTransform(multiply_cols_fn)
-Base.:*(s1::Symbol, s2::Real) = [s1] => AesTransform(make_multiply_const_function(s2))
-Base.:*(s2::Real, s1::Symbol) = [s1] => AesTransform(make_multiply_const_function(s2))
-
 
 # tweaks
 # takes an existing PlottableData object and modifies the makie_function