Exceptions einheitlich

GHA_triaxial/gha1_approx.py

@@ -20,6 +20,7 @@ def gha1_approx(ell: EllipsoidTriaxial, p0: np.ndarray, alpha0: float, s: float,
     points = [p0]
     alphas = [alpha0]
     s_curr = 0.0
+    last_sigma = None
 
     while s_curr < s:
         ds_step = min(ds, s - s_curr)
@@ -30,6 +31,8 @@ def gha1_approx(ell: EllipsoidTriaxial, p0: np.ndarray, alpha0: float, s: float,
         alpha1 = alphas[-1]
 
         sigma = func_sigma_ell(ell, p1, alpha1)
+        if last_sigma is not None and np.linalg.norm(sigma - last_sigma) > 0.2:
+            raise Exception("GHA1_approx: Plötzlicher Richtungswechsel")
         p2 = p1 + ds_step * sigma
         p2 = ell.point_onto_ellipsoid(p2)
 
@@ -43,8 +46,8 @@ def gha1_approx(ell: EllipsoidTriaxial, p0: np.ndarray, alpha0: float, s: float,
 
         ds_step = np.linalg.norm(p2 - p1)
         s_curr += ds_step
-        if s_curr > 10000000:
-            pass
+        last_sigma = sigma
+        pass
 
     if all_points:
         return points[-1], alphas[-1], np.array(points), np.array(alphas)
@@ -79,10 +82,10 @@ def show_points(points: NDArray, p0: NDArray, p1: NDArray):
 
 if __name__ == '__main__':
     ell = EllipsoidTriaxial.init_name("BursaSima1980round")
-    P0 = ell.para2cart(0.2, 0.3)
-    alpha0 = wu.deg2rad(35)
-    s = 13000000
+    P0 = ell.ell2cart(wu.deg2rad(10), wu.deg2rad(1))
+    alpha0 = wu.deg2rad(2)
+    s = 100000
     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)
+    P1_ana, alpha1_ana = gha1_ana(ell, P0, alpha0, s, maxM=20, maxPartCircum=2)
     show_points(points, P0, P1_ana)
     print(np.linalg.norm(P1_app - P1_ana))