diff --git a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Global.java b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Global.java index b6c054ea623e7223244421078a578c703b6383ac..1d5762d5c8867b57ac2dba800428f80dd963c6ac 100644 --- a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Global.java +++ b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/Global.java @@ -25,7 +25,7 @@ public class Global { 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_HIGH_ACCURACY_TOL = DBL_EPSILON * 5; private static final double M_TOL_POINTS_EQUAL = 1e-3; @@ -33,7 +33,9 @@ public class 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() { return M_HIGH_ACCURACY_TOL; @@ -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() { return M_TOL_VECTORS_PARALLEL; diff --git a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight.java b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight.java index 99676c03e5b9de047a22b5c65f66aa7348f3dca0..49f533960ead25a1f99a430547d5aab88a89237a 100644 --- a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight.java +++ b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight.java @@ -55,7 +55,7 @@ public class GmStraight { return dir; } - public boolean isColinear(GmStraight straight2, double angleEpsilon, double epsilon) { + public boolean isCollinear(GmStraight straight2, double angleEpsilon, double epsilon) { UnitVector3d rDir1 = getDir(); UnitVector3d rDir2 = straight2.getDir(); diff --git a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java index ebb1239356506fbb304fc2830299816f59f12ff4..7371efa59b23fff0ebf88af2f6d2328a5006cc65 100644 --- a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java +++ b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/GmStraight2d.java @@ -60,7 +60,7 @@ public class GmStraight2d { Vector2d r2Perpendicular = r2.getPerpendicularVector(); double diff = r1.dot(r2Perpendicular); - if (Math.abs(diff) < Global.getZeroAngleCosinus()) { + if (Math.abs(diff) < Global.getZeroAngleCosine()) { return GmStraight2dIntersectionResult.parallel(this, other); } else { double invR1DotPerpR2 = 1.0 / diff; diff --git a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java index 1baece193df0446e27e2d1847d3580dc6ec8e065..a013a05de40528f2e909a02413139e787666412a 100644 --- a/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java +++ b/CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/IntersectPlanarPolygons.java @@ -256,7 +256,7 @@ public class IntersectPlanarPolygons { // check if the straight of the HalfEdge is collinear to the intersection // straight; this might result in an embedded edge intersection result // 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; } @@ -276,7 +276,7 @@ public class IntersectPlanarPolygons { Vector2d diffVec = heStraight2d.getOrigin().minus(intersectingStraight2d.getOrigin()); double diffVecDotPerpDir = diffVec.dot(dir.getPerpendicularVector()); - if (Math.abs(diffVecDotPerpDir) < Global.getZeroAngleCosinus()) { + if (Math.abs(diffVecDotPerpDir) < Global.getZeroAngleCosine()) { // Straights are identical Point2d p1 = heStraight2d.getOrigin(); Point2d p2 = heStraight2d.getTarget();