adapt new add_spider! interface

Author: ChenZhao44

src/ZX/algorithms/circuit_extraction.jl

@@ -30,7 +30,7 @@ function ancilla_extraction(zxg::Union{ZXGraph, ZXCircuit})
         v = ins[i]
         @inbounds u = neighbors(nzxg, v)[1]
         if !is_hadamard(nzxg, u, v)
-            insert_spider!(nzxg, u, v, SpiderType.Z)
+            insert_spider!(nzxg, u, v, SpiderType.Z, zero(phase(nzxg, v)), [EdgeType.SIM, EdgeType.SIM])
         end
     end
 
@@ -212,7 +212,7 @@ function circuit_extraction(zxg::Union{ZXGraph{T, P}, ZXCircuit{T, P}}) where {T
     for v1 in Ins
         @inbounds v2 = neighbors(nzxg, v1)[1]
         if !is_hadamard(nzxg, v1, v2)
-            insert_spider!(nzxg, v1, v2, SpiderType.Z)
+            insert_spider!(nzxg, v1, v2, SpiderType.Z, zero(phase(nzxg, v2)), [EdgeType.SIM, EdgeType.SIM])
         end
     end
     @inbounds frontier = [neighbors(nzxg, v)[1] for v in Outs]

src/ZX/implementations/zx_circuit/circuit_interface.jl

@@ -15,9 +15,7 @@ function _push_single_qubit_gate!(circ::ZXCircuit{T, P}, loc::T;
     @assert spider_type(circ, out_id) === SpiderType.Out "Output spider at location $loc is not of type Out."
     @inbounds bound_id = neighbors(circ, out_id)[1]
     et = edge_type(circ, bound_id, out_id)
-    v = insert_spider!(circ, bound_id, out_id, stype, phase)
-    set_edge_type!(circ, v, bound_id, et)
-    set_edge_type!(circ, v, out_id, EdgeType.SIM)
+    v = insert_spider!(circ, bound_id, out_id, stype, phase, [et, EdgeType.SIM])
     return v
 end
 
@@ -27,9 +25,7 @@ function _push_first_single_qubit_gate!(circ::ZXCircuit{T, P}, loc::T;
     @assert spider_type(circ, in_id) === SpiderType.In "Input spider at location $loc is not of type In."
     @inbounds bound_id = neighbors(circ, in_id)[1]
     et = edge_type(circ, in_id, bound_id)
-    v = insert_spider!(circ, in_id, bound_id, stype, phase)
-    set_edge_type!(circ, bound_id, v, et)
-    set_edge_type!(circ, v, in_id, EdgeType.SIM)
+    v = insert_spider!(circ, in_id, bound_id, stype, phase, [EdgeType.SIM, et])
     return v
 end
 

src/ZX/rules/hedge.jl

@@ -19,8 +19,6 @@ end
 function rewrite!(::HEdgeRule, zxg::ZXGraph{T, P}, vs::Vector{T}) where {T, P}
     @inbounds v1, v2 = vs
     rem_edge!(zxg, v1, v2)
-    u = add_spider!(zxg, SpiderType.H, zero(P), [v1, v2])
-    set_edge_type!(zxg, v1, u, EdgeType.SIM)
-    set_edge_type!(zxg, u, v2, EdgeType.SIM)
+    add_spider!(zxg, SpiderType.H, zero(P), [v1, v2], [EdgeType.SIM, EdgeType.SIM])
     return zxg
 end

src/ZX/rules/pivot_boundary.jl

@@ -43,9 +43,8 @@ end
 function rewrite!(::PivotBoundaryRule, zxg::ZXGraph{T, P}, vs::Vector{T}) where {T, P}
     u, v, b = vs
     et = edge_type(zxg, v, b)
-    new_v = insert_spider!(zxg, v, b)[1]
-    w = insert_spider!(zxg, v, new_v)
-    set_edge_type!(zxg, b, new_v, et)
+    new_v = insert_spider!(zxg, v, b, SpiderType.Z, zero(P), [EdgeType.SIM, et])
+    w = insert_spider!(zxg, v, new_v, SpiderType.Z, zero(P), [EdgeType.HAD, EdgeType.HAD])
     set_phase!(zxg, new_v, phase(zxg, v))
     set_phase!(zxg, v, zero(P))
     rewrite!(Pivot1Rule(), zxg, Match{T}([min(u, v), max(u, v)]))
@@ -61,15 +60,14 @@ function rewrite!(::PivotBoundaryRule, circ::ZXCircuit{T, P}, vs::Vector{T}) whe
         v_master = neighbors(circ.master, v_bound_master)[1]
         # TODO: add edge type here for simple edges
         if is_hadamard(circ, new_v, b)
-            w_master = insert_spider!(circ.master, v_bound_master, v_master, SpiderType.Z)[1]
+            w_master = insert_spider!(circ.master, v_bound_master, v_master, SpiderType.Z, zero(P),
+                [EdgeType.HAD, EdgeType.HAD])
         else
             # TODO: add edge type here for simple edges
-            w_master = insert_spider!(circ.master, v_bound_master, v_master, SpiderType.X)[1]
+            w_master = insert_spider!(circ.master, v_bound_master, v_master, SpiderType.X, zero(P),
+                [EdgeType.SIM, EdgeType.SIM])
         end
         circ.phase_ids[w] = (w_master, 1)
-    end
-
-    if !isnothing(circ.master)
         circ.phase_ids[new_v] = circ.phase_ids[v]
         delete!(circ.phase_ids, v)
     end