Skip to content

Commit 0840d53

Browse files
github-actions[bot]github-actions[bot]
authored
Format files using DocumentFormat
1 parent df44c1b commit 0840d53

15 files changed

+212
-212
lines changed

‎docs/make.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ using Documenter, IterableTables
22

33
makedocs(
44
modules = [IterableTables],
5-
analytics="UA-132838790-1",
5+
analytics = "UA-132838790-1",
66
sitename = "IterableTables.jl",
77
pages = [
88
"Introduction" => "index.md",

‎src/IterableTables.jl

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ using DataValues
88
include("integrations/generators.jl")
99

1010
function __init__()
11-
@require DataFrames="a93c6f00-e57d-5684-b7b6-d8193f3e46c0" if !isdefined(DataFrames, :Tables)
11+
@require DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" if !isdefined(DataFrames, :Tables)
1212
include("integrations/dataframes.jl")
1313
end
14-
@require StatsModels="3eaba693-59b7-5ba5-a881-562e759f1c8d" if !isdefined(StatsModels, :Tables)
14+
@require StatsModels = "3eaba693-59b7-5ba5-a881-562e759f1c8d" if !isdefined(StatsModels, :Tables)
1515
include("integrations/statsmodels.jl")
1616
end
17-
@require TimeSeries="9e3dc215-6440-5c97-bce1-76c03772f85e" if !isdefined(TimeSeries, :Tables)
17+
@require TimeSeries = "9e3dc215-6440-5c97-bce1-76c03772f85e" if !isdefined(TimeSeries, :Tables)
1818
include("integrations/timeseries.jl")
1919
end
20-
@require Temporal="a110ec8f-48c8-5d59-8f7e-f91bc4cc0c3d" include("integrations/temporal.jl")
20+
@require Temporal = "a110ec8f-48c8-5d59-8f7e-f91bc4cc0c3d" include("integrations/temporal.jl")
2121
end
2222

2323
end # module

‎src/integrations/dataframes.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ end
1010
# # Sink
1111

1212
function _DataFrame(x)
13-
cols, names = create_columns_from_iterabletable(x, na_representation=:missing)
13+
cols, names = create_columns_from_iterabletable(x, na_representation = :missing)
1414

1515
return DataFrames.DataFrame(cols, names)
1616
end
1717

18-
DataFrames.DataFrame(x::AbstractVector{T}) where {T<:NamedTuple} = _DataFrame(x)
18+
DataFrames.DataFrame(x::AbstractVector{T}) where {T <: NamedTuple} = _DataFrame(x)
1919

2020
function DataFrames.DataFrame(x)
2121
if TableTraits.isiterabletable(x)

‎src/integrations/generators.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
struct GeneratorWithElType{T, S}
1+
struct GeneratorWithElType{T,S}
22
source::S
33
end
44

‎src/integrations/juliadb.jl

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
@require JuliaDB begin
2-
using TableTraits
3-
using JuliaDB: DTable
4-
import IndexedTables
2+
using TableTraits
3+
using JuliaDB: DTable
4+
import IndexedTables
55

6-
TableTraits.isiterable(x::DTable) = true
7-
TableTraits.isiterabletable(x::DTable) = true
6+
TableTraits.isiterable(x::DTable) = true
7+
TableTraits.isiterabletable(x::DTable) = true
88

99
# TODO Replace with something more efficient
10-
function TableTraits.getiterator{S<:DTable}(source::S)
11-
it = collect(source)
12-
iter = getiterator(it)
10+
function TableTraits.getiterator{S <: DTable}(source::S)
11+
it = collect(source)
12+
iter = getiterator(it)
1313

14-
return iter
15-
end
14+
return iter
15+
end
1616

1717
# TODO Replace with something more efficient
18-
function JuliaDB.distribute(source, rowgroups::AbstractArray; idxcols::Union{Void,Vector{Symbol}}=nothing, datacols::Union{Void,Vector{Symbol}}=nothing)
19-
isiterabletable(source) || error()
18+
function JuliaDB.distribute(source, rowgroups::AbstractArray; idxcols::Union{Void,Vector{Symbol}} = nothing, datacols::Union{Void,Vector{Symbol}} = nothing)
19+
isiterabletable(source) || error()
2020

21-
it = IndexedTables.IndexedTable(source, idxcols=idxcols, datacols=datacols)
21+
it = IndexedTables.IndexedTable(source, idxcols = idxcols, datacols = datacols)
2222

23-
dt = JuliaDB.distribute(it, rowgroups)
23+
dt = JuliaDB.distribute(it, rowgroups)
2424

25-
return dt
26-
end
25+
return dt
26+
end
2727

2828
# TODO Replace with something more efficient
29-
function JuliaDB.distribute(source, nchunks::Int=nworkers(); idxcols::Union{Void,Vector{Symbol}}=nothing, datacols::Union{Void,Vector{Symbol}}=nothing)
30-
isiterabletable(source) || error()
29+
function JuliaDB.distribute(source, nchunks::Int = nworkers(); idxcols::Union{Void,Vector{Symbol}} = nothing, datacols::Union{Void,Vector{Symbol}} = nothing)
30+
isiterabletable(source) || error()
3131

32-
it = IndexedTables.IndexedTable(source, idxcols=idxcols, datacols=datacols)
32+
it = IndexedTables.IndexedTable(source, idxcols = idxcols, datacols = datacols)
3333

34-
dt = JuliaDB.distribute(it, nchunks)
34+
dt = JuliaDB.distribute(it, nchunks)
3535

36-
return dt
37-
end
36+
return dt
37+
end
3838

3939
end

‎src/integrations/statsmodels.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function StatsModels.ModelFrame(f::StatsModels.Formula, d; kwargs...)
44
end
55

66
function StatsModels.StatsBase.fit(::Type{T}, f::StatsModels.Formula, d, args...; contrasts::Dict = Dict(), kwargs...) where
7-
T<:Union{ StatsModels.StatsBase.StatisticalModel, StatsModels.StatsBase.RegressionModel}
7+
T <: Union{StatsModels.StatsBase.StatisticalModel,StatsModels.StatsBase.RegressionModel}
88
TableTraits.isiterabletable(d) || error()
99
StatsModels.StatsBase.fit(T, f, DataFrames.DataFrame(d), args...; contrasts = contrasts, kwargs...)
1010
end

‎src/integrations/temporal.jl

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
struct TSIterator{T, S}
1+
struct TSIterator{T,S}
22
source::S
33
end
44

55
IteratorInterfaceExtensions.isiterable(x::Temporal.TS) = true
66
TableTraits.isiterabletable(x::Temporal.TS) = true
77

8-
function IteratorInterfaceExtensions.getiterator(ta::S) where {S<:Temporal.TS}
8+
function IteratorInterfaceExtensions.getiterator(ta::S) where {S <: Temporal.TS}
99
etype = eltype(ta.values)
1010

11-
T = NamedTuple{(:Index, ta.fields...), Tuple{eltype(ta.index), fill(etype, length(ta.fields))...}}
11+
T = NamedTuple{(:Index, ta.fields...),Tuple{eltype(ta.index),fill(etype, length(ta.fields))...}}
1212

1313
return TSIterator{T,S}(ta)
1414
end
@@ -23,55 +23,55 @@ end
2323

2424
Base.eltype(::Type{TSIterator{T,TS}}) where {T,TS} = T
2525

26-
@generated function Base.iterate(iter::TSIterator{T,TS}, state=1) where {T,TS}
26+
@generated function Base.iterate(iter::TSIterator{T,TS}, state = 1) where {T,TS}
2727
constructor_call = Expr(:call, :($T))
2828

2929
push!(constructor_call.args, Expr(:tuple))
3030

3131
# Add timestamp column
3232
push!(constructor_call.args[2].args, :(iter.source.index[i]))
3333

34-
for i in 1:fieldcount(T)-1
34+
for i in 1:fieldcount(T) - 1
3535
push!(constructor_call.args[2].args, :(iter.source.values[i,$i]))
3636
end
3737

3838
quote
39-
if state>length(iter.source.index)
39+
if state > length(iter.source.index)
4040
return nothing
4141
else
4242
i = state
4343
a = $constructor_call
44-
return a, state+1
44+
return a, state + 1
4545
end
4646
end
4747
end
4848

4949
# Sink
5050

51-
function Temporal.TS(x; index_column::Symbol=:Index)
51+
function Temporal.TS(x; index_column::Symbol = :Index)
5252
TableTraits.isiterabletable(x) || error("Cannot create a TS from something that is not a table.")
5353

5454
iter = getiterator(x)
5555

5656
et = eltype(iter)
5757

58-
if fieldcount(et)<2
58+
if fieldcount(et) < 2
5959
error("Need at least two columns")
6060
end
6161

6262
names = fieldnames(et)
63-
63+
6464
timestep_col_index = findfirst(isequal(index_column), names)
6565

66-
if timestep_col_index===nothing
66+
if timestep_col_index === nothing
6767
error("No timestamp column found.")
6868
end
6969

7070
timestep_col_index = something(timestep_col_index)
71-
72-
col_types = [fieldtype(et, i) for i=1:fieldcount(et)]
7371

74-
data_columns = collect(Iterators.filter(i->i[2][1]!=index_column, enumerate(zip(names, col_types))))
72+
col_types = [fieldtype(et, i) for i = 1:fieldcount(et)]
73+
74+
data_columns = collect(Iterators.filter(i->i[2][1] != index_column, enumerate(zip(names, col_types))))
7575

7676
orig_data_type = data_columns[1][2][2]
7777

@@ -81,14 +81,14 @@ function Temporal.TS(x; index_column::Symbol=:Index)
8181

8282
timestep_type = orig_timestep_type <: DataValues.DataValue ? orig_timestep_type.parameters[1] : orig_timestep_type
8383

84-
if any(i->i[2][2]!=orig_data_type, data_columns)
84+
if any(i->i[2][2] != orig_data_type, data_columns)
8585
error("All data columns need to be of the same type.")
8686
end
8787

88-
t_column = Vector{timestep_type}(undef,0)
89-
d_array = Vector{Vector{data_type}}(undef,0)
88+
t_column = Vector{timestep_type}(undef, 0)
89+
d_array = Vector{Vector{data_type}}(undef, 0)
9090
for i in data_columns
91-
push!(d_array, Vector{data_type}(undef,0))
91+
push!(d_array, Vector{data_type}(undef, 0))
9292
end
9393

9494
for v in iter
@@ -99,18 +99,18 @@ function Temporal.TS(x; index_column::Symbol=:Index)
9999
end
100100

101101
if orig_data_type <: DataValue
102-
for (i,c) in enumerate(data_columns)
103-
push!(d_array[i],get(v[c[1]]))
102+
for (i, c) in enumerate(data_columns)
103+
push!(d_array[i], get(v[c[1]]))
104104
end
105105
else
106-
for (i,c) in enumerate(data_columns)
107-
push!(d_array[i],v[c[1]])
106+
for (i, c) in enumerate(data_columns)
107+
push!(d_array[i], v[c[1]])
108108
end
109109
end
110110
end
111111

112112
d_array = hcat(d_array...)
113113

114-
ta = Temporal.TS(d_array, t_column,[i[2][1] for i in data_columns])
114+
ta = Temporal.TS(d_array, t_column, [i[2][1] for i in data_columns])
115115
return ta
116116
end

‎src/integrations/timeseries.jl

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
struct TimeArrayIterator{T, S}
1+
struct TimeArrayIterator{T,S}
22
source::S
33
end
44

55
IteratorInterfaceExtensions.isiterable(x::TimeSeries.TimeArray) = true
66
TableTraits.isiterabletable(x::TimeSeries.TimeArray) = true
77

8-
function IteratorInterfaceExtensions.getiterator(ta::S) where {S<:TimeSeries.TimeArray}
8+
function IteratorInterfaceExtensions.getiterator(ta::S) where {S <: TimeSeries.TimeArray}
99
etype = eltype(TimeSeries.values(ta))
10-
11-
T = NamedTuple{(:timestamp, Symbol.(TimeSeries.colnames(ta))...), Tuple{S.parameters[3], fill(etype, length(TimeSeries.colnames(ta)))...}}
1210

13-
return TimeArrayIterator{T, S}(ta)
11+
T = NamedTuple{(:timestamp, Symbol.(TimeSeries.colnames(ta))...),Tuple{S.parameters[3],fill(etype, length(TimeSeries.colnames(ta)))...}}
12+
13+
return TimeArrayIterator{T,S}(ta)
1414
end
1515

1616
function Base.length(iter::TimeArrayIterator)
@@ -23,55 +23,55 @@ end
2323

2424
Base.eltype(::Type{TimeArrayIterator{T,TS}}) where {T,TS} = T
2525

26-
@generated function Base.iterate(iter::TimeArrayIterator{T,TS}, state=1) where {T,TS}
26+
@generated function Base.iterate(iter::TimeArrayIterator{T,TS}, state = 1) where {T,TS}
2727
constructor_call = Expr(:call, :($T))
2828

2929
push!(constructor_call.args, Expr(:tuple))
3030

3131
# Add timestamp column
3232
push!(constructor_call.args[2].args, :(TimeSeries.timestamp(iter.source)[i]))
3333

34-
for i in 1:fieldcount(T)-1
34+
for i in 1:fieldcount(T) - 1
3535
push!(constructor_call.args[2].args, :(TimeSeries.values(iter.source)[i,$i]))
3636
end
3737

3838
quote
39-
if state>length(TimeSeries.timestamp(iter.source))
39+
if state > length(TimeSeries.timestamp(iter.source))
4040
return nothing
4141
else
4242
i = state
4343
a = $constructor_call
44-
return a, state+1
44+
return a, state + 1
4545
end
4646
end
4747
end
4848

4949
# Sink
5050

51-
function TimeSeries.TimeArray(x; timestamp_column::Symbol=:timestamp)
51+
function TimeSeries.TimeArray(x; timestamp_column::Symbol = :timestamp)
5252
TableTraits.isiterabletable(x) || error("Cannot create a TimeArray from something that is not a table.")
5353

5454
iter = IteratorInterfaceExtensions.getiterator(x)
5555

5656
et = eltype(iter)
57-
58-
if fieldcount(et)<2
57+
58+
if fieldcount(et) < 2
5959
error("Need at least two columns")
6060
end
6161

6262
names = fieldnames(et)
63-
63+
6464
timestep_col_index = findfirst(isequal(timestamp_column), names)
6565

66-
if timestep_col_index===nothing
66+
if timestep_col_index === nothing
6767
error("No timestamp column found.")
6868
end
6969

7070
timestep_col_index = something(timestep_col_index)
71-
72-
col_types = [fieldtype(et, i) for i=1:fieldcount(et)]
7371

74-
data_columns = collect(Iterators.filter(i->i[2][1]!=timestamp_column, enumerate(zip(names, col_types))))
72+
col_types = [fieldtype(et, i) for i = 1:fieldcount(et)]
73+
74+
data_columns = collect(Iterators.filter(i->i[2][1] != timestamp_column, enumerate(zip(names, col_types))))
7575

7676
orig_data_type = data_columns[1][2][2]
7777

@@ -81,14 +81,14 @@ function TimeSeries.TimeArray(x; timestamp_column::Symbol=:timestamp)
8181

8282
timestep_type = orig_timestep_type <: DataValues.DataValue ? orig_timestep_type.parameters[1] : orig_timestep_type
8383

84-
if any(i->i[2][2]!=orig_data_type, data_columns)
84+
if any(i->i[2][2] != orig_data_type, data_columns)
8585
error("All data columns need to be of the same type.")
8686
end
8787

88-
t_column = Vector{timestep_type}(undef,0)
89-
d_array = Vector{Vector{data_type}}(undef,0)
88+
t_column = Vector{timestep_type}(undef, 0)
89+
d_array = Vector{Vector{data_type}}(undef, 0)
9090
for i in data_columns
91-
push!(d_array, Vector{data_type}(undef,0))
91+
push!(d_array, Vector{data_type}(undef, 0))
9292
end
9393

9494
for v in iter
@@ -99,18 +99,18 @@ function TimeSeries.TimeArray(x; timestamp_column::Symbol=:timestamp)
9999
end
100100

101101
if orig_data_type <: DataValue
102-
for (i,c) in enumerate(data_columns)
103-
push!(d_array[i],get(v[c[1]]))
102+
for (i, c) in enumerate(data_columns)
103+
push!(d_array[i], get(v[c[1]]))
104104
end
105105
else
106-
for (i,c) in enumerate(data_columns)
107-
push!(d_array[i],v[c[1]])
106+
for (i, c) in enumerate(data_columns)
107+
push!(d_array[i], v[c[1]])
108108
end
109109
end
110110
end
111111

112112
d_array = hcat(d_array...)
113113

114-
ta = TimeSeries.TimeArray(t_column,d_array,[i[2][1] for i in data_columns])
114+
ta = TimeSeries.TimeArray(t_column, d_array, [i[2][1] for i in data_columns])
115115
return ta
116116
end

0 commit comments

Comments
 (0)