fixed up codecov on core, simplegraphs, and interface (#1177)

* fixed up codecov on core, simplegraphs, and interface

* remove duplicate enumerate_paths

* inferred betweenness

Author: sbromberger

src/Parallel/shortestpaths/johnson.jl

@@ -37,25 +37,3 @@ distmx::AbstractMatrix{T}=weights(g)) where T <: Real where U <: Integer
     return JohnsonState(dists, parents)
 end
 
-function enumerate_paths(s::JohnsonState{T,U}, v::Integer) where T <: Real where U <: Integer
-    pathinfo = s.parents[v, :]
-    paths = Vector{Vector{U}}()
-    for i in 1:length(pathinfo)
-        if (i == v) || (s.dists[v, i] == typemax(T))
-            push!(paths, Vector{U}())
-        else
-            path = Vector{U}()
-            currpathindex = i
-            while currpathindex != 0
-                push!(path, currpathindex)
-                currpathindex = pathinfo[currpathindex]
-            end
-            push!(paths, reverse(path))
-        end
-    end
-    return paths
-end
-
-enumerate_paths(s::JohnsonState) = [enumerate_paths(s, v) for v in 1:size(s.parents, 1)]
-enumerate_paths(st::JohnsonState, s::Integer, d::Integer) = enumerate_paths(st, s)[d]
-

test/core.jl

@@ -12,7 +12,8 @@
 
     g5w = WheelGraph(5)
     for g in testgraphs(g5w)
-        @test @inferred(indegree(g, 1)) == @inferred(outdegree(g, 1)) == @inferred(degree(g, 1)) == 4
+        @test @inferred(indegree(g, 1)) == @inferred(outdegree(g, 1)) == 4
+        @test degree(g, 1) == 4 # explicit codecov
         @test @inferred(indegree(g)) == @inferred(outdegree(g)) == @inferred(degree(g)) == [4, 3, 3, 3, 3]
 
         @test @inferred(Δout(g)) == @inferred(Δin(g)) == @inferred(Δ(g)) == 4
@@ -24,7 +25,8 @@
 
         @test z1 == z2 == z3 == Dict(4 => 1, 3 => 4)
 
-        @test @inferred(neighbors(g, 2)) == @inferred(all_neighbors(g, 2)) == [1, 3, 5]
+        @test @inferred(neighbors(g, 2)) == [1, 3, 5]
+        @test @inferred(all_neighbors(g, 2)) == [1, 3, 5]
         @test @inferred(common_neighbors(g, 1, 5)) == [2, 4]
 
         gsl = copy(g)

test/interface.jl

@@ -33,6 +33,7 @@ mutable struct DummyEdge <: AbstractEdge{Int} end
         has_edge,
       ]
         @test_throws ErrorException graphfunedge(dummygraph, dummyedge)
+        @test_throws ErrorException graphfunedge(dummygraph, 1, 2)
     end
 
 end # testset

test/parallel/centrality/betweenness.jl

@@ -19,21 +19,21 @@
         @test all(isapprox(y, yd))
 
 
-        xt = Parallel.betweenness_centrality(g, 3; parallel=:threads)
+        xt = @inferred(Parallel.betweenness_centrality(g, 3; parallel=:threads))
         @test length(xt) == 50
-        xd = Parallel.betweenness_centrality(g, 3; parallel=:distributed)
+        xd = @inferred(Parallel.betweenness_centrality(g, 3; parallel=:distributed))
         @test length(xd) == 50
 
-        xt2 = Parallel.betweenness_centrality(g, collect(1:20); parallel=:threads)
+        xt2 = @inferred(Parallel.betweenness_centrality(g, collect(1:20); parallel=:threads))
         @test length(xt2) == 50
-        xd2 = Parallel.betweenness_centrality(g, collect(1:20); parallel=:distributed)
+        xd2 = @inferred(Parallel.betweenness_centrality(g, collect(1:20); parallel=:distributed))
         @test length(xd2) == 50
     end
     @test @inferred(Parallel.betweenness_centrality(s1; parallel=:threads)) == [0, 1, 0]
     @test @inferred(Parallel.betweenness_centrality(s1; parallel=:distributed)) == [0, 1, 0]
 
-    @test Parallel.betweenness_centrality(s2; parallel=:threads) == [0, 0.5, 0]
-    @test Parallel.betweenness_centrality(s2; parallel=:distributed) == [0, 0.5, 0]
+    @test @inferred(Parallel.betweenness_centrality(s2; parallel=:threads)) == [0, 0.5, 0]
+    @test @inferred(Parallel.betweenness_centrality(s2; parallel=:distributed)) == [0, 0.5, 0]
 
     g = SimpleGraph(2)
     add_edge!(g, 1, 2)

test/simplegraphs/runtests.jl

@@ -1,9 +1,14 @@
 using LightGraphs.SimpleGraphs
 
 import LightGraphs.SimpleGraphs: fadj, badj, adj
+import LightGraphs.edgetype, LightGraphs.has_edge
 using Statistics: mean
 
 struct DummySimpleGraph <: AbstractSimpleGraph{Int} end
+struct DummySimpleEdge <: AbstractSimpleEdge{Int} end
+DummySimpleEdge(x...) = DummySimpleEdge()
+LightGraphs.edgetype(g::DummySimpleGraph) = DummySimpleEdge
+has_edge(::DummySimpleGraph, ::DummySimpleEdge) = true
 
 # function to check if the invariants for SimpleGraph and SimpleDiGraph holds
 function isvalid_simplegraph(g::SimpleGraph{T}) where {T <: Integer}

test/simplegraphs/simpleedgeiter.jl

@@ -1,6 +1,7 @@
 @testset "SimpleEdgeIter" begin
     ga = @inferred(SimpleGraph(10, 20; seed=1))
     gb = @inferred(SimpleGraph(10, 20; seed=1))
+    gd = SimpleDiGraph{UInt8}(10, 20)
     @test sprint(show, edges(ga)) == "SimpleEdgeIter 20"
     # note: we don't get the first iterator state,
     #since iterate returns the state after taking the first value
@@ -19,6 +20,9 @@
     @test @inferred(eltype(edges(ga))) == eltype(typeof(edges(ga))) == edgetype(ga)
     @test eltype(collect(edges(ga))) == edgetype(ga)
 
+    # codecov for eltype(::Type{SimpleEdgeIter{SimpleDiGraph{T}}}) where {T} = SimpleDiGraphEdge{T}
+    @test @inferred(eltype(edges(gd))) == eltype(typeof(edges(gd))) == edgetype(gd) == SimpleDiGraphEdge{UInt8}
+    
     ga = @inferred(SimpleDiGraph(10, 20; seed=1))
     gb = @inferred(SimpleDiGraph(10, 20; seed=1))
     @test @inferred(edges(ga)) == edges(gb)

test/simplegraphs/simplegraphs.jl

@@ -12,11 +12,13 @@ import Random
 
     @test @inferred(ne(SimpleGraph(PathDiGraph(5)))) == 4
     @test @inferred(!is_directed(SimpleGraph))
+    @test @inferred(!is_directed(SimpleGraph{Int}))
 
     @test @inferred(eltype(SimpleDiGraph())) == Int
     @test @inferred(eltype(SimpleDiGraph(adjmx2))) == Int
     @test @inferred(ne(SimpleDiGraph(PathGraph(5)))) == 8
     @test @inferred(is_directed(SimpleDiGraph))
+    @test @inferred(is_directed(SimpleDiGraph{Int}))
 
 
     for gbig in [SimpleGraph(0xff), SimpleDiGraph(0xff)]
@@ -446,4 +448,6 @@ import Random
             @test isvalid_simplegraph(gf)
         end
     end
+    # codecov for has_edge(::AbstractSimpleGraph, x, y)
+    @test @inferred has_edge(DummySimpleGraph(), 1, 2)
 end