better charts and better scripts

.gitignore

@@ -1 +1,3 @@
 graphs/venv/
+graphs/figs/
+graphs/__pycache__/

graphs/build.py

@@ -0,0 +1,15 @@
+import rtt
+import ric
+import ram
+import cpu
+import iperf
+import ping
+import retransmissions
+
+rtt.build()
+ric.build()
+ram.build()
+cpu.build()
+iperf.build()
+ping.build()
+retransmissions.build()

graphs/cpu.py

@@ -2,7 +2,6 @@
 import matplotlib.pyplot as plt
 import matplotlib as mpl
 
-mpl.use('QtAgg') 
 files = [
     [
         "../logs/oai/oai/iperf/cpu-ran.csv",
@@ -33,7 +32,7 @@
     ],
 ]
 
-rans = ["OAI", "srsRAN"]
+rans = ["OAI RAN", "srsRAN"]
 
 cores = [
     "OAI CN",
@@ -49,24 +48,34 @@ def readfile(file: str, skip: int):
     return data
 
 
-# there are 40 measurements total. They were taken every 15s
-# so in total the test lasted 600s
-x = np.arange(40) * 15 # the label locations
+def build(save=True):
+    # there are 40 measurements total. They were taken every 15s
+    # so in total the test lasted 600s
+    x = np.arange(40) * 15 # the label locations
 
-colors = ["#7EA16B", "#C3D898"]
-fig, axes = plt.subplots(1, 3, layout='constrained')
+    colors = ["#7EA16B", "#C3D898"]
+    fig, axes = plt.subplots(1, 3, layout='constrained')
 
-for tests, offsets, ax, core in zip(files, skip, axes, cores):
-    ax.set_ylim(0, 12)
-    for ran, color, test, offset in zip(rans, colors, tests, offsets):
-        data = readfile(test, offset)
-        rects = ax.plot(x, data, label=ran, color=color)
-    ax.set_xlabel(core, fontsize=12)
+    for tests, offsets, ax, core in zip(files, skip, axes, cores):
+        ax.set_ylim(0, 12)
+        for ran, color, test, offset in zip(rans, colors, tests, offsets):
+            data = readfile(test, offset)
+            rects = ax.plot(x, data, label=ran, color=color)
+        ax.set_xlabel(core, fontsize=12)
 
 # Add some text for labels, title and custom x-axis tick labels, etc.
-fig.supylabel('Consumo de CPU (%)', fontsize=14)
+    fig.supylabel('Consumo de CPU (%)', fontsize=14)
 #axes[len(axes)//2].set_xlabel("Tempo (s)", fontsize=14)
-axes[-1].legend(loc='upper right', ncols=2, fontsize=12)
-fig.supxlabel("Tempo (s)", fontsize=14)
+    axes[-1].legend(loc='upper right', ncols=2, fontsize=12)
+    fig.supxlabel("Tempo (s)", fontsize=14)
 
-plt.show()
+#fig.set_tight_layout()
+    fig.set_size_inches(10.4, 4.2)
+#plt.show()
+    if save:
+        fig.savefig("figs/cpu.pdf", dpi=100)
+
+if __name__ == "__main__":
+    build(False)
+    mpl.use('QtAgg') 
+    plt.show()

graphs/iperf.py

@@ -4,7 +4,6 @@
 import matplotlib as mpl
 import json
 
-mpl.use('QtAgg') 
 files = ["../logs/oai/oai/iperf/oai-oaicn",
          "../logs/srsran/oai/iperf/20240304-oai",
          "../logs/oai/open5gs/iperf/oai-open5gs",
@@ -18,39 +17,49 @@
         "Free5Gc",
 ]
 rans = [
-        "OAI",
+        "OAI RAN",
         "srsRAN",
         "_OAI",
         "_srsRAN",
         "_OAI",
         "_srsRAN",
 ]
 count = len(files)
-ax = plt.subplot()
+fig, ax = plt.subplots(1,1)
 
 def conv(x):
     return float(x['sum']['bits_per_second'])/1_000_000
 
 def from_iter(x):
     return np.fromiter(map(conv, x['intervals']), float)
 
-ax.set_ylabel("Taxa de transferência (Mbps)", fontsize=14)
+def build(save=True):
+    ax.set_ylabel("Taxa de Transferência (Mbps)", fontsize=16)
 
-dataset = []
-for i in range(count):
-    with open(files[i], "r") as file:
-        data = json.load(file)
-    dataset.append(list(from_iter(data)))
+    dataset = []
+    for i in range(count):
+        with open(files[i], "r") as file:
+            data = json.load(file)
+        dataset.append(list(from_iter(data)))
 
-colors = ["#7EA16B", "#C3D898"]
-b = ax.boxplot(dataset, labels=rans, medianprops={"color": "#000000"})
-for i in range(len(b['boxes'])):
-    box = b['boxes'][i]
-    ax.add_patch(Polygon(box.get_xydata(), facecolor=colors[i%2], label=rans[i]))
+    colors = ["#7EA16B", "#C3D898"]
+    b = ax.boxplot(dataset, labels=rans, medianprops={"color": "#000000"})
+    for i in range(len(b['boxes'])):
+        box = b['boxes'][i]
+        ax.add_patch(Polygon(box.get_xydata(), facecolor=colors[i%2], label=rans[i]))
 
-x = np.arange(len(labels)) * 2 + 1.5
-ax.set_xticks(x, labels, fontsize=12)
-ax.set_ylim((50,130))
-ax.legend(loc='upper right', ncols=2, fontsize=12)
+    x = np.arange(len(labels)) * 2 + 1.5
+    ax.set_xticks(x, labels, fontsize=16)
+    ax.set_ylim((50,130))
+    ax.legend(loc='upper right', ncols=2, fontsize=14)
 
-plt.show()
+    fig.set_size_inches(10.4, 4.2)
+    plt.tight_layout()
+#plt.show()
+    if save:
+        fig.savefig("figs/iperf.pdf", dpi=100)
+
+if __name__ == "__main__":
+    build(save=False)
+    mpl.use('QtAgg') 
+    plt.show()

graphs/ping.py

@@ -3,7 +3,6 @@
 from matplotlib.patches import Polygon
 import matplotlib as mpl
 
-mpl.use('QtAgg') 
 NUM_ROWS = 600
 
 def conv(x: str):
@@ -30,30 +29,41 @@ def read_file(path: str):
         "Free5Gc",
 ]
 rans = [
-        "OAI",
+        "OAI RAN",
         "srsRAN",
         "_OAI",
         "_srsRAN",
         "_OAI",
         "_srsRAN",
 ]
-count = len(paths)
 
-ax = plt.subplot()
+def build(save=True):
+    count = len(paths)
 
+    fig, ax = plt.subplots(1,1)
 
-dataset = list(map(lambda path: read_file(path), paths))
-ax.set_ylabel("Latência (ms)", fontsize=14)
-ax.set_ylim((0, 64))
-colors = ["#7EA16B", "#C3D898"]
-b = ax.boxplot(dataset, labels=rans, medianprops={"color": "#000000"})
-for i in range(len(b['boxes'])):
-    box = b['boxes'][i]
-    ax.add_patch(Polygon(box.get_xydata(), facecolor=colors[i%2], label=rans[i]))
 
-x = np.arange(len(labels)) * 2 + 1.5
-ax.set_xticks(x, labels, fontsize=12)
+    dataset = list(map(lambda path: read_file(path), paths))
+    ax.set_ylabel("Latência (ms)", fontsize=16)
+    ax.set_ylim((0, 64))
+    colors = ["#7EA16B", "#C3D898"]
+    b = ax.boxplot(dataset, labels=rans, medianprops={"color": "#000000"})
+    for i in range(len(b['boxes'])):
+        box = b['boxes'][i]
+        ax.add_patch(Polygon(box.get_xydata(), facecolor=colors[i%2], label=rans[i]))
 
-ax.legend(loc='upper right', ncols=2, fontsize=12)
+    x = np.arange(len(labels)) * 2 + 1.5
+    ax.set_xticks(x, labels, fontsize=16)
 
-plt.show()
+    ax.legend(loc='upper right', ncols=2, fontsize=14)
+
+    fig.set_size_inches(10.4, 4.2)
+    plt.tight_layout()
+#plt.show()
+    if save:
+        fig.savefig("figs/ping.pdf", dpi=100)
+
+if __name__ == "__main__":
+    build(False)
+    mpl.use('QtAgg') 
+    plt.show()