Merge pull request #673 from johansigfrids/dontassignna

Don't unneecessarily assing NA when constructing empty DataFrames
JuliaData · Aug 15, 2014 · a0645a8 · a0645a8
2 parents 2ef2223 + 376af10
commit a0645a8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/dataframe/dataframe.jl b/src/dataframe/dataframe.jl
@@ -136,9 +136,6 @@ function DataFrame(column_eltypes::Vector, cnames::Vector, nrows::Integer)
     columns = Array(Any, p)
     for j in 1:p
         columns[j] = DataArray(column_eltypes[j], nrows)
-        for i in 1:nrows
-            columns[j][i] = NA
-        end
     end
     return DataFrame(columns, Index(cnames))
 end
@@ -150,9 +147,6 @@ function DataFrame(column_eltypes::Vector, nrows::Integer)
     cnames = gennames(p)
     for j in 1:p
         columns[j] = DataArray(column_eltypes[j], nrows)
-        for i in 1:nrows
-            columns[j][i] = NA
-        end
     end
     return DataFrame(columns, Index(cnames))
 end
@@ -1092,4 +1086,3 @@ function Base.push!(df::DataFrame, iterable::Any)
         i=i+1
     end
 end
-
diff --git a/test/dataframe.jl b/test/dataframe.jl
@@ -93,20 +93,29 @@ module TestDataFrame
     @test typeof(df[:, 1]) == DataVector{Int}
     @test typeof(df[:, 2]) == DataVector{Int}
     @test typeof(df[:, 3]) == DataVector{Int}
+    @test allna(df[:, 1])
+    @test allna(df[:, 2])
+    @test allna(df[:, 3])
 
     df = DataFrame({Int, Float64, ASCIIString}, 100)
     @test size(df, 1) == 100
     @test size(df, 2) == 3
     @test typeof(df[:, 1]) == DataVector{Int}
     @test typeof(df[:, 2]) == DataVector{Float64}
     @test typeof(df[:, 3]) == DataVector{ASCIIString}
+    @test allna(df[:, 1])
+    @test allna(df[:, 2])
+    @test allna(df[:, 3])
 
     df = DataFrame({Int, Float64, ASCIIString}, [:A, :B, :C], 100)
     @test size(df, 1) == 100
     @test size(df, 2) == 3
     @test typeof(df[:, 1]) == DataVector{Int}
     @test typeof(df[:, 2]) == DataVector{Float64}
     @test typeof(df[:, 3]) == DataVector{ASCIIString}
+    @test allna(df[:, 1])
+    @test allna(df[:, 2])
+    @test allna(df[:, 3])
 
     df = convert(DataFrame, zeros(10, 5))
     @test size(df, 1) == 10