Merge pull request #18 from hexaeder/hw/LG_to_graphs

move from LightGraphs to Graphs
oxinabox · Oct 19, 2021 · 88117f5 · 88117f5 · oxinabox · Oct 19, 2021
2 parents 946c304 + 7c3bea2
commit 88117f5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,23 +1,23 @@
 name = "LayeredLayouts"
 uuid = "f4a74d36-062a-4d48-97cd-1356bad1de4e"
 authors = ["Lyndon White <lyndon.white@invenialabs.co.uk> and contributors"]
-version = "0.1.2"
+version = "0.2"
 
 [deps]
 Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199"
+Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
-LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
 Cbc = "0.7"
 ECOS = "0.12.1"
+Graphs = "1.4"
 IterTools = "1.3"
 JuMP = "0.21.3"
-LightGraphs = "1.3"
 julia = "1"
 
 [extras]

diff --git a/README.md b/README.md
@@ -11,10 +11,11 @@ Presently it has one algorithm:
 [D. C. Zarate, P. L. Bodic, T. Dwyer, G. Gange and P. Stuckey, "Optimal Sankey Diagrams Via Integer Programming," _2018 IEEE Pacific Visualization Symposium (PacificVis)_, Kobe, 2018, pp. 135-139, doi: 10.1109/PacificVis.2018.00025.](https://ialab.it.monash.edu/~dwyer/papers/optimal-sankey-diagrams.pdf).
 Which is a Sugiyama style layout algorthm via full mixed integer programming.
 
+Starting from v0.2 `LayeredLayouts.jl` switches from `LightGraphs.jl` to `Graphs.jl` for graph representation. See this [discourse post](https://discourse.julialang.org/t/lightgraphs-jl-transition/69526/17) for more information. If you want to use `LightGraphs.jl` please specifically `] add LayeredLayouts@0.1`
 
 ### Usage
 ```julia
-julia> using LayeredLayouts, LightGraphs
+julia> using LayeredLayouts, Graphs
 
 julia> tiny_depgraph = SimpleDiGraph(Edge.([
            1 => 2;
@@ -30,7 +31,7 @@ julia> xs, ys
 ([1.0, 2.0, 1.0, 3.0, 3.0, 3.0, 2.0, 2.0, 4.0, 4.0, 4.0], [-0.500000683006983, -0.9285709647225431, 0.500000681452564, 0.40476260792712027, -0.5952375840605986, -1.5952379163280372, 3.0714291353124143, 2.0714290900138614, 1.404762745121713, 0.4047626078228009, -0.5952375294761111])
 
 julia> paths
-Dict{LightGraphs.SimpleGraphs.SimpleEdge{Int64},Tuple{Array{Float64,1},Array{Float64,1}}} with 13 entries:
+Dict{Graphs.SimpleGraphs.SimpleEdge{Int64},Tuple{Array{Float64,1},Array{Float64,1}}} with 13 entries:
   Edge 2 => 5  => ([2.0, 3.0], [-0.928571, -0.595238])
   Edge 3 => 8  => ([1.0, 2.0], [0.500001, 2.07143])
   Edge 3 => 5  => ([1.0, 2.0, 3.0], [0.500001, 0.0714291, -0.595238])

diff --git a/src/LayeredLayouts.jl b/src/LayeredLayouts.jl
@@ -4,7 +4,7 @@ using JuMP
 using ECOS
 using Cbc
 using IterTools: IterTools
-using LightGraphs
+using Graphs
 using Random
 
 export LayeredMinDistOne, Zarate

diff --git a/src/zarate.jl b/src/zarate.jl
@@ -41,7 +41,7 @@ different nodes as x and y coordinates.
 
 # Example:
 ```julia
-using LightGraphs, Plots
+using Graphs, Plots
 
 g = random_orientation_dag(complete_graph(5))
 xs, ys, paths = solve_positions(Zarate(), g)

diff --git a/test/examples.jl b/test/examples.jl
@@ -1,5 +1,5 @@
 module Examples
-    using LightGraphs
+    using Graphs
     using SimpleWeightedGraphs
     medium_pert = SimpleDiGraph(Edge.([
         1 => 2

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,8 @@
+# set headless environment for plots
+ENV["GKSwstype"] = "100"
+
 using Plots
-using LightGraphs
+using Graphs
 using LayeredLayouts
 using Test
 using VisualRegressionTests