From a26c895f4a5e4779f1e1bc4951e8837d5f2de332 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Fri, 23 Nov 2018 11:58:26 -0800 Subject: [PATCH] Adding WeMo Inisght paths for experimental setup. --- .../iotproject/detection/SignatureDetector.java | 5 +++-- python_ml/validate-detection.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) 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 f54ccc6..22e4964 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 @@ -280,9 +280,10 @@ public class SignatureDetector implements PacketListener, ClusterMatcher.Cluster */ // 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/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"; + // TODO: WE HAVE 1 ADDITIONAL EVENT (FROM WEMO PLUG) + 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"; diff --git a/python_ml/validate-detection.py b/python_ml/validate-detection.py index 209e5b9..8025aff 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" @@ -85,12 +85,12 @@ path = "/scratch/July-2018/experimental_result/standalone/" #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" +#device = "wemo-insight-plug/self-test" +#fileExperiment = "wemo-insight-plug-nov-21-2018.timestamps" +#fileDetection = "phone-side-detection" +device = "wemo-insight-plug/timestamps" +fileExperiment = "wemo-insight-plug-smarthome-nov-22-2018.timestamps" +fileDetection = "wemo-insight-plug-smarthome-nov-22-2018.phone.wlan1.detections" TIME_WINDOW = 15 # detection/signature window of 15 seconds #NEG_TIME_WINDOW = -15 # detection/signature window of 15 seconds -- 2.34.1