Merge pull request #6 from timholy/pull-request/068c50f1

Update for Julia 0.6

.travis.yml

@@ -4,11 +4,13 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.4
+  - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false
 # uncomment the following lines to override the default test script
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("Munkres"); Pkg.test("Munkres"; coverage=true)'
+# script:
+#   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+#   - julia -e 'Pkg.clone(pwd()); Pkg.build("Munkres"); Pkg.test("Munkres"; coverage=true)'

REQUIRE

@@ -1 +1 @@
-julia 0.4-
+julia 0.4

appveyor.yml

@@ -1,9 +1,13 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - 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.5/julia-0.5-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-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"
 
 branches:
   only:
@@ -17,13 +21,16 @@ notifications:
     on_build_status_changed: false
 
 install:
+  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # Download most recent Julia Windows binary
   - ps: (new-object net.webclient).DownloadFile(
-        $("http://s3.amazonaws.com/"+$env:JULIAVERSION),
+        $env:JULIA_URL,
         "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
   - C:\projects\julia-binary.exe /S /D=C:\projects\julia
 
+build: off
+
 build_script:
 # Need to convert from shallow to complete for Pkg.clone to work
   - IF EXIST .git\shallow (git fetch --unshallow)

src/Munkres.jl

@@ -201,7 +201,7 @@ function step_five!(mask_array, row_cover, column_cover, path_start)
     row = -1
     column = -1
 
-    path = Array(Location,0)
+    path = Vector{Location}(0)
     push!(path, path_start)
 
     while ~done
@@ -237,7 +237,7 @@ function step_six!(cost,row_cover,column_cover, zero_locations)
     end
 
     cost.row_offsets[row_cover] -= min_value
-    cost.column_offsets[!column_cover] += min_value
+    cost.column_offsets[map(!, column_cover)] += min_value
 
     #need to deal with any zeros going away in covered columns and rows
     for i = 1:length(zero_locations)
@@ -302,8 +302,8 @@ end
 function find_smallest_uncovered(cost, row_cover, column_cover)
     #find the locations and value of the minimum of the cost matrix in the uncovered rows and columns
     min_value = typemax(eltype(cost))
-    uncovered_row_inds = find(!row_cover)
-    uncovered_col_inds = find(!column_cover)
+    uncovered_row_inds = find(map(!, row_cover))
+    uncovered_col_inds = find(map(!, column_cover))
     min_locations = Tuple{Int, Int}[]
     for j in uncovered_col_inds, i in uncovered_row_inds
         @inbounds c = cost[i,j]