From 7f0c97d41e52ccd5292a6394c9b06a7ae501a0d3 Mon Sep 17 00:00:00 2001 From: Lukas Prause Date: Mon, 14 Mar 2022 15:36:33 +0100 Subject: [PATCH] Proof and changes in merge. --- format_udp_pcap_to_csv.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/format_udp_pcap_to_csv.py b/format_udp_pcap_to_csv.py index 6afe274..769be0c 100755 --- a/format_udp_pcap_to_csv.py +++ b/format_udp_pcap_to_csv.py @@ -44,7 +44,8 @@ def format_udp_pcap_to_csv(folder, sender_pcap_name, receiver_pcap_name, output= columns={"frame.time_epoch": "arrival_time", "data": "data_hash", "data.len": "data.len_received"} ) - transmission_df = sender_df.merge(receiver_df, on="data_hash") + + transmission_df = pd.merge(sender_df, receiver_df, on="data_hash", how="outer") transmission_df["delay"] = transmission_df.arrival_time - transmission_df.departure_time direction = "uplink"