Introduce dependency on DataStructures (#21)

* Update PkgEval badges

* Introduce dependency on DataStructures

* Qualify call to ordtype

* More depwarn fixes, bump Compat, add 0.5 to Travis

* Use map instead of dot-broadcast

* One more depwarn

Author: ararslan

.travis.yml

@@ -1,14 +1,15 @@
 language: julia
 os:
-    - osx
-    - linux
+  - osx
+  - linux
 julia:
-    - 0.4
-    - nightly
+  - 0.4
+  - 0.5
+  - nightly
 notifications:
-    email: false
-script:
-    - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-    - julia -e 'Pkg.clone(pwd()); Pkg.build("SortingAlgorithms"); Pkg.test("SortingAlgorithms"; coverage=true)'
-    - julia -e 'cd(Pkg.dir("SortingAlgorithms")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-
+  email: false
+#script:
+#  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#  - julia -e 'Pkg.clone(pwd()); Pkg.build("SortingAlgorithms"); Pkg.test("SortingAlgorithms"; coverage=true)'
+after_success:
+  - julia -e 'cd(Pkg.dir("SortingAlgorithms")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

README.md

@@ -1,7 +1,8 @@
 # Sorting Algorithms
 
-[![SortingAlgorithms](http://pkg.julialang.org/badges/SortingAlgorithms_0.3.svg)](http://pkg.julialang.org/?pkg=SortingAlgorithms&ver=0.3)
-[![SortingAlgorithms](http://pkg.julialang.org/badges/SortingAlgorithms_0.4.svg)](http://pkg.julialang.org/?pkg=SortingAlgorithms&ver=0.4)
+[![SortingAlgorithms](http://pkg.julialang.org/badges/SortingAlgorithms_0.4.svg)](http://pkg.julialang.org/?pkg=SortingAlgorithms)
+[![SortingAlgorithms](http://pkg.julialang.org/badges/SortingAlgorithms_0.5.svg)](http://pkg.julialang.org/?pkg=SortingAlgorithms)
+[![SortingAlgorithms](http://pkg.julialang.org/badges/SortingAlgorithms_0.6.svg)](http://pkg.julialang.org/?pkg=SortingAlgorithms)
 [![Build Status](https://travis-ci.org/JuliaLang/SortingAlgorithms.jl.svg?branch=master)](https://travis-ci.org/JuliaLang/SortingAlgorithms.jl)
 [![Coverage Status](https://coveralls.io/repos/JuliaLang/SortingAlgorithms.jl/badge.svg)](https://coveralls.io/r/JuliaLang/SortingAlgorithms.jl)
 

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.4
-Compat 0.8.4
+Compat 0.9.4
+DataStructures 0.5.3

src/SortingAlgorithms.jl

@@ -1,12 +1,15 @@
+__precompile__()
+
 module SortingAlgorithms
 
 using Compat
+using DataStructures
 import Compat.view
 using Base.Sort
 using Base.Order
 
 import Base.Sort: sort!
-import Base.Collections: heapify!, percolate_down!
+import DataStructures: heapify!, percolate_down!
 
 export HeapSort, TimSort, RadixSort
 
@@ -45,10 +48,10 @@ end
 uint_mapping(::ForwardOrdering, x::Unsigned) = x
 for (signedty, unsignedty) in ((Int8, UInt8), (Int16, UInt16), (Int32, UInt32), (Int64, UInt64), (Int128, UInt128))
     # In Julia 0.4 we can just use unsigned() here
-    @eval uint_mapping(::ForwardOrdering, x::$signedty) = reinterpret($unsignedty, x $ typemin(typeof(x)))
+    @eval uint_mapping(::ForwardOrdering, x::$signedty) = reinterpret($unsignedty, xor(x, typemin(typeof(x))))
 end
-uint_mapping(::ForwardOrdering, x::Float32)  = (y = reinterpret(Int32, x); reinterpret(UInt32, ifelse(y < 0, ~y, y $ typemin(Int32))))
-uint_mapping(::ForwardOrdering, x::Float64)  = (y = reinterpret(Int64, x); reinterpret(UInt64, ifelse(y < 0, ~y, y $ typemin(Int64))))
+uint_mapping(::ForwardOrdering, x::Float32)  = (y = reinterpret(Int32, x); reinterpret(UInt32, ifelse(y < 0, ~y, xor(y, typemin(Int32)))))
+uint_mapping(::ForwardOrdering, x::Float64)  = (y = reinterpret(Int64, x); reinterpret(UInt64, ifelse(y < 0, ~y, xor(y, typemin(Int64)))))
 
 uint_mapping{Fwd}(rev::ReverseOrdering{Fwd}, x) = ~uint_mapping(rev.fwd, x)
 uint_mapping{T<:Real}(::ReverseOrdering{ForwardOrdering}, x::T) = ~uint_mapping(Forward, x) # maybe unnecessary; needs benchmark
@@ -65,7 +68,7 @@ function sort!(vs::AbstractVector, lo::Int, hi::Int, ::RadixSortAlg, o::Ordering
     if lo >= hi;  return vs;  end
 
     # Make sure we're sorting a bits type
-    T = ordtype(o, vs)
+    T = Base.Order.ordtype(o, vs)
     if !isbits(T)
         error("Radix sort only sorts bits types (got $T)")
     end
@@ -134,7 +137,7 @@ end
 #
 # Original author: @kmsquire
 
-typealias Run UnitRange{Int}
+const Run = UnitRange{Int}
 
 const MIN_GALLOP = 7
 

test/runtests.jl

@@ -103,7 +103,7 @@ for n in [0:10..., 100, 101, 1000, 1001]
         # test float sorting with NaNs
         s = sort(v, alg=alg, order=ord)
         @test issorted(s, order=ord)
-        @test reinterpret(UInt64,v[isnan(v)]) == reinterpret(UInt64,s[isnan(s)])
+        @test reinterpret(UInt64, v[map(isnan, v)]) == reinterpret(UInt64, s[map(isnan, s)])
 
         # test float permutation with NaNs
         p = sortperm(v, alg=alg, order=ord)