henreick
This commit is contained in:
@@ -117,9 +117,8 @@ def azimuth_at_ESpoint(P_prev: NDArray, P_curr: NDArray, E_hat_curr: NDArray, N_
|
|||||||
return wrap_to_pi(float(np.arctan2(sE, sN)))
|
return wrap_to_pi(float(np.arctan2(sE, sN)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def optimize_next_point(beta_i: float, omega_i: float, alpha_target: float, ds: float, gamma0: float,
|
def optimize_next_point(beta_i: float, omega_i: float, alpha_target: float, ds: float, gamma0: float,
|
||||||
ell: EllipsoidTriaxial, maxSegLen: float = 10000.0, sigma0: float = None) -> Tuple[float, float, NDArray, float]:
|
ell: EllipsoidTriaxial, maxSegLen: float = 1000.0, sigma0: float = None) -> Tuple[float, float, NDArray, float]:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
:param beta_i:
|
:param beta_i:
|
||||||
@@ -183,8 +182,17 @@ def optimize_next_point(beta_i: float, omega_i: float, alpha_target: float, ds:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
def gha1_ES(ell: EllipsoidTriaxial, beta0: float, omega0: float, alpha0: float, s_total: float, maxSegLen: float):
|
def gha1_ES(ell: EllipsoidTriaxial, beta0: float, omega0: float, alpha0: float, s_total: float, maxSegLen: float = 1000):
|
||||||
|
"""
|
||||||
|
|
||||||
|
:param ell:
|
||||||
|
:param beta0:
|
||||||
|
:param omega0:
|
||||||
|
:param alpha0:
|
||||||
|
:param s_total:
|
||||||
|
:param maxSegLen:
|
||||||
|
:return:
|
||||||
|
"""
|
||||||
beta = float(beta0)
|
beta = float(beta0)
|
||||||
omega = wrap_to_pi(float(omega0))
|
omega = wrap_to_pi(float(omega0))
|
||||||
alpha = wrap_to_pi(float(alpha0))
|
alpha = wrap_to_pi(float(alpha0))
|
||||||
@@ -227,7 +235,7 @@ if __name__ == "__main__":
|
|||||||
point1, alpha1 = gha1_ana(ell, P0, alpha0=alpha0, s=s, maxM=100, maxPartCircum=32)
|
point1, alpha1 = gha1_ana(ell, P0, alpha0=alpha0, s=s, maxM=100, maxPartCircum=32)
|
||||||
point1app, alpha1app = gha1_approx(ell, P0, alpha0=alpha0, s=s, ds=1000)
|
point1app, alpha1app = gha1_approx(ell, P0, alpha0=alpha0, s=s, ds=1000)
|
||||||
|
|
||||||
res, alpha = gha1_ES(ell, beta0=5/(180/np.pi), omega0=-90/(180/np.pi), alpha0=alpha0, s_total=s, maxSegLen=1000.0)
|
res, alpha = gha1_ES(ell, beta0=5/(180/np.pi), omega0=-90/(180/np.pi), alpha0=alpha0, s_total=s, maxSegLen=1000)
|
||||||
|
|
||||||
print(point1)
|
print(point1)
|
||||||
print(res)
|
print(res)
|
||||||
|
|||||||
Reference in New Issue
Block a user