From 6ff060b2431a7043a26d45d80016a698aee24105 Mon Sep 17 00:00:00 2001 From: Janus Varmarken Date: Tue, 17 Jul 2018 18:52:52 -0700 Subject: [PATCH] Conversation: ensure packets are added to list in descending order of their timestamps. --- .../src/main/java/edu/uci/iotproject/Conversation.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java index b9f3e07..05d97e3 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java @@ -135,6 +135,15 @@ public class Conversation { addSeqNumber(packet); // Finally add packet to list of packets pertaining to this conversation. mPackets.add(packet); + // Preserve order of packets in list: sort according to timestamp. + if (mPackets.size() > 1 && + mPackets.get(mPackets.size()-1).getTimestamp().isBefore(mPackets.get(mPackets.size()-2).getTimestamp())) { + Collections.sort(mPackets, (o1, o2) -> { + if (o1.getTimestamp().isBefore(o2.getTimestamp())) { return -1; } + else if (o2.getTimestamp().isBefore(o1.getTimestamp())) { return 1; } + else { return 0; } + }); + } } /** -- 2.34.1