X-Git-Url: http://plrg.eecs.uci.edu/git/?p=IRC.git;a=blobdiff_plain;f=Robust%2Fsrc%2FBenchmarks%2FSSJava%2FEyeTrackingInfer%2FDeviationScanner.java;h=412d9e23a4e67ff61ff5b9b77028441ca9d9f79a;hp=6da3f7e1d4a121f4309335eb6bcaec8c36c88c94;hb=d45bb251bdc1196d7848094fa2ccd566b39e021c;hpb=8d750e51bc5fa6b54ed568859dd8a6a25ad9e4c4

diff --git a/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java b/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
index 6da3f7e1..412d9e23 100644
--- a/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
+++ b/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
@@ -25,7 +25,8 @@
 
 public class DeviationScanner {
 
-  private EyePosition eyePositions[];
+  private int x[];
+  private int y[];
 
   // LEFT_UP(+1, -1), UP(0, -1), RIGHT_UP(-1, -1), LEFT(+1, 0), NONE(0, 0),
   // RIGHT(-1, 0), LEFT_DOWN(
@@ -42,29 +43,23 @@ public class DeviationScanner {
   public static final int RIGHT_DOWN = 8;
 
   public DeviationScanner() {
-    eyePositions = new EyePosition[3];
+    x = new int[3];
+    y = new int[3];
+    SSJAVA.arrayinit(x, -1);
+    SSJAVA.arrayinit(y, -1);
   }
 
-  public void addEyePosition(EyePosition eyePosition) {
-
-    // for ( int i = 1; i < 3; i++) {
-    // eyePositions[i - 1] = eyePositions[i];
-    // eyePositions[i] = null;
-    // }
-    // eyePositions[eyePositions.length - 1] = eyePosition;
-
-    SSJAVA.append(eyePositions, eyePosition);
-
+  public void addEyePosition(int inx, int iny) {
+    SSJAVA.append(x, inx);
+    SSJAVA.append(y, iny);
   }
 
-  //
-
   public int scanForDeviation(Rectangle2D faceRect) {
 
     int deviation = NONE;
 
     for (int i = 0; i < 3; i++) {
-      if (eyePositions[i] == null) {
+      if (x[i] == -1) {
         return deviation;
       }
     }
@@ -75,8 +70,8 @@ public class DeviationScanner {
     int lastIdx = -1;
     for (int i = 0; i < 3; ++i) {
       if (lastIdx != -1) {
-        deviationX += (eyePositions[i].getX() - eyePositions[lastIdx].getX());
-        deviationY += (eyePositions[i].getY() - eyePositions[lastIdx].getY());
+        deviationX += (x[i] - x[lastIdx]);
+        deviationY += (y[i] - y[lastIdx]);
       }
       lastIdx = i;
     }
@@ -101,11 +96,9 @@ public class DeviationScanner {
     deviation = getDirectionFor(deviationAbsoluteX, deviationAbsoluteY);
 
     if (deviation != NONE) {
-      eyePositions = new EyePosition[3];
+      SSJAVA.arrayinit(x, -1);
+      SSJAVA.arrayinit(y, -1);
     }
-    // System.out.println(String.format("%.2f%% | %.2f%% => %d and %d >>> %s",
-    // deviationX*100, deviationY*100, deviationAbsoluteX, deviationAbsoluteY,
-    // deviation.toString()));
 
     return deviation;
   }
@@ -135,11 +128,6 @@ public class DeviationScanner {
     return -1;
   }
 
-  public void clear() {
-    System.out.println("CLEAR");
-    eyePositions = new EyePosition[3];
-  }
-
   public String toStringDeviation(int dev) {
     if (dev == LEFT_UP) {
       return "LEFT_UP";