Add tests for entanglement_consumer

QuantumSavory · Sep 25, 2024 · 9e628a5 · 9e628a5
1 parent 66024d3
commit 9e628a5
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 4 deletions.
diff --git a/src/ProtocolZoo/ProtocolZoo.jl b/src/ProtocolZoo/ProtocolZoo.jl
@@ -210,7 +210,7 @@ end
         if isnothing(a_) || isnothing(b_)
             if isnothing(prot.retry_lock_time)
                 @debug "EntanglerProt between $(prot.nodeA) and $(prot.nodeB)|round $(round): Failed to find free slots. \nGot:\n1. \t $a_ \n2.\t $b_ \n waiting..."
-                @yield lock(prot.nodeA.tag_waiter) | lock(prot.nodeB.tag_waiter)
+                @yield lock(prot.net[prot.nodeA]tag_waiter) | lock(prot.net[prot.nodeB].tag_waiter)
             else
                 @debug "EntanglerProt between $(prot.nodeA) and $(prot.nodeB)|round $(round): Failed to find free slots. \nGot:\n1. \t $a_ \n2.\t $b_ \n retrying..."
                 @yield timeout(prot.sim, prot.retry_lock_time)
@@ -407,7 +407,7 @@ end
             @debug "EntanglementConsumer between $(prot.nodeA) and $(prot.nodeB): query on first node found no entanglement"
             if isnothing(prot.period)
                 @debug "Waiting on changes in $(prot.nodeA)"
-                @yield lock(prot.nodeA.tag_waiter)
+                @yield lock(prot.net[prot.nodeA].tag_waiter)
             else
                 @yield timeout(prot.sim, prot.period)
             end
@@ -418,7 +418,7 @@ end
                 @debug "EntanglementConsumer between $(prot.nodeA) and $(prot.nodeB): query on second node found no entanglement (yet...)"
                 if isnothing(prot.period)
                     @debug "Waiting on changes in $(prot.nodeB)"
-                    @yield lock(prot.nodeB.tag_waiter)
+                    @yield lock(prot.net[prot.nodeB].tag_waiter)
                 else
                     @yield timeout(prot.sim, prot.period)
                 end
@@ -442,7 +442,10 @@ end
         push!(prot.log, (now(prot.sim), ob1, ob2))
         unlock(q1)
         unlock(q2)
-        @yield timeout(prot.sim, prot.period)
+        @yield timeout(prot.sim, 0.1)
+        if !isnothing(prot.period)
+            @yield timeout(prot.sim, prot.period)
+        end
     end
 end
 

diff --git a/test/test_protocolzoo_entanglement_consumer.jl b/test/test_protocolzoo_entanglement_consumer.jl
@@ -2,6 +2,7 @@ using QuantumSavory
 using QuantumSavory.ProtocolZoo: EntanglerProt, SwapperProt, EntanglementTracker, EntanglementConsumer
 using Graphs
 using ConcurrentSim
+using ResumableFunctions
 using Test
 
 if isinteractive()
@@ -44,3 +45,50 @@ for n in 3:30
     end
 
 end
+
+# test for period=nothing
+for n in 3:30
+    println(n)
+    regsize = 10
+    net = RegisterNet([Register(regsize) for j in 1:n])
+    sim = get_time_tracker(net)
+
+    @resumable function delayedProts(sim)
+        @yield timeout(sim, 10)
+        for e in edges(net)
+            eprot = EntanglerProt(sim, net, e.src, e.dst; rounds=-1, randomize=true, margin=5, hardmargin=3)
+            @process eprot()
+        end
+
+        for v in 2:n-1
+            sprot = SwapperProt(sim, net, v; nodeL = <(v), nodeH = >(v), chooseL = argmin, chooseH = argmax, rounds = -1)
+            @process sprot()
+        end
+
+        for v in vertices(net)
+            etracker = EntanglementTracker(sim, net, v)
+            @process etracker()
+        end
+    end
+    econ = EntanglementConsumer(sim, net, 1, n; period=nothing)
+    @process econ()
+    @process delayedProts(sim)
+
+    run(sim, 1000) 
+
+    @test econ.log[1][1] > 10 #the process should start after 10
+    for i in 1:length(econ.log)
+        @test econ.log[i][2] ≈ 1.0
+        @test econ.log[i][3] ≈ 1.0
+    end
+
+end
+
+
+
+
+@test econ.log[1][1] > 10 #the process should start after 10
+for i in 1:length(econ.log)
+    @test econ.log[i][2] ≈ 1.0
+    @test econ.log[i][3] ≈ 1.0
+end