From: rtrimana <rtrimana@uci.edu>
Date: Thu, 1 Feb 2018 18:06:30 +0000 (-0800)
Subject: Re-checking in controller Java files after adjustments for paper evaluation
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=commitdiff_plain;h=3e3e0d0e468e7f791963c1c14e06966563d3f65c;ds=sidebyside

Re-checking in controller Java files after adjustments for paper evaluation
---

diff --git a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
index 2ef8dc5..09c0527 100644
--- a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
+++ b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
@@ -624,9 +624,6 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt
 	 */
 	public void init() {
 
-        //System.out.println("DEBUG: Stopping here for debug purposes!");
-        //while(true) { }
-
 		// Initialize IoTCloud server
 		initIoTCloudServer();
 
diff --git a/benchmarks/Java/IrrigationController/IrrigationController.java b/benchmarks/Java/IrrigationController/IrrigationController.java
index 4bcec62..a30bffd 100644
--- a/benchmarks/Java/IrrigationController/IrrigationController.java
+++ b/benchmarks/Java/IrrigationController/IrrigationController.java
@@ -257,18 +257,18 @@ public class IrrigationController extends UnicastRemoteObject implements Weather
 		}
 
 		System.out.println("DEBUG: Waiting for phone to send weather information");
-		//while (waitingForInterface.get()) {
-		//	try {
-		//		Thread.sleep(1000);
-		//	} catch (Exception e) {
-		//		e.printStackTrace();
-		//	}
-		//}
+		while (waitingForInterface.get()) {
+			try {
+				Thread.sleep(1000);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 		// TODO: Use a phone input interface later
-		inchesPerWeek = 20.00;
+		/*inchesPerWeek = 20.00;
 		weatherZipCode = 92612;
 		daysToWaterOn = 255;
-		inchesPerMinute.add(1.50);
+		inchesPerMinute.add(1.50);*/
 
 		System.out.println("DEBUG: inchesPerWeek: " + inchesPerWeek);
 		System.out.println("DEBUG: weatherZipCode: " + weatherZipCode);