sfc-aqua · Chibikuri · Jun 6, 2022 · Dec 28, 2021 · Dec 28, 2021 · Jan 3, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,9 @@
 [submodule "eigen"]
 	path = eigen
 	url = https://gitlab.com/libeigen/eigen.git
+[submodule "json"]
+	path = json
+	url = https://github.com/nlohmann/json.git
 [submodule "quispr"]
 	path = quispr
 	url = https://github.com/sfc-aqua/quispr
diff --git a/json b/json
diff --git a/quisp/makefrag b/quisp/makefrag
@@ -31,6 +31,9 @@ CXXFLAGS+=-ftest-coverage -fprofile-instr-generate -fcoverage-mapping
 LDFLAGS+=-ftest-coverage -fprofile-instr-generate -fcoverage-mapping
 endif
 
+# include path for json
+INCLUDE_PATH+=-I$(PROJ_ROOT)/json/include/
+
 default: eigen all
 
 format:

diff --git a/quisp/messages/QNode_ipc_messages.msg b/quisp/messages/QNode_ipc_messages.msg
@@ -38,13 +38,13 @@ packet InternalRuleSetForwarding extends Header{
     unsigned long RuleSet_id;
     unsigned long Rule_id;
 
-    RuleSet* ruleSet;
+    json RuleSet;
 }
 
 packet InternalRuleSetForwarding_Application extends Header{
     unsigned long RuleSet_id;
     unsigned long Rule_id;
     int application_type;
 
-    RuleSet* ruleSet;
+    json RuleSet;
 }
diff --git a/quisp/messages/base_messages.msg b/quisp/messages/base_messages.msg
@@ -1,9 +1,11 @@
 cplusplus  {{
     #include "base_messages_m.h"
     #include <modules/QNIC.h>
-    #include <rules/RuleSet.h>
-    using quisp::rules::RuleSet;
+    #include <rules/Active/ActiveRuleSet.h>
+    #include <nlohmann/json.hpp>
+    using quisp::rules::active::ActiveRuleSet;
     using quisp::modules::QNIC_pair_info;
+    using nlohmann::json;
 }}
 
 class QNIC_type {
@@ -16,11 +18,16 @@ class QNIC_pair_info {
     @opaque;
 };
 
-class RuleSet {
+class ActiveRuleSet {
     @existingClass;
     @opaque;
 };
 
+class json {
+    @existingClass;
+    @opaque;
+}
+
 namespace quisp::messages;
 
 packet Header

diff --git a/quisp/messages/connection_setup_messages.msg b/quisp/messages/connection_setup_messages.msg
@@ -26,7 +26,7 @@ packet ConnectionSetupResponse extends Header
     int actual_srcAddr;
     int actual_destAddr;
     unsigned long RuleSet_id;
-    RuleSet* ruleSet;
+    json ruleSet;
     int application_type;
     int stack_of_QNodeIndexes[];
 }
diff --git a/quisp/messages/entanglement_swapping_messages.msg b/quisp/messages/entanglement_swapping_messages.msg
@@ -4,7 +4,8 @@ namespace quisp::messages;
 
 packet SwappingResult extends Header{
     unsigned long RuleSet_id;
-    unsigned long Rule_id;
+    int Rule_id;
+    int shared_tag;
     int action_index;
 
     int left_Dest;
@@ -67,3 +68,8 @@ packet SimultaneousSwappingResult extends Header{
     int index_in_path;
     int path_length_exclude_IR;
 }
+
+packet WaitResult extends Header {
+    unsigned long RuleSet_id;
+    unsigned long Rule_id;
+}
diff --git a/quisp/messages/purification_messages.msg b/quisp/messages/purification_messages.msg
@@ -5,7 +5,8 @@ packet PurificationResult extends Header
 {
     bool Output_is_plus;
     unsigned long ruleset_id;
-    unsigned long rule_id;
+    int rule_id;
+    int shared_tag;
     int action_index;
     //For Debugging
     omnetpp::cModule* entangled_with;
@@ -16,7 +17,8 @@ packet DoublePurificationResult extends Header
     bool ZOutput_is_plus;
     bool XOutput_is_plus;
     unsigned long ruleset_id;
-    unsigned long rule_id;
+    int rule_id;
+    int shared_tag;
     int action_index;
      //For Debugging
     omnetpp::cModule* entangled_with;
@@ -29,7 +31,8 @@ packet DS_DoublePurificationResult extends Header
     bool DS_ZOutput_is_plus;
     bool DS_XOutput_is_plus;
     unsigned long ruleset_id;
-    unsigned long rule_id;
+    int rule_id;
+    int shared_tag;
     int action_index;
     //For Debugging
     omnetpp::cModule* entangled_with;
@@ -41,7 +44,8 @@ packet DS_DoublePurificationSecondResult extends Header
     bool XOutput_is_plus;
     bool DS_Output_is_plus;
     unsigned long ruleset_id;
-    unsigned long rule_id;
+    int rule_id;
+    int shared_tag;
     int action_index;
     //For Debugging
     omnetpp::cModule* entangled_with;

diff --git a/quisp/messages/tomography_messages.msg b/quisp/messages/tomography_messages.msg
@@ -6,7 +6,7 @@ packet LinkTomographyRuleSet extends Header
 {
     int process_id;
     int number_of_measuring_resources;
-    RuleSet* ruleSet;
+    ActiveRuleSet* activeRuleSet;
 }
 
 packet LinkTomographyRequest extends Header {}

diff --git a/quisp/modules/QNIC.h b/quisp/modules/QNIC.h
@@ -8,18 +8,26 @@
 #define QUISP_MODULES_QNIC_H_
 
 #include <omnetpp.h>
+#include <nlohmann/json.hpp>
 using namespace omnetpp;
 
 namespace quisp {
 namespace modules {
 
+using json = nlohmann::json;
 typedef enum : int {
   QNIC_E, /**< Emitter QNIC          */
   QNIC_R, /**< Receiver QNIC         */
   QNIC_RP, /**< Passive Receiver QNIC */
   QNIC_N, /** Just to make the size of the array = the number of qnics*/
 } QNIC_type;
 
+NLOHMANN_JSON_SERIALIZE_ENUM(QNIC_type, {
+                                            {QNIC_E, "QNIC_E"},
+                                            {QNIC_R, "QNIC_R"},
+                                            {QNIC_RP, "QNIC_RP"},
+                                        })
+
 static const char* QNIC_names[QNIC_N] = {
     "qnic",
     "qnic_r",

diff --git a/quisp/modules/QNIC/StationaryQubit/IStationaryQubit.h b/quisp/modules/QNIC/StationaryQubit/IStationaryQubit.h
@@ -169,7 +169,7 @@ class IStationaryQubit : public omnetpp::cSimpleModule {
 
   virtual void setFree(bool consumed) = 0;
   /*In use. E.g. waiting for purification result.*/
-  virtual void Lock(unsigned long rs_id, unsigned long rule_id, int action_id) = 0;
+  virtual void Lock(unsigned long rs_id, int rule_id, int action_id) = 0;
   virtual void Unlock() = 0;
   virtual bool isLocked() = 0;
 

diff --git a/quisp/modules/QNIC/StationaryQubit/StationaryQubit.cc b/quisp/modules/QNIC/StationaryQubit/StationaryQubit.cc
@@ -403,7 +403,7 @@ void StationaryQubit::setFree(bool consumed) {
 }
 
 /*To avoid disturbing this qubit.*/
-void StationaryQubit::Lock(unsigned long rs_id, unsigned long rule_id, int action_id) {
+void StationaryQubit::Lock(unsigned long rs_id, int rule_id, int action_id) {
   if (rs_id == -1 || rule_id == -1 || action_id == -1) {
     error("ruleset_id || rule_id || action_id == -1");
   }

diff --git a/quisp/modules/QNIC/StationaryQubit/StationaryQubit.h b/quisp/modules/QNIC/StationaryQubit/StationaryQubit.h
@@ -59,7 +59,7 @@ class StationaryQubit : public IStationaryQubit {
   StationaryQubit();
   void setFree(bool consumed) override;
   /*In use. E.g. waiting for purification result.*/
-  void Lock(unsigned long rs_id, unsigned long rule_id, int action_id) override;
+  void Lock(unsigned long rs_id, int rule_id, int action_id) override;
   void Unlock() override;
   bool isLocked() override;