fix deprecs, specify version (#14)

Author: matbesancon

REQUIRE

@@ -1,4 +1,4 @@
 julia 0.6
-LightGraphs
-SimpleTraits
-MathProgBase
+LightGraphs 0.12
+SimpleTraits 0.6
+MathProgBase 0.7

src/dinic.jl

@@ -53,7 +53,7 @@ function blocking_flow! end
 
     while length(Q) > 0                   # Construct the Level Graph using BFS
         u = pop!(Q)
-        for v in lg.out_neighbors(residual_graph, u)
+        for v in lg.outneighbors(residual_graph, u)
             if P[v] == -1 && capacity_matrix[u, v] > flow_matrix[u, v]
                 P[v] = u
                 unshift!(Q, v)
@@ -65,7 +65,7 @@ function blocking_flow! end
 
     total_flow = 0
 
-    for bv in lg.in_neighbors(residual_graph, target)    # Trace all possible routes to source
+    for bv in lg.inneighbors(residual_graph, target)    # Trace all possible routes to source
         flow = typemax(T)
         v = target
         u = bv

src/edmonds_karp.jl

@@ -107,7 +107,7 @@ function fetch_path! end
     while true
         if length(Q_f) <= length(Q_r)
             u = pop!(Q_f)
-            for v in lg.out_neighbors(residual_graph, u)
+            for v in lg.outneighbors(residual_graph, u)
                 if capacity_matrix[u, v] - flow_matrix[u, v] > 0 && P[v] == -1
                     P[v] = u
                     if S[v] == -1
@@ -121,7 +121,7 @@ function fetch_path! end
             length(Q_f) == 0 && return 0, P, S, 1 # No paths to target
         else
             v = pop!(Q_r)
-            for u in lg.in_neighbors(residual_graph, v)
+            for u in lg.inneighbors(residual_graph, v)
                 if capacity_matrix[u, v] - flow_matrix[u, v] > 0 && S[u] == -1
                     S[u] = v
                     P[u] != -1 && return u, P, S, 0 # 0 indicates success

src/mincost.jl

@@ -39,12 +39,12 @@ julia> capacity = ones(6,6)
 julia> flow = mincost_flow(g, capacity, demand, w, ClpSolver(), 5, 6)
 ```
 """
-function mincost_flow(g::lg.DiGraph, 
+function mincost_flow(g::lg.DiGraph,
 		capacity::AbstractMatrix,
 		demand::AbstractMatrix,
 		cost::AbstractMatrix,
 		solver::AbstractMathProgSolver,
-		source::Int = -1, # if source and/or sink omitted or not in nodes, circulation problem 
+		source::Int = -1, # if source and/or sink omitted or not in nodes, circulation problem
 		sink::Int = -1)
 	flat_cap = collect(Iterators.flatten(capacity))
 	flat_dem = collect(Iterators.flatten(demand))

src/push_relabel.jl

@@ -36,7 +36,7 @@ function push_relabel end
     sizehint!(Q, n)
 
 
-    for v in lg.out_neighbors(residual_graph, source)
+    for v in lg.outneighbors(residual_graph, source)
         push_flow!(residual_graph, source, v, capacity_matrix, flow_matrix, excess, height, active, Q)
     end
 
@@ -46,7 +46,7 @@ function push_relabel end
         discharge!(residual_graph, v, capacity_matrix, flow_matrix, excess, height, active, count, Q)
     end
 
-    return sum([flow_matrix[v, target] for v in lg.in_neighbors(residual_graph, target)]), flow_matrix
+    return sum([flow_matrix[v, target] for v in lg.inneighbors(residual_graph, target)]), flow_matrix
 end
 
 """
@@ -160,7 +160,7 @@ function relabel! end
     n = lg.nv(residual_graph)
     count[height[v] + 1] -= 1
     height[v] = 2 * n
-    for to in lg.out_neighbors(residual_graph, v)
+    for to in lg.outneighbors(residual_graph, v)
         if capacity_matrix[v, to] > flow_matrix[v, to]
             height[v] = min(height[v], height[to] + 1)
         end
@@ -189,7 +189,7 @@ function discharge! end
         count::AbstractVector{Int},
         Q::AbstractVector                   # FIFO queue
     )
-    for to in lg.out_neighbors(residual_graph, v)
+    for to in lg.outneighbors(residual_graph, v)
         excess[v] == 0 && break
         push_flow!(residual_graph, v, to, capacity_matrix, flow_matrix, excess, height, active, Q)
     end

test/REQUIRE

@@ -1 +1 @@
-Clp
+Clp 0.4

test/dinic.jl

@@ -38,7 +38,7 @@
 
           #disconnect target and add unreachable vertex
           h = copy(residual_graph)
-          for src in collect(lg.in_neighbors(residual_graph, target))
+          for src in collect(lg.inneighbors(residual_graph, target))
               lg.rem_edge!(h, src, target)
           end
           @test @inferred(LightGraphsFlows.blocking_flow(h, source, target, capacity_matrix, flow_matrix)) == 0

test/edmonds_karp.jl

@@ -46,7 +46,7 @@
             end
             v, P, S, flag = LightGraphsFlows.fetch_path(h, s, t, flow_matrix, capacity_matrix)
             @test flag == 0
-            for i in collect(lg.in_neighbors(h, t))
+            for i in collect(lg.inneighbors(h, t))
                 lg.rem_edge!(h, i, t)
             end
             v, P, S, flag = LightGraphsFlows.fetch_path(h, s, t, flow_matrix, capacity_matrix)