Null checks

SidIcarus · Mar 17, 2016 · 9909e6f · 9909e6f
1 parent c0b3872
commit 9909e6f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/AccelerometerDecision.java b/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/AccelerometerDecision.java
@@ -19,6 +19,15 @@ public void run(){
         double oldzVal;
         double diffzVal;
 
+
+        /*
+         * Analysis loop
+         *
+         * Each run through the loop is analyzing the data in a new segment
+         * Trying to determine whether or not the condition is met for that period
+         * of time.
+         */
+
         while(!this.interrupted()){
             requestSegment();
 
@@ -31,7 +40,6 @@ public void run(){
                     warn();
                 }
             }
-
         }
     }
 

diff --git a/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/CameraDecision.java b/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/CameraDecision.java
@@ -1,6 +1,6 @@
 package edu.rit.se.beepbrake.DecisionMaking;
 
-//created by RyanBega 2/8/16
+//created by Ryan 2/8/16
 
 
 import edu.rit.se.beepbrake.buffer.BufferManager;
@@ -13,11 +13,13 @@ public CameraDecision(DecisionManager decMan, BufferManager bufMan){
     }
 
     public void run(){
-//        while(!this.interrupted()){
-//            requestSegment();
-//
-//            //Analysis loop
-//        }
+
+        //Analysis loop
+        while(!this.interrupted()){
+            requestSegment();
+
+            //Analysis
+        }
     }
 
     private void warn(){

diff --git a/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/Decision.java b/app/src/main/java/edu/rit/se/beepbrake/DecisionMaking/Decision.java
@@ -24,8 +24,7 @@ protected boolean requestSegment(){
         try {
             while (true) {
                 requested = bufMan.getNewestSegment();
-                if (requested != null && (curSeg == null ||
-                        curSeg.getCreatedAt() < requested.getCreatedAt())) {
+                if (requested != null && (curSeg == null || curSeg.getCreatedAt() < requested.getCreatedAt())) {
                     curSeg = requested;
                     return true;
                 }