Exchanging cameras between benchmarks; updating database

[iot2.git] / benchmarks / Java / SmartLightsController / SmartLightsController.java

diff --git a/benchmarks/Java/SmartLightsController/SmartLightsController.java b/benchmarks/Java/SmartLightsController/SmartLightsController.java
index 9f3ad93dd23864cbafb3752e2da2794a063633b8..4f1c915e9b50de1ca76713c2004fada6b05cf3af 100644 (file)
--- a/benchmarks/Java/SmartLightsController/SmartLightsController.java
+++ b/benchmarks/Java/SmartLightsController/SmartLightsController.java
@@ -340,7 +340,7 @@ public class SmartLightsController {
                System.out.println("Initialized rooms!");
 
                // Setup the cameras, start them all and assign each one a motion detector
                System.out.println("Initialized rooms!");
 
                // Setup the cameras, start them all and assign each one a motion detector

-               for (CameraSmart cam : cameras.values()) {
+/*             for (CameraSmart cam : cameras.values()) {

 
                        // Each camera will have a motion detector unique to it since the motion detection has state
                        MotionDetection mo = new MotionDetection(12, 0.5f, 10, 10);
 
                        // Each camera will have a motion detector unique to it since the motion detection has state
                        MotionDetection mo = new MotionDetection(12, 0.5f, 10, 10);


@@ -362,6 +362,8 @@ public class SmartLightsController {
                        camMotionDetect.put(cam, mo);
                }
                System.out.println("Initialized cameras!");
                        camMotionDetect.put(cam, mo);
                }
                System.out.println("Initialized cameras!");

+*/
+               System.out.println("Skipped cameras!");

 
                //Initialize the light-bulbs, will turn off the bulb
                for (LightBulbSmart bulb : mainRoomLightBulbs.values()) {
 
                //Initialize the light-bulbs, will turn off the bulb
                for (LightBulbSmart bulb : mainRoomLightBulbs.values()) {


@@ -371,9 +373,12 @@ public class SmartLightsController {
                        Thread.sleep(1000);
                }
                System.out.println("Initialized bulbs!");
                        Thread.sleep(1000);
                }
                System.out.println("Initialized bulbs!");

+               
+               System.out.println("STOP here until we have 2 more working cameras!");
+               while (true) { }

 
                // Run the main loop that will keep check the bulbs and rooms periodically
 
                // Run the main loop that will keep check the bulbs and rooms periodically

-               while (true) {
+/*             while (true) {

 
                        // Run this code every <specified time>
                        long currentTimeSeconds = (new Date()).getTime() / 1000;
 
                        // Run this code every <specified time>
                        long currentTimeSeconds = (new Date()).getTime() / 1000;


@@ -410,7 +415,7 @@ public class SmartLightsController {
                                }
                        }
 
                                }
                        }
 

-               }
+               }*/

        }
 }
 
        }
 }