Merge pull request JuliaData#215 from kmsquire/fix_ambiguous_def

Fix ambiguous ref definition
milktrader · Mar 14, 2013 · 04d03d3 · 04d03d3
2 parents f5514ff + 400cb39
commit 04d03d3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/dataarray.jl b/src/dataarray.jl
@@ -332,13 +332,8 @@ function ref(d::DataArray, inds::AbstractDataVector)
     inds = removeNA(inds)
     return d[inds]
 end
-# TODO: Return SubDataArray
-# TODO: Make inds::AbstractVector
-## # The following assumes that T<:Number won't have #undefs
-function ref{T<:Number,N}(d::DataArray{T,N}, inds::Union(Vector, Ranges, BitVector, Vector{Bool}))
-    DataArray(d.data[inds], d.na[inds])
-end
-function ref(d::DataArray, inds::Union(BitVector, Vector{Bool}))
+
+function ref{T,N}(d::DataArray{T,N}, inds::Union(BitVector, Vector{Bool}))
     res = similar(d, sum(inds))
     j = 1
     for i in 1:length(inds)
@@ -349,7 +344,7 @@ function ref(d::DataArray, inds::Union(BitVector, Vector{Bool}))
     end
     res
 end
-function ref(d::DataArray, inds::Union(Vector, Ranges))
+function ref{T,N}(d::DataArray, inds::Union(Vector, Ranges))
     res = similar(d, length(inds))
     for i in 1:length(inds)
         ix = inds[i]
@@ -360,6 +355,13 @@ function ref(d::DataArray, inds::Union(Vector, Ranges))
     res
 end
 
+# TODO: Return SubDataArray
+# TODO: Make inds::AbstractVector
+## # The following assumes that T<:Number won't have #undefs
+function ref{T<:Number,N}(d::DataArray{T,N}, inds::Union(Vector, Ranges, BitVector, Vector{Bool}))
+    DataArray(d.data[inds], d.na[inds])
+end
+
 # dm[SingleItemIndex, SingleItemIndex)
 function ref(d::DataMatrix, i::Real, j::Real)
     if d.na[i, j]