Use setindex! to implement append!

Author: simonster

src/dataarray.jl

@@ -164,48 +164,6 @@ function Base.resize!{T}(da::DataArray{T,1}, n::Int)
     da
 end
 
-#' @description
-#'
-#' Append the elements of items to the end of d.
-#'
-#' @param da::DataArray{T,1} The DataArray to append elements to.
-#' @param items::DataArray{T,1} Elements to append to da.
-#'
-#' @returns: out::DataArray{T,1} The modified data array.
-#'
-#' @examples
-#'
-#' x = @data [1, 2, 3]
-#' y = @data [4, 5, 6]
-#' append!(x, y)
-function Base.append!{T}(da::DataArray{T,1}, items::DataArray{T,1})
-    append!(da.data, items.data)
-    append!(da.na, items.na)
-    da
-end
-
-#' @description
-#'
-#' Append the elements of items to the end of d.
-#'
-#' @param da::DataArray{T,1} The DataArray to append elements to.
-#' @param items::AbstractArray{T,1} Elements to append to da.
-#'
-#' @returns: out::DataArray{T,1} The modified data array.
-#'
-#' @examples
-#'
-#' x = @data [1, 2, 3]
-#' y = [4, 5, 6]
-#' append!(x, y)
-function Base.append!{T}(da::DataArray{T,1}, items::AbstractArray{T,1})
-    append!(da.data, items)
-    oldn = length(da.na)
-    resize!(da.na, oldn + length(items))
-    da.na[oldn+1:end] = false
-    da
-end
-
 #' @description
 #'
 #' Create a new DataArray{T} that is similar to an existing DataArray.

src/datavector.jl

@@ -161,6 +161,13 @@ end
 
 Base.deleteat!(pdv::PooledDataVector, inds) = (deleteat!(pdv.refs, inds); pdv)
 
+function Base.append!(da::AbstractDataVector, items::AbstractVector)
+    oldn = length(da)
+    resize!(da, oldn+length(items))
+    da[oldn+1:end] = items
+    da
+end
+
 # Pad a vector with NA's
 
 function padNA(dv::AbstractDataVector,

src/pooleddataarray.jl

@@ -167,65 +167,6 @@ function Base.resize!{T,R}(pda::PooledDataArray{T,R,1}, n::Int)
     pda
 end
 
-function Base.append!{T,R1,R2}(x::PooledDataArray{T,R1,1}, y::PooledDataArray{T,R2,1})
-    pool = myunique(vcat(x.pool, y.pool))
-    xn, yn = length(x), length(y)
-    resize!(x.refs, xn + yn)
-
-    xtidx::Array{R1} = findat(pool, x.pool)
-    for i in 1:xn
-        if x.refs[i] != 0
-            x.refs[i] = xtidx[x.refs[i]]
-        end
-    end
-
-    ytidx::Array{R1} = findat(pool, y.pool)
-    for i in 1:yn
-        x.refs[xn + i] = y.refs[i] == 0 ? 0 : ytidx[y.refs[i]]
-    end
-
-    x.pool = pool
-    return x
-end
-
-
-function Base.append!{T,R}(x::PooledDataArray{T,R,1}, y::AbstractArray{T,1})
-    poolref = Dict{T, R}()
-    for i in 1:length(x.pool)
-        poolref[x.pool[i]] = i
-    end
-    for v in y
-        if !isna(v) && !haskey(poolref, v)
-            poolref[v] = length(poolref) + 1
-        end
-    end
-
-    pool = Array(T, length(poolref))
-    for (v, i) in poolref
-        pool[i] = v
-    end
-
-    xn, yn = length(x), length(y)
-    resize!(x.refs, xn + yn)
-
-    xtidx::Array{R} = findat(pool, x.pool)
-    for i in 1:xn
-        if x.refs[i] != 0
-            x.refs[i] = xtidx[x.refs[i]]
-        end
-    end
-
-    for i in 1:yn
-        if !isna(y[i])
-            x.refs[i+xn] = poolref[y[i]]
-        end
-    end
-    x.pool = pool
-    return x
-end
-
-
-
 ##############################################################################
 ##
 ## Predicates, including the new isna()