Simplify

docs/src/algorithms/shortestpaths.md

@@ -1,6 +1,6 @@
 # Shortest paths
 
-*Graphs.jl* includes standard algorithms for [shortest paths](https://en.wikipedia.org/wiki/Shortest_path_problem).
+*Graphs.jl* includes standard algorithms for [shortest paths](https://en.wikipedia.org/wiki/Shortest_path_problem) and longest paths.
 
 ## Index
 
@@ -19,6 +19,7 @@ Pages = [
     "shortestpaths/dijkstra.jl",
     "shortestpaths/floyd-warshall.jl",
     "shortestpaths/johnson.jl",
+    "shortestpaths/longest_path.jl",
     "shortestpaths/spfa.jl",
     "shortestpaths/yen.jl",
 ]

src/Graphs.jl

@@ -499,6 +499,7 @@ include("traversals/eulerian.jl")
 include("connectivity.jl")
 include("distance.jl")
 include("editdist.jl")
+include("shortestpaths/utils.jl")
 include("shortestpaths/astar.jl")
 include("shortestpaths/bellman-ford.jl")
 include("shortestpaths/dijkstra.jl")
@@ -507,6 +508,7 @@ include("shortestpaths/desopo-pape.jl")
 include("shortestpaths/floyd-warshall.jl")
 include("shortestpaths/yen.jl")
 include("shortestpaths/spfa.jl")
+include("shortestpaths/longest_path.jl")
 include("linalg/LinAlg.jl")
 include("operators.jl")
 include("persistence/common.jl")
@@ -543,7 +545,6 @@ include("independentset/degree_ind_set.jl")
 include("independentset/maximal_ind_set.jl")
 include("vertexcover/degree_vertex_cover.jl")
 include("vertexcover/random_vertex_cover.jl")
-include("longestpaths/longest_path.jl")
 include("Experimental/Experimental.jl")
 include("Parallel/Parallel.jl")
 include("Test/Test.jl")

src/shortestpaths/longest_path.jl

@@ -0,0 +1,35 @@
+"""
+    dag_longest_path(g, distmx=weights(g); topological_order=topological_sort_by_dfs(g))
+
+Return a longest path within the directed acyclic graph `g`, with distance matrix `distmx` and using `topological_order` to iterate on vertices.
+"""
+function dag_longest_path end
+
+@traitfn function dag_longest_path(
+    g::::IsDirected,
+    distmx::AbstractMatrix=weights(g);
+    topological_order=topological_sort_by_dfs(g),
+)
+    U = eltype(g)
+    T = eltype(distmx)
+
+    dists = zeros(T, nv(g))
+    parents = zeros(U, nv(g))
+
+    for v in topological_order
+        for u in inneighbors(g, v)
+            newdist = dists[u] + distmx[u, v]
+            if newdist > dists[v]
+                dists[v] = newdist
+                parents[v] = u
+            end
+        end
+    end
+
+    if isempty(dists)
+        return U[]
+    else
+        v = argmax(dists)
+        return path_from_parents(v, parents)
+    end
+end

src/shortestpaths/utils.jl

@@ -0,0 +1,9 @@
+function path_from_parents(target::Integer, parents::AbstractVector)
+    v = target
+    path = [v]
+    while parents[v] != v && parents[v] != zero(v)
+        v = parents[v]
+        pushfirst!(path, v)
+    end
+    return path
+end

test/runtests.jl

@@ -103,6 +103,7 @@ tests = [
     "edit_distance",
     "connectivity",
     "persistence/persistence",
+    "shortestpaths/utils",
     "shortestpaths/astar",
     "shortestpaths/bellman-ford",
     "shortestpaths/desopo-pape",
@@ -111,6 +112,7 @@ tests = [
     "shortestpaths/floyd-warshall",
     "shortestpaths/yen",
     "shortestpaths/spfa",
+    "shortestpaths/longest_path",
     "traversals/bfs",
     "traversals/bipartition",
     "traversals/greedy_color",
@@ -152,7 +154,6 @@ tests = [
     "independentset/maximal_ind_set",
     "vertexcover/degree_vertex_cover",
     "vertexcover/random_vertex_cover",
-    "longestpaths/longest_path",
     "trees/prufer",
     "experimental/experimental",
 ]

test/longestpaths/longest_path.jl → test/shortestpaths/longest_path.jl

@@ -4,15 +4,9 @@
     @test dag_longest_path(g) == Int[]
 
     # unweighted DAG
-    g = DiGraph(7)
-    A = [(1, 2), (2, 3), (2, 4), (3, 5), (5, 6), (3, 7)]
-    for (i, j) in A
-        add_edge!(g, i, j)
-    end
+    g = SimpleDiGraphFromIterator(Edge.([(1, 2), (2, 3), (2, 4), (3, 5), (5, 6), (3, 7)]))
     @test dag_longest_path(g) == [1, 2, 3, 5, 6]
 
-    @test dag_longest_path(g; topological_order = topological_sort_by_dfs(g)) == [1, 2, 3, 5, 6]
-
     # weighted DAG
     n = 6
     g = DiGraph(n)
@@ -23,7 +17,4 @@
         distmx[i, j] = dist
     end
     @test dag_longest_path(g, distmx) == [2, 3, 5]
-
-    @test dag_longest_path(g, distmx; topological_order = topological_sort_by_dfs(g)) == [2, 3, 5]
-
 end

test/shortestpaths/utils.jl

@@ -0,0 +1,9 @@
+@testset "Path from parents" begin
+    using Graphs: path_from_parents
+    parents = [3, 0, 2, 5, 5]
+    @test path_from_parents(1, parents) == [2, 3, 1]
+    @test path_from_parents(2, parents) == [2]
+    @test path_from_parents(3, parents) == [2, 3]
+    @test path_from_parents(4, parents) == [5, 4]
+    @test path_from_parents(5, parents) == [5]
+end