he2851/Masterprojekt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc-Strings und Type-Hinting

Browse Source
This commit is contained in:
Hendrik Möllersmann
2026-01-13 11:09:12 +01:00
parent 8507ca1afa
commit efd1b8c5fb
9 changed files with 235 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
GHA_triaxial/approx_gha2.py
View File

@@ -27,7 +27,7 @@ def gha2(ell: EllipsoidTriaxial, p0: NDArray, p1: NDArray, ds: float, all_points
new_points.append(points[i])
pi = points[i] + 1/2 * (points[i+1] - points[i])
pi = ell.cartonell(pi)
pi = ell.point_onto_ellipsoid(pi)
new_points.append(pi)
@@ -39,11 +39,11 @@ def gha2(ell: EllipsoidTriaxial, p0: NDArray, p1: NDArray, ds: float, all_points
if np.average(elements) < ds:
break
p0i = ell.cartonell(p0 + ds/100 * (points[1] - p0) / np.linalg.norm(points[1] - p0))
p0i = ell.point_onto_ellipsoid(p0 + ds / 100 * (points[1] - p0) / np.linalg.norm(points[1] - p0))
sigma0 = (p0i - p0) / np.linalg.norm(p0i - p0)
alpha0 = sigma2alpha(ell, sigma0, p0)
p1i = ell.cartonell(p1 - ds/100 * (p1 - points[-2]) / np.linalg.norm(p1 - points[-2]))
p1i = ell.point_onto_ellipsoid(p1 - ds / 100 * (p1 - points[-2]) / np.linalg.norm(p1 - points[-2]))
sigma1 = (p1 - p1i) / np.linalg.norm(p1 - p1i)
alpha1 = sigma2alpha(ell, sigma1, p1)
@@ -55,6 +55,13 @@ def gha2(ell: EllipsoidTriaxial, p0: NDArray, p1: NDArray, ds: float, all_points
return alpha0, alpha1, s
def show_points(points: NDArray, points_app: NDArray, p0: NDArray, p1: NDArray):
"""
Anzeigen der Punkte
:param points: wahre Punkte der Linie
:param points_app: approximierte Punkte der Linie
:param p0: wahrer Startpunkt
:param p1: wahrer Endpunkt
"""
fig = go.Figure()
fig.add_scatter3d(x=points[:, 0], y=points[:, 1], z=points[:, 2],