fixed bug with fastby

xiaodaigh · Jan 16, 2019 · 040cd7c · 040cd7c
1 parent 4f0491b
commit 040cd7c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/fastby.jl b/src/fastby.jl
@@ -40,8 +40,9 @@ end
 Internal: single-function fastby, one by, one val
 """
 function _fastby!(fn::Function, byvec::AbstractVector{T}, valvec::AbstractVector{S}) where {T <: Union{BaseRadixSortSafeTypes, Bool, String}, S}
-    l = length(byvec)
-    grouptwo!(byvec, valvec)
+    # l = length(byvec)
+    #grouptwo!(byvec, valvec)    
+    SortingLab.sorttwo!(byvec, valvec)
     #return _contiguousby(fn, byvec, valvec)
     return _contiguousby_vec(fn, byvec, valvec)
 end

diff --git a/src/grouptwo.jl b/src/grouptwo.jl
@@ -1,7 +1,7 @@
 import Base: isbits, sizeof, similar
 using SortingAlgorithms
 import SortingAlgorithms: RADIX_SIZE, RADIX_MASK
-import Base: getindex,setindex!, similar
+import Base: getindex, setindex!, similar
 
 function grouptwo!(vs::AbstractVector{T}, index) where {T <: BaseRadixSortSafeTypes}
     l = length(vs)
@@ -11,7 +11,7 @@ function grouptwo!(vs::AbstractVector{T}, index) where {T <: BaseRadixSortSafeTy
 
     # Init
     # iters = ceil(Integer, sizeof(T)*8/RADIX_SIZE) # takes 2.954
-    
+
     bits_to_sort = sizeof(T)*8 - leading_zeros(T(reduce(|, vs)))
     iters = ceil(Integer, bits_to_sort/RADIX_SIZE)
 
@@ -156,4 +156,4 @@ end
 getindex(siv::ValIndexVector, inds::Integer) = siv.svec[inds], siv.index[inds]
 getindex(siv::ValIndexVector, inds...) = ValIndexVector(siv.svec[inds...], siv.index[inds...])
 similar(siv::ValIndexVector) = ValIndexVector(similar(siv.svec), similar(siv.index))
-size(siv::ValIndexVector) = length(siv.svec)
+size(siv::ValIndexVector) = length(siv.svec)