projects
/
IRC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes: generated annotated code but it still causes type errors + re-formatting...
[IRC.git]
/
Robust
/
src
/
Benchmarks
/
SSJava
/
EyeTrackingInfer
/
DeviationScanner.java
diff --git
a/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
b/Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
index 4cc353e02d7ba3f92b068672561ef7e8d442c553..6da3f7e1d4a121f4309335eb6bcaec8c36c88c94 100644
(file)
--- a/
Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
+++ b/
Robust/src/Benchmarks/SSJava/EyeTrackingInfer/DeviationScanner.java
@@
-23,10
+23,8
@@
* @author Florian Frankenberger
\r
*/
\r
\r
* @author Florian Frankenberger
\r
*/
\r
\r
-
\r
public class DeviationScanner {
\r
\r
public class DeviationScanner {
\r
\r
-
\r
private EyePosition eyePositions[];
\r
\r
// LEFT_UP(+1, -1), UP(0, -1), RIGHT_UP(-1, -1), LEFT(+1, 0), NONE(0, 0),
\r
private EyePosition eyePositions[];
\r
\r
// LEFT_UP(+1, -1), UP(0, -1), RIGHT_UP(-1, -1), LEFT(+1, 0), NONE(0, 0),
\r
@@
-47,8
+45,7
@@
public class DeviationScanner {
eyePositions = new EyePosition[3];
\r
}
\r
\r
eyePositions = new EyePosition[3];
\r
}
\r
\r
-
\r
- public void addEyePosition( EyePosition eyePosition) {
\r
+ public void addEyePosition(EyePosition eyePosition) {
\r
\r
// for ( int i = 1; i < 3; i++) {
\r
// eyePositions[i - 1] = eyePositions[i];
\r
\r
// for ( int i = 1; i < 3; i++) {
\r
// eyePositions[i - 1] = eyePositions[i];
\r
@@
-60,24
+57,23
@@
public class DeviationScanner {
\r
}
\r
\r
\r
}
\r
\r
- //
\r
-
\r
-
\r
- public int scanForDeviation( Rectangle2D faceRect) {
\r
+ //
\r
+
\r
+ public int scanForDeviation(Rectangle2D faceRect) {
\r
\r
\r
-
int deviation = NONE;
\r
+ int deviation = NONE;
\r
\r
\r
- for (
int i = 0; i < 3; i++) {
\r
+ for (int i = 0; i < 3; i++) {
\r
if (eyePositions[i] == null) {
\r
return deviation;
\r
}
\r
}
\r
\r
if (eyePositions[i] == null) {
\r
return deviation;
\r
}
\r
}
\r
\r
-
double deviationX = 0;
\r
-
double deviationY = 0;
\r
+ double deviationX = 0;
\r
+ double deviationY = 0;
\r
\r
\r
-
int lastIdx = -1;
\r
- for (
int i = 0; i < 3; ++i) {
\r
+ int lastIdx = -1;
\r
+ for (int i = 0; i < 3; ++i) {
\r
if (lastIdx != -1) {
\r
deviationX += (eyePositions[i].getX() - eyePositions[lastIdx].getX());
\r
deviationY += (eyePositions[i].getY() - eyePositions[lastIdx].getY());
\r
if (lastIdx != -1) {
\r
deviationX += (eyePositions[i].getX() - eyePositions[lastIdx].getX());
\r
deviationY += (eyePositions[i].getY() - eyePositions[lastIdx].getY());
\r
@@
-85,14
+81,14
@@
public class DeviationScanner {
lastIdx = i;
\r
}
\r
\r
lastIdx = i;
\r
}
\r
\r
-
final double deviationPercentX = 0.04;
\r
-
final double deviationPercentY = 0.04;
\r
+ final double deviationPercentX = 0.04;
\r
+ final double deviationPercentY = 0.04;
\r
\r
deviationX /= faceRect.getWidth();
\r
deviationY /= faceRect.getWidth();
\r
\r
\r
deviationX /= faceRect.getWidth();
\r
deviationY /= faceRect.getWidth();
\r
\r
-
int deviationAbsoluteX = 0;
\r
-
int deviationAbsoluteY = 0;
\r
+ int deviationAbsoluteX = 0;
\r
+ int deviationAbsoluteY = 0;
\r
if (deviationX > deviationPercentX)
\r
deviationAbsoluteX = 1;
\r
if (deviationX < -deviationPercentX)
\r
if (deviationX > deviationPercentX)
\r
deviationAbsoluteX = 1;
\r
if (deviationX < -deviationPercentX)
\r
@@
-114,8
+110,7
@@
public class DeviationScanner {
return deviation;
\r
}
\r
\r
return deviation;
\r
}
\r
\r
-
\r
- public int getDirectionFor( int directionX, int directionY) {
\r
+ public int getDirectionFor(int directionX, int directionY) {
\r
\r
if (directionX == +1 && directionY == -1) {
\r
return LEFT_UP;
\r
\r
if (directionX == +1 && directionY == -1) {
\r
return LEFT_UP;
\r
@@
-145,7
+140,7
@@
public class DeviationScanner {
eyePositions = new EyePosition[3];
\r
}
\r
\r
eyePositions = new EyePosition[3];
\r
}
\r
\r
- public String toStringDeviation(
int dev) {
\r
+ public String toStringDeviation(int dev) {
\r
if (dev == LEFT_UP) {
\r
return "LEFT_UP";
\r
} else if (dev == UP) {
\r
if (dev == LEFT_UP) {
\r
return "LEFT_UP";
\r
} else if (dev == UP) {
\r