kiam-astro 6.0.7__cp311-cp311-win_amd64.whl → 6.0.8__cp311-cp311-win_amd64.whl

kiam_astro/optimal.py

@@ -958,7 +958,7 @@ def r2bp_pontr_mopt_bnd_f_rv(t: float, y: numpy.ndarray, stmreq: bool, fmax: flo
     Extended equations of motion:
     Two-body problem, position-velocity variables, bounded thrust force, mass-optimal problem.
 
-    Parameters
+    Parameters:
     -----------
 
     `t` : float
@@ -2026,7 +2026,7 @@ def objective_r2bp_pontr_mass_bnd_f_ee(z: numpy.ndarray, x0: numpy.ndarray, x1:
     ```
     """
 
-    f = residue_r2bp_pontr_mass_bnd_f_ee(z, x0, x1, fmax, vex, tof, switch_width, stmreq, mu, atol, rtol)
+    f = residue_r2bp_pontr_mass_bnd_f_ee(z, x0, x1, fmax, vex, tof, switch_width, mu, atol, rtol)
     return norm(f)**2
 def control_r2bp_pontr_mass_bnd_f_ee(y: numpy.ndarray, fmax: float, vex: float, switch_width: float):
     """
@@ -2337,57 +2337,3 @@ def estimate_tof(x0: numpy.ndarray, x1: numpy.ndarray, umax: float, mu: float =
     p1 = oe1[0] * (1 - oe1[1] ** 2)
     tof = (sqrt(mu / p0) - sqrt(mu / p1)) / umax
     return tof
-
-def test_rv():
-    units = kiam.units('sun')
-    x0 = numpy.array([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 80.0])
-    x1 = numpy.array([1.5, 0.0, 0.0, 0.0, 1 / numpy.sqrt(1.5), 0.0])
-    fmax = 14.8e-03 / units['AccUnit']
-    vex = 9.3 / units['VelUnit']
-    tof = 2.8 * numpy.pi
-    z0 = numpy.zeros(7, )
-    z0[0:3] = numpy.array([1.41454267e+02, -1.69272674e+00, -4.26704189e-23])
-    z0[3:6] = numpy.array([-1.69272675e+00, 1.41378451e+02, 2.47113618e-23])
-    z0[6] = 5.55630093e-01
-    switch_width = 2.5e-04
-    zopt, res, _ = solve_r2bp_pontr_mass_bnd_f_rv(x0, x1, fmax, vex, tof, switch_width, z0, 1.0, method='least-squares', atol=1e-10, rtol=1e-10)
-    print(f'Оптимальный вектор сопряженных переменных: {zopt}')
-    T, Y = propagate_r2bp_pontr_mass_bnd_f_rv(numpy.linspace(0.0, tof, 10000), numpy.concatenate((x0, zopt)), fmax, vex, switch_width)
-    fig = kiam.plot(Y[0, :], Y[1, :], None, 'x', 'y', axis_equal=True)
-    fig.show()
-    force_value, force_vector = control_r2bp_pontr_mass_bnd_f_rv(Y, fmax, vex, switch_width)
-    fig = kiam.plot(T, force_value, None, 't', 'f')
-    fig.show()
-    h = hamiltonian_r2bp_pontr_mass_bnd_f_rv(Y, fmax, vex, switch_width, 1.0)
-    fig = kiam.plot(T, h, None, 't', 'f')
-    fig.show()
-    print(f'Масса: {Y[6, 0]:.2f} ---> {Y[6, -1]:.2f}, затрачивается {(1 - Y[6, -1] / Y[6, 0]) * 100:.2f}%')
-def test_ee():
-    units = kiam.units('sun')
-    x0 = numpy.array([1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 80.0])
-    x1 = numpy.array([1.5, 0.0, 0.0, 0.0, 1 / numpy.sqrt(1.5), 0.0])
-    x0[0:6] = kiam.rv2ee(x0[0:6], 1.0, False)
-    x1 = kiam.rv2ee(x1, 1.0, False)
-    fmax = 14.8e-03 / units['AccUnit']
-    vex = 9.3 / units['VelUnit']
-    tof = 2.8 * numpy.pi
-    z0 = numpy.zeros(7, )
-    z0[0:3] = numpy.array([1.41530246e+02, -7.69020160e-02,  1.69380406e+00])
-    z0[5] = 8.25721397e-10
-    z0[6] = 5.55628531e-01
-    switch_width = 0.0
-    zopt, res = solve_r2bp_pontr_mass_bnd_f_ee(x0, x1, fmax, vex, tof, switch_width, z0, 1.0, method='least-squares', atol=1e-10, rtol=1e-10)
-    print(f'Оптимальный вектор сопряженных переменных: {zopt}')
-    T, Y = propagate_r2bp_pontr_mass_bnd_f_ee(numpy.linspace(0.0, tof, 10000), numpy.concatenate((x0, zopt)), fmax, vex, switch_width)
-    RV = kiam.ee2rv(Y[0:6, :], 1.0, False)
-    fig = kiam.plot(RV[0, :], RV[1, :], None, 'x', 'y', axis_equal=True)
-    fig.show()
-    force_value, force_vector = control_r2bp_pontr_mass_bnd_f_ee(Y, fmax, vex, switch_width)
-    fig = kiam.plot(T, force_value, None, 't', 'f')
-    fig.show()
-    h = hamiltonian_r2bp_pontr_mass_bnd_f_ee(Y, fmax, vex, switch_width, 1.0)
-    fig = kiam.plot(T, h, None, 't', 'f')
-    fig.show()
-    print(f'Масса: {Y[6, 0]:.2f} ---> {Y[6, -1]:.2f}, затрачивается {(1 - Y[6, -1] / Y[6, 0]) * 100:.2f}%')
-
-test_ee()

{kiam_astro-6.0.7.dist-info → kiam_astro-6.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kiam-astro
-Version: 6.0.7
+Version: 6.0.8
 Summary: KIAM Astrodynamics Toolbox
 Home-page: https://github.com/shmaxg/KIAMToolbox
 Author: Maksim Shirobokov

{kiam_astro-6.0.7.dist-info → kiam_astro-6.0.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 kiam_astro/dace.py,sha256=QhTK6ZNitEr_fIapBo84_CTQLi8ui1_IpsgI-rAkpHU,42721
-kiam_astro/FKIAMToolbox.cp311-win_amd64.pyd,sha256=72mCftUiturDRwDlKe8Id-QROmxD4oYSk1tSCHo-I-0,321536
+kiam_astro/FKIAMToolbox.cp311-win_amd64.pyd,sha256=-U1ki5j6bymG9rTFh5k89iTjDLCNOaNYJ0GaZ6xlpyU,321536
 kiam_astro/JPLEPH,sha256=aB_-XyPHuwyVjtH-a_E0KRL9aQxG5IKdbTBV0yQ_s2g,74468736
 kiam_astro/kiam.py,sha256=171bMkKI6D4HhdBc5lT1CncRe0THdiafiIGhX9I6rGg,210201
-kiam_astro/optimal.py,sha256=0NIxIeuPoml_EggKRucegMiQbTRSgSknKvxHUB9_ocE,70554
+kiam_astro/optimal.py,sha256=fGGzG9qvdO9n9UqpYd93hKyWiBmkle7LOZ5wVFCbAV8,67625
 kiam_astro/trajectory.py,sha256=b4MdrT-bRJvGgQN2Ln_uaUQchuoRMUKWmxMDNtLaP7o,94477
 kiam_astro/__init__.py,sha256=rKfNulUOTqYZ6q8wwuPTTlkn29Rks_5hLtzdAmc5xFQ,330
 kiam_astro/images/Earth.jpg,sha256=kpalQJ5CV7K6Ch5kOAisL-QdcXNxwwgyoQaDFutEdKs,109661
@@ -10,11 +10,11 @@ kiam_astro/images/Earth2.jpg,sha256=W1TMWGxsvysodi701AEfbPQieouTpje4GKDFQJDObCw,
 kiam_astro/images/Moon - Plate Caree Projection.jpg,sha256=rJ347Lqza2Ya4dzJGGg0xqi89qbBhcIbllXp78zAczY,151314
 kiam_astro/images/Moon1.jpg,sha256=eWyMqBjGonmhVYqU4weAd-n4Nsw3cywScLQxtCFSjcc,541900
 kiam_astro/images/Moon2.jpg,sha256=fv03jz1mpcmlRK4Y7-AayyC6m-wtEIIpDUddORGhhyE,245713
-kiam_astro-6.0.7.dist-info/DELVEWHEEL,sha256=LzS3S8-_bYTE7LnpOxMCES4-H8FVblPsKAzzqawlIOY,222
-kiam_astro-6.0.7.dist-info/METADATA,sha256=9p3Tv4zaL2IV6MM7odbtiLQ6pxmRzBPUljVoa0nN0Zc,1321
-kiam_astro-6.0.7.dist-info/RECORD,,
-kiam_astro-6.0.7.dist-info/top_level.txt,sha256=qNlsAYWQr6J_l2w9AhaNb0r02w-JJF1ccO0uB5FVKpo,17
-kiam_astro-6.0.7.dist-info/WHEEL,sha256=U4Q8B8nLmo6Sd27xJLdTpEbQfCLTtXIbLhvUDHobvIE,102
-kiam_astro.libs/libMathAndP.KCBHYULMHMDE63WRVB7DHUMKW2SH6367.gfortran-win_amd64-c9c106af8ff67abea1d3a3b079643807.dll,sha256=ycEGr4_2er6h06OweWQ4B-tkETUOsr0V3-fXmP8h3aI,2362893
+kiam_astro-6.0.8.dist-info/DELVEWHEEL,sha256=LzS3S8-_bYTE7LnpOxMCES4-H8FVblPsKAzzqawlIOY,222
+kiam_astro-6.0.8.dist-info/METADATA,sha256=Ec6Zil8bxoyZYO2gdoswc7nffRuA6tZrycczqR5bYq4,1321
+kiam_astro-6.0.8.dist-info/RECORD,,
+kiam_astro-6.0.8.dist-info/top_level.txt,sha256=qNlsAYWQr6J_l2w9AhaNb0r02w-JJF1ccO0uB5FVKpo,17
+kiam_astro-6.0.8.dist-info/WHEEL,sha256=U4Q8B8nLmo6Sd27xJLdTpEbQfCLTtXIbLhvUDHobvIE,102
+kiam_astro.libs/libMathAndP.NUETR3I7GYNVL2EE46PJHCKVGI4LBW5G.gfortran-win_amd64-7c9d0f2ddc1fc49b42de02176ec5d33c.dll,sha256=fJ0PLdwfxJtC3gIXbsXTPApt7llPM7nqDfSdEycOtY8,2362893
 tests/test_kiam_basic.py,sha256=OrPukJOxtUecKzQNKKKXulaS8W6ocYHeIQoBTBp877s,26838
 tests/__init__.py,sha256=rKfNulUOTqYZ6q8wwuPTTlkn29Rks_5hLtzdAmc5xFQ,330