Merge pull request #1 from mcabbott/julia07fixes

Julia07fixes

.travis.yml

@@ -4,10 +4,16 @@ os:
   - linux
   - osx
 julia:
-  - 0.4
+  - 0.7
   - nightly
+
+# matrix:
+#   allow_failures:
+#   - julia: nightly
+
 notifications:
   email: false
+
 # uncomment the following lines to override the default test script
 #script:
 #  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi

REQUIRE

@@ -1 +1,2 @@
-julia 0.4
+julia 0.7
+

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

src/GroupSlices.jl

@@ -5,7 +5,7 @@ import Base.Cartesian, Base.Cartesian.@nloops, Base.Cartesian.@nref
 
 export groupslices, groupinds, firstinds, lastinds
 
-immutable Prehashed
+struct Prehashed
     hash::UInt
 end
 hash(x::Prehashed) = x.hash
@@ -30,7 +30,7 @@ elseif dim == 3
 end
 ```
 """
-@generated function groupslices{T,N}(A::AbstractArray{T,N}, dim::Int)
+@generated function groupslices(A::AbstractArray{T,N}, dim::Int) where {T,N}
     quote
         if !(1 <= dim <= $N)
             ArgumentError("Input argument dim must be 1 <= dim <= $N, but is currently $dim")
@@ -44,7 +44,7 @@ end
         end
 
         # Collect index of first row for each hash
-        uniquerow = Array(Int, size(A, dim))
+        uniquerow = Array{Int}(undef,size(A, dim))
         firstrow = Dict{Prehashed,Int}()
         for k = 1:size(A, dim)
             uniquerow[k] = get!(firstrow, Prehashed(hashes[k]), k)
@@ -128,7 +128,7 @@ function groupinds(ic::Vector{Int})
         d[ia[i]]= i
     end
 
-    ib = Array(Vector{Int},n)
+    ib = Array{Vector{Int}}(undef, n)
     for k = 1:n
         ib[k] = Int[]
     end
@@ -160,9 +160,9 @@ operates on the output returned from `groupinds(ic::Vector{Int})`.
 function firstinds(ic::Vector{Int})
     id = unique(ic)
     n = length(id)
-    ia = Array(Int,n)
+    ia = Array{Int}(undef,n)
     for i = 1:n
-        ia[i] = findfirst(ic, id[i])
+        ia[i] = something(findfirst(isequal(id[i]), ic), 0) # findfirst(ic, id[i]) 
     end
     return ia
 end

test/runtests.jl

@@ -1,11 +1,11 @@
 using GroupSlices
-using Base.Test
+using Test
 
 # Tests for groupslices, groupinds, firstinds, lastinds
 A = [1 2 3 ; 4 5 6 ; 7 8 9]
 B = [11 12 13 ; 14 15 16 ; 17 18 19]
 C = [21 22 23 ; 24 25 26 ; 27 28 29]
-D = cat(3, A, B, C, C, B, C, A)
+D = cat(A, B, C, C, B, C, A; dims=3)
 
 ic = [1;2;3;3;2;3;1]
 ib = Vector{Int}[]