Commit 359d9703 authored by Riegel's avatar Riegel
Browse files

Fixed typos in method names

parent 471303c8
...@@ -25,7 +25,7 @@ public class Global { ...@@ -25,7 +25,7 @@ public class Global {
private static final double DBL_EPSILON = 2.2204460492503131e-16; private static final double DBL_EPSILON = 2.2204460492503131e-16;
private static final double M_ZERO_ANGLE_COSINUS = 1.0e-9; private static final double M_ZERO_ANGLE_COSINE = 1.0e-9;
private static final double M_TOL_VECTORS_PARALLEL = 1e-9; private static final double M_TOL_VECTORS_PARALLEL = 1e-9;
private static final double M_HIGH_ACCURACY_TOL = DBL_EPSILON * 5; private static final double M_HIGH_ACCURACY_TOL = DBL_EPSILON * 5;
private static final double M_TOL_POINTS_EQUAL = 1e-3; private static final double M_TOL_POINTS_EQUAL = 1e-3;
...@@ -33,7 +33,9 @@ public class Global { ...@@ -33,7 +33,9 @@ public class Global {
private Global() { private Global() {
} }
public static double getTolPointsEquals() { return M_TOL_POINTS_EQUAL; } public static double getTolPointsEquals() {
return M_TOL_POINTS_EQUAL;
}
public static double getHighAccuracyTolerance() { public static double getHighAccuracyTolerance() {
return M_HIGH_ACCURACY_TOL; return M_HIGH_ACCURACY_TOL;
...@@ -49,7 +51,7 @@ public class Global { ...@@ -49,7 +51,7 @@ public class Global {
}; };
} }
public static double getZeroAngleCosinus() { return M_ZERO_ANGLE_COSINUS; } public static double getZeroAngleCosine() { return M_ZERO_ANGLE_COSINE; }
public static double getTolVectorsParallel() { public static double getTolVectorsParallel() {
return M_TOL_VECTORS_PARALLEL; return M_TOL_VECTORS_PARALLEL;
......
...@@ -55,7 +55,7 @@ public class GmStraight { ...@@ -55,7 +55,7 @@ public class GmStraight {
return dir; return dir;
} }
public boolean isColinear(GmStraight straight2, double angleEpsilon, double epsilon) { public boolean isCollinear(GmStraight straight2, double angleEpsilon, double epsilon) {
UnitVector3d rDir1 = getDir(); UnitVector3d rDir1 = getDir();
UnitVector3d rDir2 = straight2.getDir(); UnitVector3d rDir2 = straight2.getDir();
......
...@@ -60,7 +60,7 @@ public class GmStraight2d { ...@@ -60,7 +60,7 @@ public class GmStraight2d {
Vector2d r2Perpendicular = r2.getPerpendicularVector(); Vector2d r2Perpendicular = r2.getPerpendicularVector();
double diff = r1.dot(r2Perpendicular); double diff = r1.dot(r2Perpendicular);
if (Math.abs(diff) < Global.getZeroAngleCosinus()) { if (Math.abs(diff) < Global.getZeroAngleCosine()) {
return GmStraight2dIntersectionResult.parallel(this, other); return GmStraight2dIntersectionResult.parallel(this, other);
} else { } else {
double invR1DotPerpR2 = 1.0 / diff; double invR1DotPerpR2 = 1.0 / diff;
......
...@@ -256,7 +256,7 @@ public class IntersectPlanarPolygons { ...@@ -256,7 +256,7 @@ public class IntersectPlanarPolygons {
// check if the straight of the HalfEdge is collinear to the intersection // check if the straight of the HalfEdge is collinear to the intersection
// straight; this might result in an embedded edge intersection result // straight; this might result in an embedded edge intersection result
// TODO MW: really needed? this check is also made some lines above // TODO MW: really needed? this check is also made some lines above
if (heStraight.isColinear(intersectingStraight, angleEpsilon, epsilon)) { if (heStraight.isCollinear(intersectingStraight, angleEpsilon, epsilon)) {
currHESharesAPntWithTheOtherPolygon = false; currHESharesAPntWithTheOtherPolygon = false;
} }
...@@ -276,7 +276,7 @@ public class IntersectPlanarPolygons { ...@@ -276,7 +276,7 @@ public class IntersectPlanarPolygons {
Vector2d diffVec = heStraight2d.getOrigin().minus(intersectingStraight2d.getOrigin()); Vector2d diffVec = heStraight2d.getOrigin().minus(intersectingStraight2d.getOrigin());
double diffVecDotPerpDir = diffVec.dot(dir.getPerpendicularVector()); double diffVecDotPerpDir = diffVec.dot(dir.getPerpendicularVector());
if (Math.abs(diffVecDotPerpDir) < Global.getZeroAngleCosinus()) { if (Math.abs(diffVecDotPerpDir) < Global.getZeroAngleCosine()) {
// Straights are identical // Straights are identical
Point2d p1 = heStraight2d.getOrigin(); Point2d p1 = heStraight2d.getOrigin();
Point2d p2 = heStraight2d.getTarget(); Point2d p2 = heStraight2d.getTarget();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment