Fix

openairinterface5g/carlos_mestrado/medicoes/script_plot_mestrado.py

@@ -38,36 +38,38 @@ for scenario in scenarios:
                                 "Transfer": 0,
                                 "Bandwidth": 0,
                                 "Jitter": 0,
-                                "Packet loss (%)": 0
+                                "PacketsLost": 0,
+                                "TotalPackets": 0
                             })
                 for line in file:
                     if "[  3]" in line and "sec" in line and "MBytes" in line:
                         parts = line.split()
                         count += 1
+                        print(parts)
                         if count < 10: 
                             data.append({
                                 "Interval": count,
                                 "Transfer": parts[5],
                                 "Bandwidth": float(parts[7]),
                                 "Jitter": parts[9] if len(parts) > 6 else None,
-                                "Packet loss (%)": float(parts[-1].strip("()%"))
+                                "PacketsLost": int(parts[-2].split("/")[0]) if "/" in parts[-2] else int(parts[-3].split("/")[0]),
+                                "TotalPackets": int(parts[-2].split("/")[1]) if "/" in parts[-2] else int(parts[-2])
                             })
-                        elif count <= 60:
+                        elif count < 60:
                             data.append({
                                 "Interval": count,
                                 "Transfer": parts[4],
                                 "Bandwidth": float(parts[6]),
                                 "Jitter": parts[8] if len(parts) > 6 else None,
-                                "Packet loss (%)": float(parts[-1].strip("()%"))
+                                "PacketsLost": int(parts[-2].split("/")[0]) if "/" in parts[-2] else int(parts[-3].split("/")[0]),
+                                "TotalPackets": int(parts[-2].split("/")[1]) if "/" in parts[-2] else int(parts[-2])
                             })
                         else:
                             break
-            print(ue)
             ue_dataframes[scenario][cap_conf][ue] = pd.DataFrame(data)
 pl_ue1 = []
 pl_ue2 = []
 
-
 for scenario in scenarios:
     scenario_path = main_folder + scenario
     cap_confs = [name for name in os.listdir(scenario_path) if os.path.isdir(os.path.join(scenario_path, name))] ## Configuração da capacidade dos slices
@@ -84,9 +86,8 @@ for scenario in scenarios:
         plt.grid(True)
         plt.legend()
         plt.tight_layout()
-        pl_ue1.append(ue_dataframes[scenario][cap_conf]['ue1']["Packet loss (%)"].mean())
-        pl_ue2.append(ue_dataframes[scenario][cap_conf]['ue2']["Packet loss (%)"].mean())
-        
+        pl_ue1.append((ue_dataframes[scenario][cap_conf]['ue1']["PacketsLost"].sum()/ue_dataframes[scenario][cap_conf]['ue1']["TotalPackets"].sum())*100)
+        pl_ue2.append((ue_dataframes[scenario][cap_conf]['ue2']["PacketsLost"].sum()/ue_dataframes[scenario][cap_conf]['ue2']["TotalPackets"].sum())*100)
         plt.show()
 
     # Configurar a posição das barras no eixo x
@@ -94,13 +95,15 @@ for scenario in scenarios:
     print(x)
     largura = 0.4  # Largura das barras
 
+    
+    print("pl_ue1 ", pl_ue1, " pl_ue2: ", pl_ue2)
     # Criar as barras
     plt.bar(x - largura / 2, pl_ue1, width=largura, label='UE1', color='red')  # Barras para UE1
     plt.bar(x + largura / 2, pl_ue2, width=largura, label='UE2', color='blue')  # Barras para UE2
 
     # Adicionar rótulos e título
     plt.xlabel('Scenarios')
-    plt.ylabel('Packet Loss (%)')
+    plt.ylabel('Packet Loss')
     plt.title('Packet Loss for each capacity configuration')
     plt.xticks(x, cap_confs)  # Ajustar rótulos do eixo x
     plt.legend()  # Adicionar legenda