Merge pull request #28 from quinnj/jq/0.7

0.7 compat

Author: quinnj

src/SortingAlgorithms.jl

@@ -82,7 +82,7 @@ function sort!(vs::AbstractVector, lo::Int, hi::Int, ::RadixSortAlg, o::Ordering
     for i = lo:hi
         v = uint_mapping(o, vs[i])
         for j = 1:iters
-            idx = Int((v >> (j-1)*RADIX_SIZE) & RADIX_MASK) + 1
+            idx = Int((v >> ((j-1)*RADIX_SIZE)) & RADIX_MASK) + 1
             @inbounds bin[idx,j] += 1
         end
     end
@@ -93,7 +93,7 @@ function sort!(vs::AbstractVector, lo::Int, hi::Int, ::RadixSortAlg, o::Ordering
     for j = 1:iters
         # Unroll first data iteration, check for degenerate case
         v = uint_mapping(o, vs[hi])
-        idx = Int((v >> (j-1)*RADIX_SIZE) & RADIX_MASK) + 1
+        idx = Int((v >> ((j-1)*RADIX_SIZE)) & RADIX_MASK) + 1
 
         # are all values the same at this radix?
         if bin[idx,j] == len;  continue;  end
@@ -106,7 +106,7 @@ function sort!(vs::AbstractVector, lo::Int, hi::Int, ::RadixSortAlg, o::Ordering
         # Finish the loop...
         @inbounds for i in hi-1:-1:lo
             v = uint_mapping(o, vs[i])
-            idx = Int((v >> (j-1)*RADIX_SIZE) & RADIX_MASK) + 1
+            idx = Int((v >> ((j-1)*RADIX_SIZE)) & RADIX_MASK) + 1
             ci = cbin[idx]
             ts[ci] = vs[i]
             cbin[idx] -= 1

test/runtests.jl

@@ -1,8 +1,11 @@
-using Base.Test
 using SortingAlgorithms
-using Compat
+using Compat, Compat.Test
 using StatsBase
 
+if !isdefined(Base, :invpermute!)
+    invpermute! = ipermute!
+end
+
 a = rand(1:10000, 1000)
 
 for alg in [TimSort, HeapSort, RadixSort]
@@ -31,7 +34,7 @@ for alg in [TimSort, HeapSort, RadixSort]
     permute!(c, ix)
     @test c == b
 
-    ipermute!(c, ix)
+    invpermute!(c, ix)
     @test c == a
 
     if alg != RadixSort  # RadixSort does not work with Lt orderings
@@ -70,7 +73,7 @@ for n in [0:10..., 100, 101, 1000, 1001]
         c = copy(v)
         permute!(c, pi)
         @test c == si
-        ipermute!(c, pi)
+        invpermute!(c, pi)
         @test c == v
 
         # stable algorithms
@@ -80,7 +83,7 @@ for n in [0:10..., 100, 101, 1000, 1001]
             s = copy(v)
             permute!(s, p)
             @test s == si
-            ipermute!(s, p)
+            invpermute!(s, p)
             @test s == v
         end
 
@@ -92,7 +95,7 @@ for n in [0:10..., 100, 101, 1000, 1001]
             s = copy(v)
             permute!(s, p)
             @test s == si
-            ipermute!(s, p)
+            invpermute!(s, p)
             @test s == v
         end
     end