NOT supporting v0.6 yet

chkwon · Jan 19, 2017 · 86daf15 · tkelman · Jan 21, 2017 · chkwon
1 parent dc76caa
commit 86daf15
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
     - osx
 julia:
     - 0.5
-    - nightly
+    # - nightly
 notifications:
     email: false
 script:

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ This package for [the Julia Language](http://www.julialang.org) does basically t
 julia> Pkg.add("TrafficAssignment")
 ```
 
-This will install [LightGraphs.jl](https://github.com/JuliaLang/LightGraphs.jl) and [Optim.jl](https://github.com/JuliaOpt/Optim.jl), if you don't have them already.
+This will install [LightGraphs.jl](https://github.com/JuliaGraphs/LightGraphs.jl) and [Optim.jl](https://github.com/JuliaOpt/Optim.jl), if you don't have them already.
 
 To check if works
 ```julia

diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,3 @@
-julia 0.5
+julia 0.5 0.6
 LightGraphs 0.7 0.8
 Optim 0.7 0.8
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,9 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.5-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.5-latest-win64.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  # - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
+  # - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
 
 branches:
   only:

diff --git a/src/misc.jl b/src/misc.jl
@@ -1,14 +1,13 @@
 
 
 function TA_dijkstra_shortest_paths(graph, travel_time, origin, start_node, end_node)
-
     no_node = nv(graph)
     no_arc = ne(graph)
 
     distmx = Inf*ones(no_node, no_node)
-	for i in 1:no_arc
-		distmx[start_node[i], end_node[i]] = travel_time[i]
-	end
+    for i in 1:no_arc
+      distmx[start_node[i], end_node[i]] = travel_time[i]
+    end
 
     state = dijkstra_shortest_paths(graph, origin, distmx)
     return state