Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic

diff --combined Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
index 1a055361fb7429c0fe4dbe81966639f49c626a82,3dedc2c4f817cfd1ea59ab225ce49545b6a2140e..6abdfc8c202608ca6c0d3efb34e7718952d06b16
--- 1/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
--- 2/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
+++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
@@@ -38,16 -38,16 +38,16 @@@ public class Main 
          //String path = "/Users/varmarken/temp/UCI IoT Project/experiments"; // Janus
  
          // D-Link July 26 experiment
 -        final String inputPcapFile = path + "/2018-07/dlink/dlink.wlan1.local.pcap";
 -        final String outputPcapFile = path + "/2018-07/dlink/dlink-processed.pcap";
 -        final String triggerTimesFile = path + "/2018-07/dlink/dlink-july-26-2018.timestamps";
 -        final String deviceIp = "192.168.1.246"; // .246 == phone; .199 == dlink plug?
 +//        final String inputPcapFile = path + "/2018-07/dlink/dlink.wlan1.local.pcap";
 +//        final String outputPcapFile = path + "/2018-07/dlink/dlink-processed.pcap";
 +//        final String triggerTimesFile = path + "/2018-07/dlink/dlink-july-26-2018.timestamps";
 +//        final String deviceIp = "192.168.1.246"; // .246 == phone; .199 == dlink plug?
  
          // TP-Link July 25 experiment
 -//        final String inputPcapFile = path + "/2018-07/tplink/tplink.wlan1.local.pcap";
 -//        final String outputPcapFile = path + "/2018-07/tplink/tplink-processed.pcap";
 -//        final String triggerTimesFile = path + "/2018-07/tplink/tplink-july-25-2018.timestamps";
 -//        final String deviceIp = "192.168.1.159";
 +        final String inputPcapFile = path + "/2018-07/tplink/tplink.wlan1.local.pcap";
 +        final String outputPcapFile = path + "/2018-07/tplink/tplink-processed.pcap";
 +        final String triggerTimesFile = path + "/2018-07/tplink/tplink-july-25-2018.timestamps";
 +        final String deviceIp = "192.168.1.159";
  
          // SmartThings Plug July 25 experiment
  //        final String inputPcapFile = path + "/2018-07/stplug/stplug.wlan1.local.pcap";
@@@ -126,32 -126,25 +126,25 @@@
  
  
  
- 
-         // ons
-         Map<String, Map<String, Integer>> ons = new HashMap<>();
-         Map<String, Map<String, Integer>> offs = new HashMap<>();
- 
+         // Contains all ON events: hostname -> sequence identifier -> list of conversations with that sequence
+         Map<String, Map<String, List<Conversation>>> ons = new HashMap<>();
+         // Contains all OFF events: hostname -> sequence identifier -> list of conversations with that sequence
+         Map<String, Map<String, List<Conversation>>> offs = new HashMap<>();
          userActionsToConvsByHostname.forEach((ua, hostnameToConvs) -> {
-             Map<String, Map<String, Integer>> outer = ua.getType() == Type.TOGGLE_ON ? ons : offs;
+             Map<String, Map<String, List<Conversation>>> outer = ua.getType() == Type.TOGGLE_ON ? ons : offs;
              hostnameToConvs.forEach((host, convs) -> {
-                 Map<String, Integer> sequenceCounts = TcpConversationUtils.countPacketSequenceFrequencies(convs);
-                 outer.merge(host, sequenceCounts, (existingMap, newMap) -> {
-                     newMap.forEach((sequence, count) -> existingMap.merge(sequence, count, (i1, i2) -> i1+i2));
-                     return existingMap;
+                 Map<String, List<Conversation>> seqsToConvs = TcpConversationUtils.
+                         groupConversationsByPacketSequence(convs);
+                 outer.merge(host, seqsToConvs, (oldMap, newMap) -> {
+                     newMap.forEach((sequence, cs) -> oldMap.merge(sequence, cs, (list1, list2) -> {
+                         list1.addAll(list2);
+                         return list1;
+                     }));
+                     return oldMap;
                  });
              });
          });
  
- 
- //                    for (Map.Entry<String, Integer> newMapEntry : newMap.entrySet()) {
- //                        if (existingMap.get(newMapEntry.getKey()) != null) {
- //                            existingMap.put(newMapEntry.getKey(), existingMap.get(newMapEntry.getKey()) + newMapEntry.getValue());
- //                        } else {
- //                            existingMap.put(newMapEntry.getKey(), newMapEntry.getValue());
- //                        }
- //                    }
- //                    return existingMap;
- 
          System.out.println("");
  
          // -------------------------------------------------------------------------------------------------------------