Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move colspec and rename arguments #38

Merged
merged 4 commits into from
Apr 10, 2022
Merged

Move colspec and rename arguments #38

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f964b8f
Move colspec to src
eliascarv Apr 9, 2022
820f147
Rename cols to names
eliascarv Apr 9, 2022
59b8163
Ajust include in transforms.jl file
eliascarv Apr 9, 2022
933754d
Move include("colspec.jl") to TableTransforms.jl file
eliascarv Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/transforms/colspec.jl → src/colspec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ struct MyTransform{S<:ColSpec,#= other type params =#}
# other fileds
end
```
2. use `_filter(colspec, cols)` internal function in apply:
2. use `_filter(colspec, names)` internal function in apply:
```julia
function apply(transform::MyTransform, table)
allcols = Tables.columnnames(table)
# selected columns
cols = _filter(transform.colspec, allcols)
names = Tables.columnnames(table)
# selected column names
snames = _filter(transform.colspec, names)
# code...
end
```
Expand All @@ -42,32 +42,32 @@ end
const ColSpec = Union{Vector{T},NTuple{N,T},Regex,Colon} where {N,T<:ColSelector}

# filter table columns using colspec
function _filter(colspec::Vector{Symbol}, cols)
function _filter(colspec::Vector{Symbol}, names)
# validate columns
@assert !isempty(colspec) "Invalid column selection."
@assert colspec ⊆ cols "Invalid column selection."
@assert colspec ⊆ names "Invalid column selection."
return colspec
end

_filter(colspec::Vector{<:AbstractString}, cols) =
_filter(Symbol.(colspec), cols)
_filter(colspec::Vector{<:AbstractString}, names) =
_filter(Symbol.(colspec), names)

_filter(colspec::Vector{<:Integer}, cols::Vector) =
_filter(cols[colspec], cols)
_filter(colspec::Vector{<:Integer}, names::Vector) =
_filter(names[colspec], names)

_filter(colspec::Vector{<:Integer}, cols::Tuple) =
_filter(colspec, collect(cols))
_filter(colspec::Vector{<:Integer}, names::Tuple) =
_filter(colspec, collect(names))

_filter(colspec::NTuple{N,<:ColSelector}, cols) where {N} =
_filter(collect(colspec), cols)
_filter(colspec::NTuple{N,<:ColSelector}, names) where {N} =
_filter(collect(colspec), names)

function _filter(colspec::Regex, cols::Vector)
fcols = filter(col -> occursin(colspec, String(col)), cols)
_filter(fcols, cols)
function _filter(colspec::Regex, names::Vector)
fnames = filter(col -> occursin(colspec, String(col)), names)
_filter(fnames, names)
end

_filter(colspec::Regex, cols::Tuple) =
_filter(colspec, collect(cols))
_filter(colspec::Regex, names::Tuple) =
_filter(colspec, collect(names))

_filter(::Colon, cols::Vector) = cols
_filter(::Colon, cols::Tuple) = collect(cols)
_filter(::Colon, names::Vector) = names
_filter(::Colon, names::Tuple) = collect(names)
2 changes: 1 addition & 1 deletion src/transforms.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ end
# IMPLEMENTATIONS
# ----------------

include("transforms/colspec.jl")
include("colspec.jl")
eliascarv marked this conversation as resolved.
Show resolved Hide resolved
include("transforms/select.jl")
include("transforms/filter.jl")
include("transforms/rename.jl")
Expand Down