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

diff --cc Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
index 72b14e0b0b075e8c322ea9f9b3fb83311a0982e8,f19b7b2125ebbac1ec1275677f2caf3326b11d7f..ed8c1bd27a4d61f54e0ea9200a74403311394860
--- 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
@@@ -34,14 -37,14 +37,14 @@@ public class Main 
          // ------------ # Code for extracting traffic generated by a device within x seconds of a trigger # ------------
          // Paths to input and output files (consider supplying these as arguments instead) and IP of the device for
          // which traffic is to be extracted:
-         String path = "/scratch/July-2018"; // Rahmadi
-         //String path = "/Users/varmarken/temp/UCI IoT Project/experiments"; // Janus
+ //        String path = "/scratch/July-2018"; // Rahmadi
+         String path = "/Users/varmarken/temp/UCI IoT Project/experiments"; // Janus
  
          // 1) 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.199"; // .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?
  
          // 2) TP-Link July 25 experiment
  //        final String inputPcapFile = path + "/2018-07/tplink/tplink.wlan1.local.pcap";