Skip to content

Commit 5d49931

Browse files
Roger-luoRoger-luo
authored
LightGraphs -> Graphs (#89)
1 parent bc367c1 commit 5d49931

9 files changed

Lines changed: 54 additions & 54 deletions

‎Project.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name = "ZXCalculus"
22
uuid = "3525faa3-032d-4235-a8d4-8c2939a218dd"
33
authors = ["Chen Zhao and contributors"]
4-
version = "0.4.4"
4+
version = "0.5.0"
55

66
[deps]
7-
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
7+
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
88
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
99
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
1010
Multigraphs = "7ebac608-6c66-46e6-9856-b5f43e107bac"
@@ -14,9 +14,9 @@ YaoLocations = "66df03fb-d475-48f7-b449-3d9064bf085b"
1414

1515
[compat]
1616
CompilerPluginTools = "0.1"
17-
LightGraphs = "1.3"
1817
MLStyle = "0.4"
19-
Multigraphs = "0.2, 0.3"
18+
Graphs = "1"
19+
Multigraphs = "0.3"
2020
YaoHIR = "0.2"
2121
YaoLocations = "0.1"
2222
julia = "1"

‎src/ZXCalculus.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ using YaoHIR.IntrinsicOperation
55
using YaoHIR: Chain
66
using YaoLocations: plain
77
using MLStyle
8-
using LightGraphs, Multigraphs
8+
using Graphs, Multigraphs
99

10-
using LightGraphs: nv, ne, outneighbors, inneighbors, neighbors, rem_edge!,
10+
using Graphs: nv, ne, outneighbors, inneighbors, neighbors, rem_edge!,
1111
add_edge!, has_edge, degree, indegree, outdegree
1212

1313
export SpiderType, EdgeType

‎src/abstract_zx_diagram.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
abstract type AbstractZXDiagram{T, P} end
22

3-
LightGraphs.nv(zxd::AbstractZXDiagram) = throw(MethodError(LightGraphs.nv, zxd))
4-
LightGraphs.ne(zxd::AbstractZXDiagram) = throw(MethodError(LightGraphs.ne, zxd))
5-
LightGraphs.degree(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.degree, (zxd, v)))
6-
LightGraphs.indegree(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.indegree, (zxd, v)))
7-
LightGraphs.outdegree(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.outdegree, (zxd, v)))
8-
LightGraphs.neighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.neighbors, (zxd, v)))
9-
LightGraphs.outneighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.outneighbors, (zxd, v)))
10-
LightGraphs.inneighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(LightGraphs.inneighbors, (zxd, v)))
11-
LightGraphs.rem_edge!(zxd::AbstractZXDiagram, args...) = throw(MethodError(LightGraphs.rem_edge!, (zxd, args...)))
12-
LightGraphs.add_edge!(zxd::AbstractZXDiagram, args...) = throw(MethodError(LightGraphs.add_edge!, (zxd, args...)))
13-
LightGraphs.has_edge(zxd::AbstractZXDiagram, args...) = throw(MethodError(LightGraphs.has_edge, (zxd, args...)))
3+
Graphs.nv(zxd::AbstractZXDiagram) = throw(MethodError(Graphs.nv, zxd))
4+
Graphs.ne(zxd::AbstractZXDiagram) = throw(MethodError(Graphs.ne, zxd))
5+
Graphs.degree(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.degree, (zxd, v)))
6+
Graphs.indegree(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.indegree, (zxd, v)))
7+
Graphs.outdegree(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.outdegree, (zxd, v)))
8+
Graphs.neighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.neighbors, (zxd, v)))
9+
Graphs.outneighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.outneighbors, (zxd, v)))
10+
Graphs.inneighbors(zxd::AbstractZXDiagram, v) = throw(MethodError(Graphs.inneighbors, (zxd, v)))
11+
Graphs.rem_edge!(zxd::AbstractZXDiagram, args...) = throw(MethodError(Graphs.rem_edge!, (zxd, args...)))
12+
Graphs.add_edge!(zxd::AbstractZXDiagram, args...) = throw(MethodError(Graphs.add_edge!, (zxd, args...)))
13+
Graphs.has_edge(zxd::AbstractZXDiagram, args...) = throw(MethodError(Graphs.has_edge, (zxd, args...)))
1414

1515
Base.show(io::IO, zxd::AbstractZXDiagram) = throw(MethodError(Base.show, io, zxd))
1616
Base.copy(zxd::AbstractZXDiagram) = throw(MethodError(Base.copy, zxd))

‎src/zx_diagram.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end
7070
Construct a ZXDiagram with all information.
7171
7272
```jldoctest
73-
julia> using LightGraphs, Multigraphs, ZXCalculus;
73+
julia> using Graphs, Multigraphs, ZXCalculus;
7474
7575
julia> using ZXCalculus.SpiderType: In, Out, H, Z, X;
7676
@@ -206,7 +206,7 @@ end
206206
207207
Returns the number of vertices (spiders) of a ZX-diagram.
208208
"""
209-
LightGraphs.nv(zxd::ZXDiagram) = nv(zxd.mg)
209+
Graphs.nv(zxd::ZXDiagram) = nv(zxd.mg)
210210

211211
"""
212212
ne(zxd; count_mul = false)
@@ -215,26 +215,26 @@ Returns the number of edges of a ZX-diagram. If `count_mul`, it will return the
215215
sum of multiplicities of all multiple edges. Otherwise, it will return the
216216
number of multiple edges.
217217
"""
218-
LightGraphs.ne(zxd::ZXDiagram; count_mul::Bool = false) = ne(zxd.mg, count_mul = count_mul)
218+
Graphs.ne(zxd::ZXDiagram; count_mul::Bool = false) = ne(zxd.mg, count_mul = count_mul)
219219

220-
LightGraphs.outneighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = outneighbors(zxd.mg, v, count_mul = count_mul)
221-
LightGraphs.inneighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = inneighbors(zxd.mg, v, count_mul = count_mul)
220+
Graphs.outneighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = outneighbors(zxd.mg, v, count_mul = count_mul)
221+
Graphs.inneighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = inneighbors(zxd.mg, v, count_mul = count_mul)
222222

223-
LightGraphs.degree(zxd::ZXDiagram, v::Integer) = degree(zxd.mg, v)
224-
LightGraphs.indegree(zxd::ZXDiagram, v::Integer) = degree(zxd, v)
225-
LightGraphs.outdegree(zxd::ZXDiagram, v::Integer) = degree(zxd, v)
223+
Graphs.degree(zxd::ZXDiagram, v::Integer) = degree(zxd.mg, v)
224+
Graphs.indegree(zxd::ZXDiagram, v::Integer) = degree(zxd, v)
225+
Graphs.outdegree(zxd::ZXDiagram, v::Integer) = degree(zxd, v)
226226

227227
"""
228228
neighbors(zxd, v; count_mul = false)
229229
230230
Returns a vector of vertices connected to `v`. If `count_mul`, there will be
231231
multiple copy for each vertex. Otherwise, each vertex will only appear once.
232232
"""
233-
LightGraphs.neighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = neighbors(zxd.mg, v, count_mul = count_mul)
234-
function LightGraphs.rem_edge!(zxd::ZXDiagram, x...)
233+
Graphs.neighbors(zxd::ZXDiagram, v; count_mul::Bool = false) = neighbors(zxd.mg, v, count_mul = count_mul)
234+
function Graphs.rem_edge!(zxd::ZXDiagram, x...)
235235
rem_edge!(zxd.mg, x...)
236236
end
237-
function LightGraphs.add_edge!(zxd::ZXDiagram, x...)
237+
function Graphs.add_edge!(zxd::ZXDiagram, x...)
238238
add_edge!(zxd.mg, x...)
239239
end
240240

‎src/zx_graph.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,24 @@ function ZXGraph(zxd::ZXDiagram{T, P}) where {T, P}
100100
return zxg
101101
end
102102

103-
LightGraphs.has_edge(zxg::ZXGraph, vs...) = has_edge(zxg.mg, vs...)
104-
LightGraphs.nv(zxg::ZXGraph) = nv(zxg.mg)
105-
LightGraphs.ne(zxg::ZXGraph) = ne(zxg.mg)
106-
LightGraphs.outneighbors(zxg::ZXGraph, v::Integer) = outneighbors(zxg.mg, v)
107-
LightGraphs.inneighbors(zxg::ZXGraph, v::Integer) = inneighbors(zxg.mg, v)
108-
LightGraphs.neighbors(zxg::ZXGraph, v::Integer) = neighbors(zxg.mg, v)
109-
LightGraphs.degree(zxg::ZXGraph, v::Integer) = degree(zxg.mg, v)
110-
LightGraphs.indegree(zxg::ZXGraph, v::Integer) = degree(zxg, v)
111-
LightGraphs.outdegree(zxg::ZXGraph, v::Integer) = degree(zxg, v)
112-
function LightGraphs.rem_edge!(zxg::ZXGraph, v1::Integer, v2::Integer)
103+
Graphs.has_edge(zxg::ZXGraph, vs...) = has_edge(zxg.mg, vs...)
104+
Graphs.nv(zxg::ZXGraph) = nv(zxg.mg)
105+
Graphs.ne(zxg::ZXGraph) = ne(zxg.mg)
106+
Graphs.outneighbors(zxg::ZXGraph, v::Integer) = outneighbors(zxg.mg, v)
107+
Graphs.inneighbors(zxg::ZXGraph, v::Integer) = inneighbors(zxg.mg, v)
108+
Graphs.neighbors(zxg::ZXGraph, v::Integer) = neighbors(zxg.mg, v)
109+
Graphs.degree(zxg::ZXGraph, v::Integer) = degree(zxg.mg, v)
110+
Graphs.indegree(zxg::ZXGraph, v::Integer) = degree(zxg, v)
111+
Graphs.outdegree(zxg::ZXGraph, v::Integer) = degree(zxg, v)
112+
function Graphs.rem_edge!(zxg::ZXGraph, v1::Integer, v2::Integer)
113113
if rem_edge!(zxg.mg, v1, v2)
114114
delete!(zxg.et, (min(v1, v2), max(v1, v2)))
115115
return true
116116
end
117117
return false
118118
end
119119

120-
function LightGraphs.add_edge!(zxg::ZXGraph, v1::Integer, v2::Integer, edge_type::EdgeType.EType = EdgeType.HAD)
120+
function Graphs.add_edge!(zxg::ZXGraph, v1::Integer, v2::Integer, edge_type::EdgeType.EType = EdgeType.HAD)
121121
if has_vertex(zxg.mg, v1) && has_vertex(zxg.mg, v2)
122122
if v1 == v2
123123
if edge_type == EdgeType.HAD

‎src/zx_layout.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ZXLayout(nbits::Integer, spider_q::Dict{T, Rational{Int}}, spider_col::Dict{T, R
1313
ZXLayout{T}() where {T} = ZXLayout(0, Dict{T, Rational{Int}}(), Dict{T, Rational{Int}}())
1414

1515
Base.copy(layout::ZXLayout) = ZXLayout(layout.nbits, copy(layout.spider_q), copy(layout.spider_col))
16-
function LightGraphs.rem_vertex!(layout::ZXLayout{T}, v::T) where {T}
16+
function Graphs.rem_vertex!(layout::ZXLayout{T}, v::T) where {T}
1717
delete!(layout.spider_q, v)
1818
delete!(layout.spider_col, v)
1919
return

‎test/abstract_zx_diagram.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
using ZXCalculus, LightGraphs
1+
using ZXCalculus, Graphs
22
using Test
33
using ZXCalculus: Phase
44

55
struct TestZXDiagram{T, P} <: AbstractZXDiagram{T, P} end
66

77
test_zxd = TestZXDiagram{Int, Phase}();
88

9-
@test_throws MethodError LightGraphs.nv(test_zxd)
10-
@test_throws MethodError LightGraphs.ne(test_zxd)
11-
@test_throws MethodError LightGraphs.degree(test_zxd, 1)
12-
@test_throws MethodError LightGraphs.indegree(test_zxd, 1)
13-
@test_throws MethodError LightGraphs.outdegree(test_zxd, 1)
14-
@test_throws MethodError LightGraphs.neighbors(test_zxd, 1)
15-
@test_throws MethodError LightGraphs.outneighbors(test_zxd, 1)
16-
@test_throws MethodError LightGraphs.inneighbors(test_zxd, 1)
17-
@test_throws MethodError LightGraphs.rem_edge!(test_zxd, 1, 2)
18-
@test_throws MethodError LightGraphs.add_edge!(test_zxd, 1, 2, 1)
19-
@test_throws MethodError LightGraphs.has_edge(test_zxd, 1, 2)
9+
@test_throws MethodError Graphs.nv(test_zxd)
10+
@test_throws MethodError Graphs.ne(test_zxd)
11+
@test_throws MethodError Graphs.degree(test_zxd, 1)
12+
@test_throws MethodError Graphs.indegree(test_zxd, 1)
13+
@test_throws MethodError Graphs.outdegree(test_zxd, 1)
14+
@test_throws MethodError Graphs.neighbors(test_zxd, 1)
15+
@test_throws MethodError Graphs.outneighbors(test_zxd, 1)
16+
@test_throws MethodError Graphs.inneighbors(test_zxd, 1)
17+
@test_throws MethodError Graphs.rem_edge!(test_zxd, 1, 2)
18+
@test_throws MethodError Graphs.add_edge!(test_zxd, 1, 2, 1)
19+
@test_throws MethodError Graphs.has_edge(test_zxd, 1, 2)
2020

2121
@test_throws MethodError print(test_zxd)
2222
@test_throws MethodError Base.copy(test_zxd)

‎test/phase_teleportation.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ZXCalculus, LightGraphs
1+
using ZXCalculus, Graphs
22

33
function gen_cir()
44
cir = ZXDiagram(5)

‎test/runtests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ZXCalculus, LightGraphs, Multigraphs, SparseArrays
1+
using ZXCalculus, Graphs, Multigraphs, SparseArrays
22
using Documenter
33
using Test
44

0 commit comments

Comments
 (0)