change storage to Dict

Project.toml

@@ -5,8 +5,9 @@ version = "0.1.0"
 
 [deps]
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
-Multigraphs = "7ebac608-6c66-46e6-9856-b5f43e107bac"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
 julia = "1.2"

script/zx_plot.jl

@@ -1,20 +1,20 @@
 using ZX
-using Multigraphs
 using LightGraphs
 using GraphPlot: gplot
 using Colors
 
 function Multigraph2Graph(mg::Multigraph)
     g = SimpleGraph(nv(mg))
+    vs = vertices(mg)
     for me in edges(mg)
-        add_edge!(g, src(me), dst(me))
+        add_edge!(g, searchsortedfirst(vs, src(me)), searchsortedfirst(vs, dst(me)))
     end
     # multiplicities = ["$(mul(mg, src(e), dst(e)))" for e in edges(g)]
-    multiplicities = ["$(mg.adjmx[src(e), dst(e)])" for e in edges(g)]
+    multiplicities = ["$(mul(mg, vs[src(e)], vs[dst(e)]))" for e in edges(g)]
     return g, multiplicities
 end
 
-ZX2Graph(zxd::ZXDiagram) = Multigraph2Graph(zxd.g)
+ZX2Graph(zxd::ZXDiagram) = Multigraph2Graph(zxd.mg)
 
 function st2color(S::SType)
     S == Z && return colorant"green"
@@ -24,11 +24,11 @@ function st2color(S::SType)
     S == Out && return colorant"gray"
 end
 
-ZX2nodefillc(zxd::ZXDiagram) = [st2color(zxd.st[v]) for v = 1:nv(zxd)]
+ZX2nodefillc(zxd::ZXDiagram) = [st2color(zxd.st[v]) for v in vertices(zxd.mg)]
 
 function ZX2nodelabel(zxd::ZXDiagram)
     nodelabel = String[]
-    for v = 1:nv(zxd)
+    for v in vertices(zxd.mg)
         zxd.st[v] == Z && push!(nodelabel, "$(zxd.ps[v]) π")
         zxd.st[v] == X && push!(nodelabel, "$(zxd.ps[v]) π")
         zxd.st[v] == H && push!(nodelabel, "H")
@@ -45,15 +45,3 @@ function ZXplot(zxd::ZXDiagram)
     edgelabelc = colorant"black"
     gplot(g, nodelabel = nodelabel, edgelabel = edgelabel, edgelabelc = edgelabelc, nodefillc = nodefillc)
 end
-
-g = Multigraph(6)
-for e in [[1,3],[2,3],[3,4],[4,5],[4,6]]
-    add_edge!(g, e)
-end
-ps = [0, 0, 0//1, 0//1, 0, 0]
-v_t = [In, Out, X, Z, Out, In]
-zxd = ZXDiagram(g, v_t, ps)
-ZXplot(zxd)
-
-rule_b!(zxd, 4, 3)
-ZXplot(zxd)

src/Multigraphs/multigraph_adjlist.jl

@@ -1,4 +1,4 @@
-using LightGraphs, SparseArrays
+using LightGraphs, SparseArrays, LinearAlgebra
 
 import Base: copy
 import LightGraphs: nv, has_edge, add_edge!, rem_edge!, rem_vertex!,

src/ZX.jl

@@ -1,7 +1,11 @@
 module ZX
 
+include("Multigraphs/multiple_edge.jl")
+include("Multigraphs/abstract_multigraph.jl")
+include("Multigraphs/multigraph_adjlist.jl")
+include("Multigraphs/multiple_edge_iter.jl")
 include("zx_diagram.jl")
-include("zx_graph.jl")
-include("rules.jl")
+# include("zx_graph.jl")
+# include("rules.jl")
 
 end # module