Merge pull request #35 from esa/pl2pl

Pl2pl
esa · Jul 8, 2024 · cac378f · cac378f
2 parents 0291a30 + 2b0821e
commit cac378f
Show file tree

Hide file tree

Showing 14 changed files with 909 additions and 520 deletions.
diff --git a/benchmark/notebooks/sf_gradient.ipynb b/benchmark/notebooks/sf_gradient.ipynb
diff --git a/doc/notebooks/interface_to_spice.ipynb b/doc/notebooks/interface_to_spice.ipynb
@@ -322,7 +322,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

diff --git a/doc/notebooks/udp_pl2pl.ipynb b/doc/notebooks/udp_pl2pl.ipynb
diff --git a/doc/notebooks/udp_point2point.ipynb b/doc/notebooks/udp_point2point.ipynb
diff --git a/doc/trajopt.rst b/doc/trajopt.rst
@@ -18,5 +18,7 @@ Direct
 .. autoclass:: direct_point2point
     :members: pretty, plot
 
+.. autoclass:: direct_pl2pl
+    :members: pretty, plot
 
 
diff --git a/pykep/expose_udplas.cpp b/pykep/expose_udplas.cpp
@@ -40,12 +40,12 @@ void expose_all_udplas(py::module &udpla_module, py::class_<kep3::planet> &plane
     keplerian_udpla
         .def(py::init<const kep3::epoch &, const std::array<double, 6> &, double, std::string, std::array<double, 3>,
                       kep3::elements_type>(),
-             py::arg("ep"), py::arg("elem"), py::arg("mu_central_body"), py::arg("name") = "unknown",
+             py::arg("when"), py::arg("elem"), py::arg("mu_central_body"), py::arg("name") = "unknown",
              py::arg("added_params") = std::array<double, 3>({-1, -1, -1}),
              py::arg("el_type") = kep3::elements_type::KEP_F, pykep::udpla_keplerian_from_elem_docstring().c_str())
         .def(py::init<const kep3::epoch &, const std::array<std::array<double, 3>, 2> &, double, std::string,
                       std::array<double, 3>>(),
-             py::arg("ep"), py::arg("posvel"), py::arg("mu_central_body"), py::arg("name") = "unknown",
+             py::arg("when"), py::arg("posvel"), py::arg("mu_central_body"), py::arg("name") = "unknown",
              py::arg("added_params") = std::array<double, 3>({-1, -1, -1}),
              pykep::udpla_keplerian_from_posvel_docstring().c_str())
         // repr().

diff --git a/pykep/plot/_sf_leg.py b/pykep/plot/_sf_leg.py
@@ -69,9 +69,9 @@ def add_sf_leg(
         dv = _np.linalg.norm(throttles) * c / mass_fwd
         # plot it in a color that is proportional to the strength from royalblue to indianred
         color = (
-            0.25 + (0.80 - 0.25) * min(1.0, _np.linalg.norm(throttles)),
-            0.41 + (0.36 - 0.41) * min(1.0, _np.linalg.norm(throttles)),
-            0.88 + (0.36 - 0.88) * min(1.0, _np.linalg.norm(throttles)),
+            0.25 + (1. - 0.25) * min(1.0, _np.linalg.norm(throttles)),
+            0.41 + (0. - 0.41) * min(1.0, _np.linalg.norm(throttles)),
+            0.88 + (0. - 0.88) * min(1.0, _np.linalg.norm(throttles)),
         )
         _pk.plot.add_ballistic_arc(
             ax, rv, dt / 2, sf.mu, units=units, N=N, c=color, **kwargs

diff --git a/pykep/test.py b/pykep/test.py
@@ -116,7 +116,7 @@ class planet_test(_ut.TestCase):
     def test_planet_construction(self):
         import pykep as pk
 
-        udpla_cpp = pk.udpla.keplerian(ep = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.)
+        udpla_cpp = pk.udpla.keplerian(when = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.)
         udpla_py = my_udpla()
         pla1 = pk.planet(udpla_cpp)
         pla2 = pk.planet(udpla_py)
@@ -130,7 +130,7 @@ def test_planet_construction(self):
     def test_udpla_extraction(self):
         import pykep as pk
 
-        udpla_cpp = pk.udpla.keplerian(ep = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.)
+        udpla_cpp = pk.udpla.keplerian(when = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.)
         udpla_py = my_udpla()
         pla1 = pk.planet(udpla_cpp)
         pla2 = pk.planet(udpla_py)
@@ -146,7 +146,7 @@ def test_udpla_extraction(self):
     def test_udpla_getters(self):
         import pykep as pk
 
-        udpla_cpp = pk.udpla.keplerian(ep = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.56, added_params=[3., 2., 2.1])
+        udpla_cpp = pk.udpla.keplerian(when = pk.epoch(0), elem = [1.,0.,0.,0.,0.,0.], mu_central_body = 1.56, added_params=[3., 2., 2.1])
         udpla_py = my_udpla()
         pla1 = pk.planet(udpla_cpp)
         pla2 = pk.planet(udpla_py)

diff --git a/pykep/trajopt/CMakeLists.txt b/pykep/trajopt/CMakeLists.txt
@@ -1,2 +1,2 @@
-set(PYKEP_TRAJOPT_PYTHON_FILES __init__.py _point2point.py)
+set(PYKEP_TRAJOPT_PYTHON_FILES __init__.py _direct_point2point.py _direct_pl2pl.py)
 install(FILES ${PYKEP_TRAJOPT_PYTHON_FILES} DESTINATION ${_PYKEP_INSTALL_DIR}/trajopt)
diff --git a/pykep/trajopt/__init__.py b/pykep/trajopt/__init__.py
@@ -10,4 +10,5 @@
 """
 
 # Direct methods
-from ._point2point import direct_point2point
+from ._direct_point2point import direct_point2point
+from ._direct_pl2pl import direct_pl2pl