merge mzuenni changes

1 files changed, 15 insertions, 15 deletions

diff --git a/content/geometry/spheres.cpp b/content/geometry/spheres.cpp
index ec22262..d34bca9 100644
--- a/content/geometry/spheres.cpp
+++ b/content/geometry/spheres.cpp
@@ -1,3 +1,16 @@
+// 3D Punkt in kartesischen Koordinaten.
+struct point{
+	double x, y, z;
+	point() {}
+	point(double x, double y, double z) : x(x), y(y), z(z) {}
+	point(double lat, double lon) {
+		lat *= PI / 180.0; lon *= PI / 180.0;
+		x = cos(lat) * sin(lon);
+		y = cos(lat) * cos(lon);
+		z = sin(lat);
+	}
+};
+
 // Great Circle Distance mit Längen- und Breitengrad.
 double gcDist(double pLat, double pLon,
 	          double qLat, double qLon, double radius) {
@@ -11,19 +24,6 @@ double gcDist(double pLat, double pLon,
 }
 
 // Great Circle Distance mit kartesischen Koordinaten.
-double gcDist(point p, point q) {
+double gcDist(point p, point q) { // radius = 1
 	return acos(p.x * q.x + p.y * q.y + p.z * q.z);
-}
-
-// 3D Punkt in kartesischen Koordinaten.
-struct point{
-	double x, y, z;
-	point() {}
-	point(double x, double y, double z) : x(x), y(y), z(z) {}
-	point(double lat, double lon) {
-		lat *= PI / 180.0; lon *= PI / 180.0;
-		x = cos(lat) * sin(lon);
-		y = cos(lat) * cos(lon);
-		z = sin(lat);
-	}
-};
+}
\ No newline at end of file