Algorithmen Test

This commit is contained in:
2026-01-17 18:51:47 +01:00
parent 505aee6de7
commit 07212dcc97
8 changed files with 457 additions and 33 deletions

View File

@@ -1,6 +1,6 @@
import numpy as np
from ellipsoide import EllipsoidTriaxial
from .panou import louville_constant, func_sigma_ell, gha1_ana
from GHA_triaxial.panou import louville_constant, func_sigma_ell, gha1_ana
import plotly.graph_objects as go
import winkelumrechnungen as wu
@@ -19,24 +19,31 @@ def gha1_approx(ell: EllipsoidTriaxial, p0: np.ndarray, alpha0: float, s: float,
points = [p0]
alphas = [alpha0]
s_curr = 0.0
while s_curr < s:
ds_step = min(ds, s - s_curr)
if ds_step < 1e-8:
break
p1 = points[-1]
alpha1 = alphas[-1]
sigma = func_sigma_ell(ell, p1, alpha1)
p2 = p1 + ds_step * sigma
p2 = ell.point_onto_ellipsoid(p2)
ds_step = np.linalg.norm(p2 - p1)
points.append(p2)
dalpha = 1e-6
l2 = louville_constant(ell, p2, alpha1)
dl_dalpha = (louville_constant(ell, p2, alpha1+dalpha) - l2) / dalpha
alpha2 = alpha1 + (l0 - l2) / dl_dalpha
points.append(p2)
alphas.append(alpha2)
ds_step = np.linalg.norm(p2 - p1)
s_curr += ds_step
if s_curr > 10000000:
pass
if all_points:
return points[-1], alphas[-1], np.array(points)
@@ -71,10 +78,10 @@ def show_points(points: NDArray, p0: NDArray, p1: NDArray):
if __name__ == '__main__':
ell = EllipsoidTriaxial.init_name("BursaSima1980round")
P0 = ell.para2cart(0, 0)
alpha0 = wu.deg2rad(90)
s = 1000000
P1_ana, alpha1_ana = gha1_ana(ell, P0, alpha0, s, maxM=60, maxPartCircum=32)
P1_app, alpha1_app, points = gha1_approx(ell, P0, alpha0, s, ds=5000, all_points=True)
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_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))