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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Hendrik Möllersmann
2026-02-05 11:14:05 +01:00
parent 77c7a6f9ab 4689a77f37
commit c15de91154
2 changed files with 208 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GHA_triaxial/gha1_approx.py
View File

@@ -47,7 +47,7 @@ def gha1_approx(ell: EllipsoidTriaxial, p0: np.ndarray, alpha0: float, s: float,
pass
if all_points:
return points[-1], alphas[-1], np.array(points)
return points[-1], alphas[-1], np.array(points), np.array(alphas)
else:
return points[-1], alphas[-1]
@@ -82,7 +82,7 @@ if __name__ == '__main__':
P0 = ell.para2cart(0.2, 0.3)
alpha0 = wu.deg2rad(35)
s = 13000000
P1_app, alpha1_app, points = gha1_approx(ell, P0, alpha0, s, ds=10000, all_points=True)
P1_app, alpha1_app, points, alphas = gha1_approx(ell, P0, alpha0, s, ds=10000, all_points=True)
P1_ana, alpha1_ana = gha1_ana(ell, P0, alpha0, s, maxM=60, maxPartCircum=16)
show_points(points, P0, P1_ana)
print(np.linalg.norm(P1_app - P1_ana))