EyeTracking has the same result of the original Java version.

[IRC.git] / Robust / src / Benchmarks / SSJava / EyeTracking / DeviationScanner.java

diff --git a/Robust/src/Benchmarks/SSJava/EyeTracking/DeviationScanner.java b/Robust/src/Benchmarks/SSJava/EyeTracking/DeviationScanner.java
index 456e3d1262deeae3a64b870a05f1988f64dfa146..dfabadeef9697f3729db5f8c0b5a7271ae3317fb 100644 (file)
--- a/Robust/src/Benchmarks/SSJava/EyeTracking/DeviationScanner.java
+++ b/Robust/src/Benchmarks/SSJava/EyeTracking/DeviationScanner.java
@@ -30,15 +30,15 @@ public class DeviationScanner {
   // RIGHT(-1, 0), LEFT_DOWN(\r
   // +1, +1), DOWN(0, +1), RIGHT_DOWN(-1, +1);\r
 \r
-  private static final Deviation LEFT_UP = new Deviation("NONE", +1, -1);\r
+  private static final Deviation LEFT_UP = new Deviation("LEFT_UP", +1, -1);\r
   private static final Deviation UP = new Deviation("UP", 0, -1);\r
   private static final Deviation RIGHT_UP = new Deviation("RIGHT_UP", -1, -1);\r
   private static final Deviation LEFT = new Deviation("LEFT", +1, 0);\r
   private static final Deviation NONE = new Deviation("NONE", 0, 0);\r
-  private static final Deviation RIGHT = new Deviation("NONE", -1, 0);\r
-  private static final Deviation LEFT_DOWN = new Deviation("NONE", +1, +1);\r
-  private static final Deviation DOWN = new Deviation("NONE", 0, +1);\r
-  private static final Deviation RIGHT_DOWN = new Deviation("NONE", -1, +1);\r
+  private static final Deviation RIGHT = new Deviation("RIGHT", -1, 0);\r
+  private static final Deviation LEFT_DOWN = new Deviation("LEFT_DOWN", +1, +1);\r
+  private static final Deviation DOWN = new Deviation("DOWN", 0, +1);\r
+  private static final Deviation RIGHT_DOWN = new Deviation("RIGHT_DOWN", -1, +1);\r
 \r
   private int size;\r
 \r
@@ -49,10 +49,10 @@ public class DeviationScanner {
 \r
   public void addEyePosition(EyePosition eyePosition) {\r
 \r
-    for (int i = eyePositions.length - 2; i >= 0; i--) {\r
-      eyePositions[i + 1] = eyePositions[i];\r
+    for (int i = 1; i < eyePositions.length; i++) {\r
+      eyePositions[i - 1] = eyePositions[i];\r
     }\r
-    eyePositions[0] = eyePosition;\r
+    eyePositions[eyePositions.length - 1] = eyePosition;\r
 \r
     if (size < eyePositions.length) {\r
       size++;\r
@@ -72,7 +72,6 @@ public class DeviationScanner {
       EyePosition lastEyePosition = null;\r
       for (int i = 0; i < 3; ++i) {\r
         EyePosition eyePosition = this.eyePositions[i];\r
-        System.out.println("lastEyePosition=" + lastEyePosition);\r
         if (lastEyePosition != null) {\r
           deviationX += (eyePosition.getX() - lastEyePosition.getX());\r
           deviationY += (eyePosition.getY() - lastEyePosition.getY());\r
@@ -98,6 +97,7 @@ public class DeviationScanner {
         deviationAbsoluteY = -1;\r
 \r
       deviation = getDirectionFor(deviationAbsoluteX, deviationAbsoluteY);\r
+\r
       if (deviation != NONE) {\r
         eyePositions = new EyePosition[3];\r
         size = 0;\r