Fix formatting for file vf2.jl and remove ignore in test (#323)

Author: gdalle

benchmark/core.jl

@@ -34,4 +34,6 @@ end
 
 suite["core"]["has_edge"] = BenchmarkGroup(["graphs", "digraphs"])
 suite["core"]["has_edge"]["graphs"] = @benchmarkable [all_has_edge(g) for (n, g) in $GRAPHS]
-suite["core"]["has_edge"]["digraphs"] = @benchmarkable [all_has_edge(g) for (n, g) in $DIGRAPHS]
+suite["core"]["has_edge"]["digraphs"] = @benchmarkable [
+    all_has_edge(g) for (n, g) in $DIGRAPHS
+]

src/Experimental/vf2.jl

@@ -658,7 +658,7 @@ function all_isomorph(
     edge_relation::Union{Nothing,Function}=nothing,
 )::Channel{Vector{Tuple{eltype(g1),eltype(g2)}}}
     T = Vector{Tuple{eltype(g1),eltype(g2)}}
-    !could_have_isomorph(g1, g2) && return Channel(_ -> nothing, ctype = T)  # TODO: fix problem with JuliaFormatter, right now the whole file is ignored
+    !could_have_isomorph(g1, g2) && return Channel(_ -> nothing, ctype = T)
     make_callback(c) = vmap -> (put!(c, collect(zip(vmap, 1:length(vmap)))), return true)
     ch::Channel{T} = Channel(; ctype=T) do c
         vf2(

src/Parallel/centrality/stress.jl

@@ -52,7 +52,9 @@ function threaded_stress_centrality(g::AbstractGraph, vs=vertices(g))::Vector{In
     @sync for (t, task_range) in enumerate(Iterators.partition(1:k, task_size))
         Threads.@spawn for s in @view(vs[task_range])
             if degree(g, s) > 0  # this might be 1?
-                state = Graphs.dijkstra_shortest_paths(g, s; allpaths=true, trackvertices=true)
+                state = Graphs.dijkstra_shortest_paths(
+                    g, s; allpaths=true, trackvertices=true
+                )
                 Graphs._stress_accumulate_basic!(local_stress[t], state, g, s)
             end
         end

src/SimpleGraphs/generators/randgraphs.jl

@@ -443,7 +443,9 @@ function newman_watts_strogatz(
     rng::Union{Nothing,AbstractRNG}=nothing,
     seed::Union{Nothing,Integer}=nothing,
 )
-    return watts_strogatz(n, k, β; is_directed=is_directed, remove_edges=false, rng=rng, seed=seed)
+    return watts_strogatz(
+        n, k, β; is_directed=is_directed, remove_edges=false, rng=rng, seed=seed
+    )
 end
 
 function _suitable(edges::Set{SimpleEdge{T}}, potential_edges::Dict{T,T}) where {T<:Integer}

src/SimpleGraphs/simpleedge.jl

@@ -34,4 +34,6 @@ function ==(e1::AbstractSimpleEdge, e2::AbstractSimpleEdge)
     return (src(e1) == src(e2) && dst(e1) == dst(e2))
 end
 hash(e::AbstractSimpleEdge, h::UInt) = hash(src(e), hash(dst(e), h))
-isless(e1::AbstractSimpleEdge, e2::AbstractSimpleEdge) = (src(e1) < src(e2)) || ((src(e1) == src(e2)) && (dst(e1) < dst(e2)))
+function isless(e1::AbstractSimpleEdge, e2::AbstractSimpleEdge)
+    return (src(e1) < src(e2)) || ((src(e1) == src(e2)) && (dst(e1) < dst(e2)))
+end

src/centrality/stress.jl

@@ -51,7 +51,9 @@ function stress_centrality(
     rng::Union{Nothing,AbstractRNG}=nothing,
     seed::Union{Nothing,Integer}=nothing,
 )
-    return stress_centrality(g, sample(collect_if_not_vector(vertices(g)), k; rng=rng, seed=seed))
+    return stress_centrality(
+        g, sample(collect_if_not_vector(vertices(g)), k; rng=rng, seed=seed)
+    )
 end
 
 function _stress_accumulate_basic!(

src/core.jl

@@ -136,7 +136,6 @@ end
 
 degree(g::AbstractGraph, vs=vertices(g)) = [degree(g, x) for x in vs]
 
-
 """
     Δout(g)
 

src/graphcut/normalized_cut.jl

@@ -118,7 +118,7 @@ end
 function _recursive_normalized_cut(W, thres, num_cuts)
     m, n = size(W)
     (m <= 1) && return ones(Int, m) # trivial
-    D = Diagonal(vec(sum(W, dims=2)))
+    D = Diagonal(vec(sum(W; dims=2)))
 
     # check that the diagonal is not degenerated as otherwise invDroot errors
     dnz = abs.(diag(D)) .>= 1E-16
@@ -137,7 +137,7 @@ function _recursive_normalized_cut(W, thres, num_cuts)
     # At least some versions of ARPACK have a bug, this is a workaround
     invDroot = sqrt.(inv(D)) # equal to Cholesky factorization for diagonal D
     if n > 12
-        _, Q = eigs(invDroot' * (D - W) * invDroot, nev=12, which=SR())
+        _, Q = eigs(invDroot' * (D - W) * invDroot; nev=12, which=SR())
         (size(Q, 2) <= 1) && return collect(1:m) # no 2nd eigenvector
         ret = convert(Vector, real(view(Q, :, 2)))
     else
@@ -149,7 +149,7 @@ function _recursive_normalized_cut(W, thres, num_cuts)
     min_cost = Inf
     best_thres = -1
     vmin, vmax = extrema(v)
-    for t in range(vmin, stop=vmax, length=num_cuts)
+    for t in range(vmin; stop=vmax, length=num_cuts)
         cut = v .> t
         cost = _normalized_cut_cost(cut, W, D)
         if cost < min_cost

src/linalg/LinAlg.jl

@@ -52,7 +52,7 @@ function eigs(A; kwargs...)
     vals, vectors = partialeigen(schr[1])
     reved = (kwargs[:which] == LR() || kwargs[:which] == LM())
     k = min(get(kwargs, :nev, length(vals))::Int, length(vals))
-    perm = sortperm(vals, by=real, rev=reved)[1:k]
+    perm = sortperm(vals; by=real, rev=reved)[1:k]
     λ = vals[perm]
     Q = vectors[:, perm]
     return λ, Q

src/traversals/dfs.jl

@@ -53,7 +53,7 @@ end
                 end
             else
                 pop!(vertex_stack)
-                if vcolor[u] == 1 
+                if vcolor[u] == 1
                     vcolor[u] = 2
                 end
             end
@@ -107,10 +107,10 @@ function topological_sort_by_dfs end
                         push!(vertex_stack, n)
                     end
                 end
-                else
+            else
                 pop!(vertex_stack)
                 # if vcolor[u] == 2, the vertex was already explored and added to verts
-                if vcolor[u] == 1 
+                if vcolor[u] == 1
                     vcolor[u] = 2
                     pushfirst!(verts, u)
                 end