Skip to content

Commit 13e8869

Browse files
committed
Rename variables
1 parent cb998f6 commit 13e8869

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/transforms/select.jl

+10-13
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,17 @@ _newnames(::Nothing, select) = select
5252
_newnames(names::Vector{Symbol}, select) = names
5353

5454
function applyfeat(transform::Select, feat, prep)
55-
# original columns
5655
cols = Tables.columns(feat)
56+
names = collect(Tables.columnnames(cols))
5757

5858
# retrieve relevant column names
59-
allcols = collect(Tables.columnnames(cols))
60-
select = transform.selector(allcols)
61-
names = _newnames(transform.newnames, select)
62-
reject = setdiff(allcols, select)
59+
select = transform.selector(names)
60+
reject = setdiff(names, select)
61+
newnames = _newnames(transform.newnames, select)
6362

6463
# keep track of indices to revert later
65-
sinds = indexin(select, allcols)
66-
rinds = indexin(reject, allcols)
64+
sinds = indexin(select, names)
65+
rinds = indexin(reject, names)
6766

6867
# sort indices to facilitate reinsertion
6968
sperm = sortperm(sinds)
@@ -72,18 +71,16 @@ function applyfeat(transform::Select, feat, prep)
7271
rcolumns = [Tables.getcolumn(cols, name) for name in reject]
7372

7473
fcache = (select, sperm, reject, rcolumns, rinds)
75-
newfeat = TableSelection(feat, names, select)
74+
newfeat = TableSelection(feat, newnames, select)
7675
newfeat, fcache
7776
end
7877

7978
function revertfeat(::Select, newfeat, fcache)
80-
# selected columns
8179
cols = Tables.columns(newfeat)
8280
names = Tables.columnnames(cols)
8381
# https://github.com/JuliaML/TableTransforms.jl/issues/76
8482
columns = Any[Tables.getcolumn(cols, name) for name in names]
8583

86-
# rejected columns
8784
select, sperm, reject, rcolumns, rinds = fcache
8885

8986
# restore rejected columns
@@ -136,9 +133,9 @@ isrevertible(::Type{<:Reject}) = true
136133

137134
function applyfeat(transform::Reject, feat, prep)
138135
cols = Tables.columns(feat)
139-
allcols = Tables.columnnames(cols)
140-
reject = transform.selector(allcols)
141-
select = setdiff(allcols, reject)
136+
names = Tables.columnnames(cols)
137+
reject = transform.selector(names)
138+
select = setdiff(names, reject)
142139
strans = Select(select)
143140
newfeat, sfcache = applyfeat(strans, feat, prep)
144141
newfeat, (strans, sfcache)

0 commit comments

Comments
 (0)