summaryrefslogtreecommitdiff
path: root/geometry
diff options
context:
space:
mode:
authorMZuenni <michi.zuendorf@gmail.com>2023-03-01 11:36:26 +0100
committerMZuenni <michi.zuendorf@gmail.com>2023-03-01 11:36:26 +0100
commit12afe719ce268bb10aa93a910079a44eb08999b8 (patch)
tree0937a117287eebe3942e0506d27143eff4980d09 /geometry
parentad8456f7c5d44d3c647b3a368050a5d2f39ae3c3 (diff)
removed trailing whitespaces and use more structured bindings
Diffstat (limited to 'geometry')
-rw-r--r--geometry/antipodalPoints.cpp2
-rw-r--r--geometry/circle.cpp4
-rw-r--r--geometry/closestPair.cpp2
-rw-r--r--geometry/linesAndSegments.cpp4
-rw-r--r--geometry/polygon.cpp2
-rw-r--r--geometry/segmentIntersection.cpp10
-rw-r--r--geometry/spheres.cpp2
7 files changed, 13 insertions, 13 deletions
diff --git a/geometry/antipodalPoints.cpp b/geometry/antipodalPoints.cpp
index db39b39..110cc74 100644
--- a/geometry/antipodalPoints.cpp
+++ b/geometry/antipodalPoints.cpp
@@ -4,7 +4,7 @@ vector<pair<int, int>> antipodalPoints(vector<pt>& h) {
for (int i = 0, j = 1; i < j; i++) {
while (true) {
result.push_back({i, j});
- if (cross(h[(i + 1) % sz(h)] - h[i],
+ if (cross(h[(i + 1) % sz(h)] - h[i],
h[(j + 1) % sz(h)] - h[j]) <= 0) break;
j = (j + 1) % sz(h);
}}
diff --git a/geometry/circle.cpp b/geometry/circle.cpp
index f48e09a..8ebc800 100644
--- a/geometry/circle.cpp
+++ b/geometry/circle.cpp
@@ -1,6 +1,6 @@
// berechnet die Schnittpunkte von zwei kreisen
// (Kreise dürfen nicht gleich sein!)
-vector<pt> circleIntersection(pt c1, double r1,
+vector<pt> circleIntersection(pt c1, double r1,
pt c2, double r2) {
double d = abs(c1 - c2);
if (d < abs(r1 - r2) || d > abs(r1 + r2)) return {};
@@ -14,7 +14,7 @@ vector<pt> circleIntersection(pt c1, double r1,
// berechnet die Schnittpunkte zwischen
// einem Kreis(Kugel) und einer Grade 2d und 3d
-vector<pt> circleRayIntersection(pt center, double r,
+vector<pt> circleRayIntersection(pt center, double r,
pt orig, pt dir) {
vector<pt> result;
double a = dot(dir, dir);
diff --git a/geometry/closestPair.cpp b/geometry/closestPair.cpp
index 6cde5ae..a2c91b3 100644
--- a/geometry/closestPair.cpp
+++ b/geometry/closestPair.cpp
@@ -1,5 +1,5 @@
bool compY(pt a, pt b) {
- return (imag(a) == imag(b)) ? real(a) < real(b)
+ return (imag(a) == imag(b)) ? real(a) < real(b)
: imag(a) < imag(b);
}
diff --git a/geometry/linesAndSegments.cpp b/geometry/linesAndSegments.cpp
index d298fde..ba6c468 100644
--- a/geometry/linesAndSegments.cpp
+++ b/geometry/linesAndSegments.cpp
@@ -10,7 +10,7 @@ bool lineSegmentIntersection(pt a, pt b, pt c, pt d) {
}
// Berechnet die Schnittpunkte der Strecken p0-p1 und p2-p3.
-// Enthält entweder keinen Punkt, den einzigen Schnittpunkt
+// Enthält entweder keinen Punkt, den einzigen Schnittpunkt
// oder die Endpunkte der Schnittstrecke.
vector<pt> lineSegmentIntersection(pt p0, pt p1, pt p2, pt p3) {
double a = cross(p1 - p0, p3 - p2);
@@ -53,7 +53,7 @@ bool lineIntersection(pt a, pt b, pt c, pt d) {
}
// Berechnet den Schnittpunkt der Graden p0-p1 und p2-p3.
-// die Graden dürfen nicht parallel sein!
+// die Graden dürfen nicht parallel sein!
pt lineIntersection(pt p0, pt p1, pt p2, pt p3) {
double a = cross(p1 - p0, p3 - p2);
double b = cross(p2 - p0, p3 - p2);
diff --git a/geometry/polygon.cpp b/geometry/polygon.cpp
index 8b943a6..f562b7a 100644
--- a/geometry/polygon.cpp
+++ b/geometry/polygon.cpp
@@ -91,7 +91,7 @@ double dist(const vector<pt>& ps, const vector<pt>& qs) {
return res;
}
-bool left(pt of, pt p) {return cross(p, of) < 0 ||
+bool left(pt of, pt p) {return cross(p, of) < 0 ||
(cross(p, of) == 0 && dot(p, of) > 0);}
// convex hulls without duplicates, hull[0] == hull.back() and
diff --git a/geometry/segmentIntersection.cpp b/geometry/segmentIntersection.cpp
index b2e3ac4..6dc5dc5 100644
--- a/geometry/segmentIntersection.cpp
+++ b/geometry/segmentIntersection.cpp
@@ -12,7 +12,7 @@ struct seg {
return imag(a) < imag(o.a);
}
};
-
+
struct event {
pt p;
int id, type;
@@ -22,16 +22,16 @@ struct event {
return imag(p) < imag(o.p);
}
};
-
+
bool lessPT(const pt& a, const pt& b) {
return real(a) != real(b) ? real(a) < real(b)
: imag(a) < imag(b);
}
-
+
bool intersect(const seg& a, const seg& b) {
return lineSegmentIntersection(a.a, a.b, b.a, b.b);
}
-
+
pair<int, int> intersect(vector<seg>& segs) {
vector<event> events;
for (seg& s : segs) {
@@ -40,7 +40,7 @@ pair<int, int> intersect(vector<seg>& segs) {
events.push_back({s.b, s.id, -1});
}
sort(all(events));
-
+
set<seg> q;
vector<set<seg>::iterator> where(sz(segs));
for (auto e : events) {
diff --git a/geometry/spheres.cpp b/geometry/spheres.cpp
index 01c54de..abffde5 100644
--- a/geometry/spheres.cpp
+++ b/geometry/spheres.cpp
@@ -1,5 +1,5 @@
// Great Cirlce Distance mit Längen- und Breitengrad.
-double gcDist(double pLat, double pLon,
+double gcDist(double pLat, double pLon,
double qLat, double qLon, double radius) {
pLat *= PI / 180; pLon *= PI / 180;
qLat *= PI / 180; qLon *= PI / 180;