fix entanglement swapping error!!!

sfc-aqua · Jul 17, 2023 · 6d26c5b · 6d26c5b
1 parent 59728b9
commit 6d26c5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/quisp/modules/QRSA/RuleEngine/RuleEngine.cc b/quisp/modules/QRSA/RuleEngine/RuleEngine.cc
@@ -113,12 +113,13 @@ void RuleEngine::handleMessage(cMessage *msg) {
     }
   } else if (auto *notification_packet = dynamic_cast<EPPSTimingNotification *>(msg)) {
     auto partner_address = notification_packet->getOtherQnicParentAddr();
+    auto partner_qnic_index = notification_packet->getOtherQnicIndex();
     auto epps_address = notification_packet->getEPPSAddr();
     auto qnic_index = notification_packet->getQnicIndex();
     auto& msm_info = msm_info_map[qnic_index];
     msm_info.partner_address = partner_address;
     msm_info.epps_address = epps_address;
-    msm_info.interval = notification_packet->getInterval();
+    msm_info.partner_qnic_index = partner_qnic_index;
     stopOnGoingPhotonEmission(QNIC_RP, qnic_index);
     scheduleMSMPhotonEmission(QNIC_RP, qnic_index, notification_packet);
   } else if (auto *click_result = dynamic_cast<SingleClickResult *>(msg)) {
@@ -205,8 +206,7 @@ void RuleEngine::handleSingleClickResult(SingleClickResult *click_result) {
   auto interval = msm_info.interval;
   auto qubit_index = msm_info.qubit_info_map[msm_info.iteration_index];
   MSMResult *msm_result = new MSMResult();
-  // the qnic index we need here is the partner's one, isn't it? Might use MSM info map to store partner's qnic index and so on.
-  msm_result->setQnicIndex(qnic_index);
+  msm_result->setQnicIndex(msm_info.partner_qnic_index);
   msm_result->setQnicType(QNIC_RP);
   msm_result->setPhotonIndex(msm_info.photon_index_counter);
   msm_result->setSuccess(click_result->getClickResult().success);

diff --git a/quisp/modules/QRSA/RuleEngine/RuleEngine.h b/quisp/modules/QRSA/RuleEngine/RuleEngine.h
@@ -106,6 +106,7 @@ class RuleEngine : public IRuleEngine, public Logger::LoggerBase {
 
   struct MSMInfo {
     int partner_address;
+    int partner_qnic_index;
     int epps_address;
     unsigned long long photon_index_counter;
     int iteration_index;
@@ -119,6 +120,7 @@ class RuleEngine : public IRuleEngine, public Logger::LoggerBase {
   // [Key: qnic_index, Value: qubit_index]
   std::unordered_map<int, MSMInfo> msm_info_map;
 
+  int _num_bellpairs_generated;
 };
 
 Define_Module(RuleEngine);