Merge branch 'master' of git://github.com/JuliaGraphs/GraphPlot.jl into fruchterman_reingold

Author: simonschoelly

.gitignore

@@ -1,3 +1,4 @@
 *.jl.cov
 *.jl.mem
 *.svg
+Manifest.toml

.travis.yml

@@ -14,9 +14,7 @@ matrix:
 notifications:
   email: false
 # uncomment the following lines to override the default test script
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("GraphPlot"); Pkg.test("GraphPlot"; coverage=true)'
+
 after_success:
   # push coverage results to Codecov
   - julia -e 'using Pkg; cd(Pkg.dir("GraphPlot")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

Project.toml

@@ -0,0 +1,29 @@
+name = "GraphPlot"
+uuid = "a2cc645c-3eea-5389-862e-a155d0052231"
+authors = ["JuliaGraphs"]
+version = "0.4.0"
+
+[deps]
+ArnoldiMethod = "ec485272-7323-5ecc-a04f-4719b315124d"
+ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
+Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
+DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[extras]
+Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
+ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
+
+[targets]
+test = ["Test", "Cairo", "ImageMagick", "VisualRegressionTests"]
+
+[compat]
+"Compose" = "0.7"
+"LightGraphs" = "1.1"
+"VisualRegressionTests" = "0.2"

src/layout.jl

@@ -92,6 +92,9 @@ 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 = smallgraph(:karate)
@@ -169,6 +172,12 @@ function spring_layout(g::AbstractGraph,
     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)
 

src/plot.jl

@@ -11,9 +11,9 @@ a Compose tree of the graph layout
 Graph to draw
 
 `layout`
-Optional. Layout algorithm. Currently can be one of [random_layout,
-circular_layout, spring_layout, shell_layout, stressmajorize_layout,
-spectral_layout].
+Optional. Layout algorithm. Currently can be one of [`random_layout`,
+`circular_layout`, `spring_layout`, `shell_layout`, `stressmajorize_layout`,
+`spectral_layout`].
 Default: `spring_layout`
 
 `locs_x, locs_y`

test/runtests.jl

@@ -41,11 +41,11 @@ g = smallgraph(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