Re-checking in controller Java files after adjustments for paper evaluation
authorrtrimana <rtrimana@uci.edu>
Thu, 1 Feb 2018 18:06:30 +0000 (10:06 -0800)
committerrtrimana <rtrimana@uci.edu>
Thu, 1 Feb 2018 18:06:30 +0000 (10:06 -0800)
benchmarks/Java/HomeSecurityController/HomeSecurityController.java
benchmarks/Java/IrrigationController/IrrigationController.java

index 2ef8dc5..09c0527 100644 (file)
@@ -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();
 
index 4bcec62..a30bffd 100644 (file)
@@ -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);