satkit 0.14.2__tar.gz → 0.14.3__tar.gz

{satkit-0.14.2 → satkit-0.14.3}/Cargo.toml

@@ -3,7 +3,7 @@ members = [".", "python"]
 
 [package]
 name = "satkit"
-version = "0.14.2"
+version = "0.14.3"
 edition = "2021"
 description = "Satellite Toolkit"
 readme = "README.md"
@@ -22,7 +22,7 @@ name = "satkit"
 
 
 [dependencies]
-numeris = { version = "0.5.6", features = ["serde", "estimate", "ode"] }
+numeris = { version = "0.5.7", features = ["serde", "estimate", "ode"] }
 num-traits = "0.2.19"
 thiserror = "2.0"
 ureq = "3.1.2"

{satkit-0.14.2/python/satkit.egg-info → satkit-0.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satkit
-Version: 0.14.2
+Version: 0.14.3
 Summary: Satellite Orbital Dynamics Toolkit
 Author-email: Steven Michael <ssmichael@gmail.com>
 Maintainer-email: Steven Michael <ssmichael@gmail.com>

{satkit-0.14.2 → satkit-0.14.3}/pyproject.toml

@@ -9,7 +9,7 @@ requires-python = ">= 3.10"
 authors = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
 maintainers = [{ name = "Steven Michael", email = "ssmichael@gmail.com" }]
 readme = "README.md"
-version = "0.14.2"
+version = "0.14.3"
 license = "MIT"
 description = "Satellite Orbital Dynamics Toolkit"
 keywords = [

{satkit-0.14.2 → satkit-0.14.3}/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "satkit-python"
-version = "0.14.2"
+version = "0.14.3"
 edition = "2021"
 publish = false
 

{satkit-0.14.2 → satkit-0.14.3/python/satkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: satkit
-Version: 0.14.2
+Version: 0.14.3
 Summary: Satellite Orbital Dynamics Toolkit
 Author-email: Steven Michael <ssmichael@gmail.com>
 Maintainer-email: Steven Michael <ssmichael@gmail.com>

{satkit-0.14.2 → satkit-0.14.3}/python/src/pypropresult.rs

@@ -313,7 +313,30 @@ impl PyPropResult {
 
         let times = (&time).to_time_vec()?;
 
-        if is_list {
+        if is_list && !output_phi {
+            // Batch interpolation — returns Nx6 numpy array
+            match &self.0 {
+                PyPropResultType::R1(r) => {
+                    let results = r.interp_batch(&times)
+                        .map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))?;
+                    pyo3::Python::attach(|py| {
+                        let n = results.len();
+                        let flat: Vec<f64> = results.iter().flat_map(|r| r.as_slice().iter().copied().take(6)).collect();
+                        slice2py2d(py, &flat, n, 6)
+                    })
+                }
+                PyPropResultType::R7(r) => {
+                    let results = r.interp_batch(&times)
+                        .map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))?;
+                    pyo3::Python::attach(|py| {
+                        let n = results.len();
+                        let flat: Vec<f64> = results.iter().flat_map(|r| r.as_slice().iter().copied().take(6)).collect();
+                        slice2py2d(py, &flat, n, 6)
+                    })
+                }
+            }
+        } else if is_list {
+            // Fallback for output_phi=true — need per-element processing
             let results: PyResult<Vec<Py<PyAny>>> =
                 times.iter().map(|t| self.interp_at(t, output_phi)).collect();
             pyo3::Python::attach(|py| results?.into_py_any(py))

{satkit-0.14.2 → satkit-0.14.3}/src/orbitprop/propagator.rs

@@ -52,6 +52,10 @@ impl<const T: usize> PropagationResult<T> {
     pub fn interp<U: TimeLike>(&self, time: &U) -> Result<Matrix<6, T>> {
         interp_propresult(self, time)
     }
+
+    pub fn interp_batch(&self, times: &[Instant]) -> Result<Vec<StateType<T>>> {
+        interp_propresult_batch(self, times)
+    }
 }
 
 pub type StateType<const C: usize> = Matrix<6, C>;
@@ -549,6 +553,36 @@ pub fn interp_propresult<const C: usize, T: TimeLike>(
     Ok(result.map_err(PropagationError::ODEError)?)
 }
 
+pub fn interp_propresult_batch<const C: usize>(
+    res: &PropagationResult<C>,
+    times: &[Instant],
+) -> Result<Vec<StateType<C>>> {
+    use crate::orbitprop::Integrator;
+
+    let sol = res
+        .odesol
+        .as_ref()
+        .filter(|s| s.dense.is_some())
+        .ok_or(PropagationError::NoDenseOutputInSolution)?;
+
+    let xs: Vec<f64> = times
+        .iter()
+        .map(|t| (*t - res.time_begin).as_seconds())
+        .collect();
+
+    let results = match res.integrator {
+        Integrator::RKV98 => ode::RKV98::interpolate_batch(&xs, sol),
+        Integrator::RKV98NoInterp => ode::RKV98NoInterp::interpolate_batch(&xs, sol),
+        Integrator::RKV87 => ode::RKV87::interpolate_batch(&xs, sol),
+        Integrator::RKV65 => ode::RKV65::interpolate_batch(&xs, sol),
+        Integrator::RKTS54 => ode::RKTS54::interpolate_batch(&xs, sol),
+        Integrator::RODAS4 => {
+            return Err(PropagationError::NoDenseOutputInSolution.into());
+        }
+    };
+    Ok(results.map_err(PropagationError::ODEError)?)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;