add updates

sfc-aqua · Apr 30, 2024 · 4b41c22 · 4b41c22
1 parent dfe4625
commit 4b41c22
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 28 deletions.
diff --git a/quisp/1kmdist.pdf b/quisp/1kmdist.pdf
diff --git a/quisp/1kmdist.png b/quisp/1kmdist.png
diff --git a/quisp/1kmdist_comparetolink.pdf b/quisp/1kmdist_comparetolink.pdf
diff --git a/quisp/1kmdist_comparetolink_adaptive.pdf b/quisp/1kmdist_comparetolink_adaptive.pdf
diff --git a/quisp/1kmdist_comparetolink_adaptive.png b/quisp/1kmdist_comparetolink_adaptive.png
diff --git a/quisp/1kmdist_inserted_32mem.pdf b/quisp/1kmdist_inserted_32mem.pdf
diff --git a/quisp/1kmdist_inserted_32mem.png b/quisp/1kmdist_inserted_32mem.png
diff --git a/quisp/1kmdist_inserted_4mem.pdf b/quisp/1kmdist_inserted_4mem.pdf
diff --git a/quisp/1kmdist_inserted_4mem.png b/quisp/1kmdist_inserted_4mem.png
diff --git a/quisp/20kmdist.pdf b/quisp/20kmdist.pdf
diff --git a/quisp/20kmdist.png b/quisp/20kmdist.png
diff --git a/quisp/20kmdist_comparetolink.pdf b/quisp/20kmdist_comparetolink.pdf
diff --git a/quisp/20kmdist_comparetolink_adaptive.pdf b/quisp/20kmdist_comparetolink_adaptive.pdf
diff --git a/quisp/20kmdist_comparetolink_adaptive.png b/quisp/20kmdist_comparetolink_adaptive.png
diff --git a/quisp/20kmdist_inserted_32mem.pdf b/quisp/20kmdist_inserted_32mem.pdf
diff --git a/quisp/20kmdist_inserted_32mem.png b/quisp/20kmdist_inserted_32mem.png
diff --git a/quisp/20kmdist_inserted_4mem.pdf b/quisp/20kmdist_inserted_4mem.pdf
diff --git a/quisp/20kmdist_inserted_4mem.png b/quisp/20kmdist_inserted_4mem.png
diff --git a/quisp/hundredbellpair_log_long_adaptive_msm_comparision.pdf b/quisp/hundredbellpair_log_long_adaptive_msm_comparision.pdf
diff --git a/quisp/hundredbellpair_log_long_adaptive_msm_comparision.png b/quisp/hundredbellpair_log_long_adaptive_msm_comparision.png
diff --git a/quisp/hundredbellpair_log_short_adaptive_msm_comparision.pdf b/quisp/hundredbellpair_log_short_adaptive_msm_comparision.pdf
diff --git a/quisp/hundredbellpair_log_short_adaptive_msm_comparision.png b/quisp/hundredbellpair_log_short_adaptive_msm_comparision.png
diff --git a/quisp/hundredbpgentime_adaptive_nonadaptive_comparision.py b/quisp/hundredbpgentime_adaptive_nonadaptive_comparision.py
@@ -48,7 +48,7 @@
 
 xaxis = np.arange(len(x))
 plt.bar(xaxis-0.3, ymsm, label='MSM', log=True, width=0.3)
-plt.bar(xaxis, ymsma, label='Adaptive MSM', log=True, width=0.3)
+plt.bar(xaxis, ymsma, label='adaptive MSM', log=True, width=0.3)
 plt.bar(xaxis+0.3, ymim, label='MIM', log=True, width=0.3)
 plt.errorbar(xaxis-0.3, ymsm, yerr=emsm, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
 plt.errorbar(xaxis, ymsma, yerr=emsma, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
@@ -115,7 +115,7 @@
 xaxis = np.arange(len(x))
 plt.clf()
 plt.bar(xaxis-0.3, ymsm, label='MSM', log=True, width=0.3)
-plt.bar(xaxis, ymsma, label='Adaptive MSM', log=True, width=0.3)
+plt.bar(xaxis, ymsma, label='adaptive MSM', log=True, width=0.3)
 plt.bar(xaxis+0.3, ymim, label='MIM', log=True, width=0.3)
 plt.errorbar(xaxis-0.3, ymsm, yerr=emsm, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
 plt.errorbar(xaxis, ymsma, yerr=emsma, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')

diff --git a/quisp/hundredbptime.py b/quisp/hundredbptime.py
@@ -155,11 +155,11 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptive MSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
-        simulation = "MSM-adaptive"
+        simulation = "adaptive MSM"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.15)
     plt.errorbar(xaxis-0.3+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
     dist += 0.15
@@ -185,11 +185,11 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptive MSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
-        simulation = "MSM-adaptive"
+        simulation = "adaptive MSM"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.15)
     plt.errorbar(xaxis-0.3+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
     dist += 0.15

diff --git a/quisp/hundredbptime_compare.py b/quisp/hundredbptime_compare.py
@@ -135,7 +135,7 @@
             results[simulation][32] = [np.array(results[simulation][32]).mean(), np.array(results[simulation][32]).std()]
 
 x = [1, 2, 4, 8, 16, 32]
-simulation_simple = ["mxm_simple", "MIM_simple", "MSM_simple"]
+simulation_simple = ["mxm_simple","mxm_simple_adaptive", "MIM_simple", "MSM_simple"]
 simulation_long = ["mxm_long", "MIM_long", "MSM_long"]
 dist = 0
 plt.clf()
@@ -153,11 +153,11 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptive MSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
-        simulation = "MSM-adaptive"
+        simulation = "adaptive MSM"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.3)
     plt.errorbar(xaxis-0.3+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
     dist += 0.3
@@ -183,11 +183,11 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptiveMSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
-        simulation = "MSM-adaptive"
+        simulation = "adaptive MSM"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.3)
     plt.errorbar(xaxis-0.3+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
     dist += 0.3
@@ -216,11 +216,11 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptive MSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
-        simulation = "MSM-adaptive"
+        simulation = "adaptive MSM"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.3)
     plt.errorbar(xaxis-0.3+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
     dist += 0.3
@@ -246,9 +246,9 @@
     if simulation == "msm ":
         simulation = "MSM-only"
     if simulation == "mxm adaptive":
-        simulation = "MSM-adaptive and MIM"
+        simulation = "adaptive MSM and MIM"
     if simulation == "msm adaptive":
-        simulation = "MSM-adaptive-only"
+        simulation = "adaptive MSM-only"
     if simulation == "MSMa ":
         simulation = "MSM-adaptive"
     plt.bar(xaxis-0.3+dist, y, label=f'{simulation}', log=True, width=0.3)

diff --git a/quisp/hundredbptime_insert.py b/quisp/hundredbptime_insert.py
@@ -40,8 +40,10 @@ def genplot(memory):
         xaxis = np.arange(len(locations))
         y = [result_simple[simulation]["homogeneous"][0], result_simple[simulation]["zero"][0], result_simple[simulation]["one"][0], result_simple[simulation]["two"][0], result_simple[simulation]["three"][0], result_simple[simulation]["four"][0]]
         err = [result_simple[simulation]["homogeneous"][1], result_simple[simulation]["zero"][1], result_simple[simulation]["one"][1], result_simple[simulation]["two"][1], result_simple[simulation]["three"][1], result_simple[simulation]["four"][1]]
-        simulation = simulation.replace("_simple_", " ")
-        simulation = simulation.replace("_simple", " ")
+        if(simulation == "simple"):
+            simulation = "non-adaptive MSM"
+        else:
+            simulation = "adaptive MSM"
         print(y)
         plt.bar(xaxis-0.2+dist, y, label=f'{simulation}', log=False, width=0.4)
         plt.errorbar(xaxis-0.2+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
@@ -50,8 +52,8 @@ def genplot(memory):
     plt.xticks(xaxis, locations)
     plt.xlabel('Replaced link', fontsize=15)
     plt.ylabel('Bell pair generation rate (BP/s)', fontsize=15)
-    plt.savefig(f"1kmdist_inserted_{memory}mem.png", dpi=1000)
-    plt.savefig(f"1kmdist_inserted_{memory}mem.pdf", dpi=1000)
+    plt.savefig(f"1kmdist_inserted_{memory}mem.png", dpi=1000, bbox_inches='tight')
+    plt.savefig(f"1kmdist_inserted_{memory}mem.pdf", dpi=1000, bbox_inches='tight')
     plt.clf()
     result_long = {"long": {"homogeneous": {}, "zero": {}, "one": {}, "two": {}, "three": {}, "four": {} }, "long_adaptive": {"homogeneous": {}, "zero": {}, "one": {}, "two": {}, "three": {}, "four": {} }}
     dist = 0
@@ -81,16 +83,18 @@ def genplot(memory):
         xaxis = np.arange(len(locations))
         y = [result_long[simulation]["homogeneous"][0], result_long[simulation]["zero"][0], result_long[simulation]["one"][0], result_long[simulation]["two"][0], result_long[simulation]["three"][0], result_long[simulation]["four"][0]]
         err = [result_long[simulation]["homogeneous"][1], result_long[simulation]["zero"][1], result_long[simulation]["one"][1], result_long[simulation]["two"][1], result_long[simulation]["three"][1], result_long[simulation]["four"][1]]
-        simulation = simulation.replace("_long_", " ")
-        simulation = simulation.replace("_long", " ")
+        if(simulation == "long"):
+            simulation = "non-adaptive MSM"
+        else:
+            simulation = "adaptive MSM"
         plt.bar(xaxis-0.2+dist, y, label=f'{simulation}', log=False, width=0.4)
         plt.errorbar(xaxis-0.2+dist, y, yerr=err, fmt='.', capsize=3,markersize=6,ecolor='black',elinewidth=0.5,markeredgecolor = 'black', color='w')
         dist += 0.4
     plt.legend()
     plt.xticks(xaxis, locations)
     plt.xlabel('Replaced link', fontsize=15)
     plt.ylabel('Bell pair generation rate (BP/s)', fontsize=15)
-    plt.savefig(f"20kmdist_inserted_{memory}mem.png", dpi=1000)
-    plt.savefig(f"20kmdist_inserted_{memory}mem.pdf", dpi=1000)
+    plt.savefig(f"20kmdist_inserted_{memory}mem.png", dpi=1000, bbox_inches='tight')
+    plt.savefig(f"20kmdist_inserted_{memory}mem.pdf", dpi=1000, bbox_inches='tight')
 for (memory) in ["4", "32"]:
     genplot(memory)