From: rtrimana Date: Thu, 22 Nov 2018 16:17:54 +0000 (-0800) Subject: Adding WeMo plugs' paths for experimental results. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=pingpong.git;a=commitdiff_plain;h=f3a9ee3bc78565b4017024eb4f0c992b8181a133 Adding WeMo plugs' paths for experimental results. --- diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java index df93a9f..530bbd1 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java @@ -115,17 +115,23 @@ public class Main { // final String triggerTimesFile = path + "/2018-07/wemo/wemo-july-30-2018.timestamps"; // final String deviceIp = "192.168.1.145"; // .246 == phone; .145 == WeMo // TODO: EXPERIMENT - November 20, 2018 - final String inputPcapFile = path + "/experimental_result/standalone/wemo-plug/wlan1/wemo-plug.wlan1.local.pcap"; - final String outputPcapFile = path + "/experimental_result/standalone/wemo-plug/wlan1/wemo-plug-processed.pcap"; - final String triggerTimesFile = path + "/experimental_result/standalone/wemo-plug/timestamps/wemo-plug-nov-20-2018.timestamps"; -// final String deviceIp = "192.168.1.145"; // .246 == phone; .145 == WeMo - final String deviceIp = "192.168.1.246"; // .246 == phone; .145 == WeMo +// final String inputPcapFile = path + "/experimental_result/standalone/wemo-plug/wlan1/wemo-plug.wlan1.local.pcap"; +// final String outputPcapFile = path + "/experimental_result/standalone/wemo-plug/wlan1/wemo-plug-processed.pcap"; +// final String triggerTimesFile = path + "/experimental_result/standalone/wemo-plug/timestamps/wemo-plug-nov-20-2018.timestamps"; +//// final String deviceIp = "192.168.1.145"; // .246 == phone; .145 == WeMo +// final String deviceIp = "192.168.1.246"; // .246 == phone; .145 == WeMo // 5) Wemo Insight July 31 experiment // final String inputPcapFile = path + "/2018-07/wemoinsight/wemoinsight.wlan1.local.pcap"; // final String outputPcapFile = path + "/2018-07/wemoinsight/wemoinsight-processed.pcap"; // final String triggerTimesFile = path + "/2018-07/wemoinsight/wemo-insight-july-31-2018.timestamps"; // final String deviceIp = "192.168.1.135"; + // TODO: EXPERIMENT - November 21, 2018 + final String inputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.local.pcap"; + final String outputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/wlan1/wemo-insight-plug-processed.pcap"; + final String triggerTimesFile = path + "/experimental_result/standalone/wemo-insight-plug/timestamps/wemo-insight-plug-nov-21-2018.timestamps"; +// final String deviceIp = "192.168.1.145"; // .246 == phone; .135 == WeMo Insight + final String deviceIp = "192.168.1.246"; // .246 == phone; .135 == WeMo Insight // 6) TP-Link Bulb August 1 experiment // final String inputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb.wlan1.local.pcap"; diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java index 7ff42b1..f54ccc6 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java @@ -265,11 +265,11 @@ public class SignatureDetector implements PacketListener, ClusterMatcher.Cluster // final String inputPcapFile = path + "/experimental_result/standalone/wemo-plug/eth0/wemo-plug.eth0.local.pcap"; // TODO: WE HAVE 4 ADDITIONAL EVENTS (TRIGGERED MANUALLY), SO WE JUST IGNORE THEM BECAUSE THEY HAPPENED BEFORE // TODO: THE ACTUAL TRIGGERS - final String inputPcapFile = path + "/experimental_result/smarthome/wemo-plug/wlan1/wemo-plug.wlan1.detection.pcap"; -// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-plug/eth0/wemo-plug.eth0.detection.pcap"; - // WeMo Plug PHONE signatures - final String onSignatureFile = path + "/experimental_result/standalone/wemo-plug/signatures/wemo-plug-onSignature-phone-side.sig"; - final String offSignatureFile = path + "/experimental_result/standalone/wemo-plug/signatures/wemo-plug-offSignature-phone-side.sig"; +// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-plug/wlan1/wemo-plug.wlan1.detection.pcap"; +//// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-plug/eth0/wemo-plug.eth0.detection.pcap"; +// // WeMo Plug PHONE signatures +// final String onSignatureFile = path + "/experimental_result/standalone/wemo-plug/signatures/wemo-plug-onSignature-phone-side.sig"; +// final String offSignatureFile = path + "/experimental_result/standalone/wemo-plug/signatures/wemo-plug-offSignature-phone-side.sig"; /* // WeMo Insight Plug experiment @@ -278,6 +278,15 @@ public class SignatureDetector implements PacketListener, ClusterMatcher.Cluster final String onSignatureFile = path + "/training/wemo-insight-plug/signatures/wemo-insight-plug-onSignature-device-side.sig"; final String offSignatureFile = path + "/training/wemo-insight-plug/signatures/wemo-insight-plug-offSignature-device-side.sig"; */ + // TODO: EXPERIMENT - November 21, 2018 + // WeMo Insight Plug experiment + final String inputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.local.pcap"; +// final String inputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/eth0/wemo-insight-plug.eth0.local.pcap"; +// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.detection.pcap"; +// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-insight-plug/eth0/wemo-insight-plug.eth0.detection.pcap"; + // WeMo Insight Plug PHONE signatures + final String onSignatureFile = path + "/experimental_result/standalone/wemo-insight-plug/signatures/wemo-insight-plug-onSignature-phone-side.sig"; + final String offSignatureFile = path + "/experimental_result/standalone/wemo-insight-plug/signatures/wemo-insight-plug-offSignature-phone-side.sig"; // Kwikset Doorlock Sep 12 experiment diff --git a/python_ml/validate-detection.py b/python_ml/validate-detection.py index 8154de7..209e5b9 100644 --- a/python_ml/validate-detection.py +++ b/python_ml/validate-detection.py @@ -1,7 +1,7 @@ from datetime import datetime -path = "/scratch/July-2018/experimental_result/smarthome/" -#path = "/scratch/July-2018/experimental_result/standalone/" +#path = "/scratch/July-2018/experimental_result/smarthome/" +path = "/scratch/July-2018/experimental_result/standalone/" # D-Link plug #device = "dlink-plug/self-test" #fileExperiment = "dlink-plug-nov-7-2018.timestamps" @@ -80,9 +80,17 @@ path = "/scratch/July-2018/experimental_result/smarthome/" #device = "wemo-plug/self-test" #fileExperiment = "wemo-plug-nov-20-2018.timestamps" #fileDetection = "phone-side-detection" -device = "wemo-plug/timestamps" -fileExperiment = "wemo-plug-smarthome-nov-21-2018.timestamps" -fileDetection = "wemo-plug-smarthome-nov-21-2018.phone.wlan1.detections" +#device = "wemo-plug/timestamps" +#fileExperiment = "wemo-plug-smarthome-nov-21-2018.timestamps" +#fileDetection = "wemo-plug-smarthome-nov-21-2018.phone.wlan1.detections" + +# WeMo Insight plug +device = "wemo-insight-plug/self-test" +fileExperiment = "wemo-insight-plug-nov-21-2018.timestamps" +fileDetection = "phone-side-detection" +#device = "wemo-plug/timestamps" +#fileExperiment = "wemo-plug-smarthome-nov-21-2018.timestamps" +#fileDetection = "wemo-plug-smarthome-nov-21-2018.phone.wlan1.detections" TIME_WINDOW = 15 # detection/signature window of 15 seconds #NEG_TIME_WINDOW = -15 # detection/signature window of 15 seconds