Merge pull request #78 from stevengj/patch-1

make default spring_layout deterministic

Author: simonschoelly

src/layout.jl

@@ -91,13 +91,16 @@ Number of iterations we apply the forces
 *INITTEMP*
 Initial "temperature", controls movement per iteration
 
+*seed*
+Integer seed for pseudorandom generation of locations (default = 0).
+
 **Examples**
 ```
 julia> g = graphfamous("karate")
 julia> locs_x, locs_y = spring_layout(g)
 ```
 """
-function spring_layout(g::AbstractGraph{T}, locs_x=2*rand(nv(g)).-1.0, locs_y=2*rand(nv(g)).-1.0; C=2.0, MAXITER=100, INITTEMP=2.0) where {T<:Integer}
+function spring_layout(g::AbstractGraph{T}, locs_x, locs_y; C=2.0, MAXITER=100, INITTEMP=2.0) where {T<:Integer}
 
     #size(adj_matrix, 1) != size(adj_matrix, 2) && error("Adj. matrix must be square.")
     N = nv(g)
@@ -165,6 +168,12 @@ function spring_layout(g::AbstractGraph{T}, locs_x=2*rand(nv(g)).-1.0, locs_y=2*
     return locs_x,locs_y
 end
 
+using Random: MersenneTwister
+function spring_layout(g::AbstractGraph; seed::Integer=0, kws...)
+    rng = MersenneTwister(seed)
+    spring_layout(g, 2 .* rand(rng, nv(g)) .- 1.0, 2 .* rand(rng,nv(g)) .- 1.0; kws...)
+end
+
 """
 This function is copy from [IainNZ](https://github.com/IainNZ)'s [GraphLayout.jl](https://github.com/IainNZ/GraphLayout.jl)
 

test/runtests.jl

@@ -35,10 +35,11 @@ karate_edges = Edge.([
 g = SimpleGraph(karate_edges)
 h = LightGraphs.WheelGraph(10)
 
+test_layout(g::AbstractGraph; kws...) = spring_layout(g; seed=2017, kws...)
+
 # plot and save function for visual regression tests
 function plot_and_save(fname, g; gplot_kwargs...)
-    Random.seed!(2017)
-    draw(PNG(fname, 8inch, 8inch), gplot(g; gplot_kwargs...))
+    draw(PNG(fname, 8inch, 8inch), gplot(g; layout=test_layout, gplot_kwargs...))
 end
 
 @testset "Karate Net" begin