changes: 1) fixes problems in the original EyeTracking benchmark 2) fix a bug in...

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

diff --git a/Robust/src/Benchmarks/SSJava/EyeTracking/LEA.java b/Robust/src/Benchmarks/SSJava/EyeTracking/LEA.java
index ea5f7e08a15210c7b41091d12fe27e3d89e3f845..3197ac346b65d411f101ce459bbe4ba80b838754 100644 (file)
--- a/Robust/src/Benchmarks/SSJava/EyeTracking/LEA.java
+++ b/Robust/src/Benchmarks/SSJava/EyeTracking/LEA.java
@@ -57,7 +57,7 @@ public class LEA {
   @LOC("IMPL")
   private LEAImplementation implementation;
   @LOC("LAST")
-  private FaceAndEyePosition lastPositions = new FaceAndEyePosition(null, null);
+  private FaceAndEyePosition lastPositions = new FaceAndEyePosition(-1,-1,-1,-1, null);
   @LOC("DEV")
   private DeviationScanner deviationScanner = new DeviationScanner();
 
@@ -94,9 +94,8 @@ public class LEA {
 
     @LOC("C") int i = 0;
 
-    SSJAVA: while (i < 37) {
-      @LOC("IMG") Image image = ImageReader.readImage("data/b" + i + ".bmp");
-      i++;
+    SSJAVA: while (true) {
+      @LOC("IMG") Image image =  ImageReader.getImage();
       if (image == null) {
         break;
       }
@@ -106,18 +105,19 @@ public class LEA {
     System.out.println("Done.");
 
   }
+  
 
   private void processImage(@LOC("IN") Image image) {
     @LOC("THIS,LEA.POS") FaceAndEyePosition positions = implementation.getEyePosition(image);
-//    if (positions.getEyePosition() != null) {
-      deviationScanner.addEyePosition(positions.getEyePosition());
-      @LOC("THIS,LEA.DEV,DeviationScanner.DEV") int deviation =
-          deviationScanner.scanForDeviation(positions.getFacePosition());// positions.getEyePosition().getDeviation(lastPositions.getEyePosition());
-      if (deviation != DeviationScanner.NONE) {
-        System.out.println("deviation=" + deviationScanner.toStringDeviation(deviation));
-        // notifyEyeMovementListenerEyeMoved(deviation);
-      }
-//    }
+    // if (positions.getEyePosition() != null) {
+    deviationScanner.addEyePosition(positions.getEyePosition());
+    @LOC("THIS,LEA.DEV,DeviationScanner.DEV") int deviation =
+        deviationScanner.scanForDeviation(positions.getFacePosition());// positions.getEyePosition().getDeviation(lastPositions.getEyePosition());
+    if (deviation != DeviationScanner.NONE) {
+      System.out.println("deviation=" + deviationScanner.toStringDeviation(deviation));
+      // notifyEyeMovementListenerEyeMoved(deviation);
+    }
+    // }
     lastPositions = positions;
   }