Merge pull request #502 from nyx-space/feat/mars-frame

ChristopherRabotin · web-flow · commit b35176e26dce · 2025-08-07T08:06:13.000-06:00
Feat/mars frame
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -114,7 +114,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
           architecture: ${{ matrix.target }}
 
       - name: Build wheels
@@ -150,7 +150,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -185,7 +185,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Build wheels
         uses: PyO3/maturin-action@v1
@@ -220,7 +220,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Build wheels
         uses: PyO3/maturin-action@v1
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -136,15 +136,15 @@ jobs:
         run: cargo test validate_gh_283_multi_barycenter_and_los --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored
 
       - name: Rust-SPICE JPL DE validation
-        run: RUST_BACKTRACE=1 cargo test validate_jplde --features spkezr_validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
+        run: RUST_BACKTRACE=1 cargo test validate_jplde --features validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
 
       - name: Rust-SPICE hermite validation
-        run: RUST_BACKTRACE=1 cargo test validate_hermite_type13_ --features spkezr_validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
+        run: RUST_BACKTRACE=1 cargo test validate_hermite_type13_ --features validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
 
       - name: Rust-SPICE Lagrange validation
         env:
           LAGRANGE_BSP: gmat-lagrange.bsp
-        run: RUST_BACKTRACE=1 cargo test validate_lagrange_type9_with_varying_segment_sizes --features spkezr_validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
+        run: RUST_BACKTRACE=1 cargo test validate_lagrange_type9_with_varying_segment_sizes --features validation --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --include-ignored --test-threads 1
 
       - name: Rust-SPICE PCK validation
         run: RUST_BACKTRACE=1 cargo test validate_iau_rotation_to_parent --release --workspace --exclude anise-gui --exclude anise-py -- --nocapture --ignored
@@ -219,11 +219,11 @@ jobs:
           cargo llvm-cov test --no-report validate_gh_283_multi_barycenter_and_los -- --nocapture --ignored
           cargo llvm-cov test --no-report validate_iau_rotation_to_parent -- --nocapture --ignored
           cargo llvm-cov test --no-report validate_bpc_to_iau_rotations -- --nocapture --ignored
-          cargo llvm-cov test --no-report validate_jplde_de440s_no_aberration --features spkezr_validation -- --nocapture --ignored
-          cargo llvm-cov test --no-report validate_jplde_de440s_aberration_lt --features spkezr_validation -- --nocapture --ignored
-          cargo llvm-cov test --no-report validate_jplde_de440_type3_no_aberration --features spkezr_validation -- --nocapture --ignored
-          cargo llvm-cov test --no-report validate_hermite_type13_from_gmat --features spkezr_validation -- --nocapture --ignored
-          cargo llvm-cov test --no-report validate_lagrange_type9_with_varying_segment_sizes --features spkezr_validation -- --nocapture --ignored
+          cargo llvm-cov test --no-report validate_jplde_de440s_no_aberration --features validation -- --nocapture --ignored
+          cargo llvm-cov test --no-report validate_jplde_de440s_aberration_lt --features validation -- --nocapture --ignored
+          cargo llvm-cov test --no-report validate_jplde_de440_type3_no_aberration --features validation -- --nocapture --ignored
+          cargo llvm-cov test --no-report validate_hermite_type13_from_gmat --features validation -- --nocapture --ignored
+          cargo llvm-cov test --no-report validate_lagrange_type9_with_varying_segment_sizes --features validation -- --nocapture --ignored
           cargo llvm-cov test --no-report ut_embed --features embed_ephem
           cargo llvm-cov report --lcov > ../lcov.txt
 
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["anise", "anise-cli", "anise-gui", "anise-py", "anise/fuzz"]
 
 [workspace.package]
-version = "0.6.6"
+version = "0.6.7"
 edition = "2021"
 authors = ["Christopher Rabotin <christopher.rabotin@gmail.com>"]
 description = "ANISE provides a toolkit and files for Attitude, Navigation, Instrument, Spacecraft, and Ephemeris data. It's a modern replacement of NAIF SPICE file."
@@ -27,14 +27,14 @@ exclude = [
 ]
 
 [workspace.dependencies]
-hifitime = "4.1.2"
+hifitime = "4.1.3"
 memmap2 = "0.9.4"
 crc32fast = "1.4.2"
 der = { version = "0.7.8", features = ["derive", "alloc", "real"] }
 log = "0.4"
 pretty_env_logger = "0.5"
 tabled = "=0.20"
-nalgebra = { version = "0.34", default-features = true, features = [
+nalgebra = { version = "0.33", default-features = true, features = [
     "serde-serialize",
 ] }
 zerocopy = { version = "0.8.0", features = ["derive"] }
@@ -47,7 +47,7 @@ numpy = "0.25"
 ndarray = ">= 0.15, < 0.17"
 rayon = "1.10.0"
 
-anise = { version = "0.6.6", path = "anise", default-features = false }
+anise = { version = "0.6.7", path = "anise", default-features = false }
 
 [profile.bench]
 debug = true
diff --git a/anise-cli/src/main.rs b/anise-cli/src/main.rs
@@ -208,7 +208,7 @@ where
 
     info!("CRC32 checksum: 0x{:X}", fmt.crc32());
     if let Some(comments) = fmt.comments().context(CliDAFSnafu)? {
-        println!("== COMMENTS ==\n{}== END ==", comments);
+        println!("== COMMENTS ==\n{comments}== END ==");
     } else {
         println!("(File has no comments)");
     }
@@ -223,7 +223,7 @@ fn rm_daf_by_id<R>(
 where
     R: NAIFSummaryRecord,
 {
-    info!("Loading {:?} as DAF/PCK", input);
+    info!("Loading {input:?} as DAF/PCK");
     let fmt = DAF::<R>::parse(bytes).context(CliDAFSnafu)?;
 
     let mut ids = HashSet::new();
diff --git a/anise-py/src/bin.rs b/anise-py/src/bin.rs
@@ -16,6 +16,7 @@ use std::env::consts::OS;
 use std::fs;
 use std::process::Command;
 
+#[allow(clippy::zombie_processes)]
 #[pyfunction]
 pub(crate) fn exec_gui() -> Result<(), MetaAlmanacError> {
     if ["windows", "linux"].contains(&OS) {
diff --git a/anise/Cargo.toml b/anise/Cargo.toml
@@ -73,7 +73,7 @@ python = ["pyo3", "pyo3-log", "numpy", "ndarray", "rayon"]
 metaload = ["url", "ureq", "platform-dirs", "regex", "serde_dhall"]
 embed_ephem = ["rust-embed", "ureq"]
 # Enabling this flag significantly increases compilation times due to Arrow and Polars.
-spkezr_validation = []
+validation = []
 
 [[bench]]
 name = "iai_jpl_ephemeris"
diff --git a/anise/src/almanac/python.rs b/anise/src/almanac/python.rs
@@ -158,7 +158,7 @@ impl Almanac {
                                 println!("{e}");
                                 None
                             },
-                            |aer| Some(aer),
+                            Some,
                         )
                 })
                 .collect::<Vec<AzElRange>>();
@@ -301,7 +301,7 @@ impl Almanac {
                                 println!("{e}");
                                 None
                             },
-                            |aer| Some(aer),
+                            Some,
                         )
                 })
                 .collect::<Vec<Occultation>>();
@@ -381,7 +381,7 @@ impl Almanac {
         time_series,
         ab_corr=None,
     ))]
-    fn py_transform_many<'py>(
+    fn py_transform_many(
         &self,
         py: Python,
         target_frame: Frame,
@@ -399,7 +399,7 @@ impl Almanac {
                                 eprintln!("{e}");
                                 None
                             },
-                            |state| Some(state),
+                            Some,
                         )
                 })
                 .collect::<Vec<CartesianState>>();
@@ -460,7 +460,7 @@ impl Almanac {
                                 println!("{e}");
                                 None
                             },
-                            |state| Some(state),
+                            Some,
                         )
                 })
                 .collect::<Vec<CartesianState>>();
diff --git a/anise/src/astro/mod.rs b/anise/src/astro/mod.rs
@@ -205,6 +205,7 @@ impl AzElRange {
     /// Allows for pickling the object
     ///
     /// :rtype: typing.Tuple
+    #[allow(clippy::type_complexity)]
     fn __getnewargs__(&self) -> Result<(Epoch, f64, f64, f64, f64, Option<Frame>), PyErr> {
         Ok((
             self.epoch,
diff --git a/anise/src/constants.rs b/anise/src/constants.rs
@@ -41,6 +41,7 @@ pub mod celestial_objects {
             VENUS => Some("Venus"),
             EARTH_MOON_BARYCENTER => Some("Earth-Moon Barycenter"),
             MARS_BARYCENTER => Some("Mars Barycenter"),
+            MARS => Some("Mars"),
             JUPITER_BARYCENTER => Some("Jupiter Barycenter"),
             SATURN_BARYCENTER => Some("Saturn Barycenter"),
             URANUS_BARYCENTER => Some("Uranus Barycenter"),
@@ -53,8 +54,13 @@ pub mod celestial_objects {
         }
     }
 
-    /// Converts the provided ID to its human name. Only works for the common celestial bodies. Should be compatible with CCSDS OEM names
+    #[deprecated(since = "0.6.7")]
     pub fn id_to_celestial_name(name: &str) -> Result<NaifId, EphemerisError> {
+        id_from_celestial_name(name)
+    }
+
+    /// Converts the provided ID to its human name. Only works for the common celestial bodies. Should be compatible with CCSDS OEM names
+    pub fn id_from_celestial_name(name: &str) -> Result<NaifId, EphemerisError> {
         match name {
             "Mercury" => Ok(MERCURY),
             "Venus" => Ok(VENUS),
@@ -270,8 +276,16 @@ pub mod orientations {
         }
     }
 
-    /// Converts the provided ID to its human name. Only works for the common celestial bodies. Should be compatible with CCSDS OEM names
+    #[deprecated(
+        since = "0.6.7",
+        note = "use id_from_orientation_name, the original function was incorrectly named"
+    )]
     pub fn id_to_orientation_name(name: &str) -> Result<NaifId, OrientationError> {
+        id_from_orientation_name(name)
+    }
+
+    /// Converts the provided ID to its human name. Only works for the common celestial bodies. Should be compatible with CCSDS OEM names
+    pub fn id_from_orientation_name(name: &str) -> Result<NaifId, OrientationError> {
         match name {
             "J2000" | "ICRF" => Ok(J2000),
             "B1950" => Ok(B1950),
@@ -308,6 +322,8 @@ pub mod frames {
     pub const MERCURY_J2000: Frame = Frame::new(MERCURY, J2000);
     pub const VENUS_J2000: Frame = Frame::new(VENUS, J2000);
     pub const EARTH_MOON_BARYCENTER_J2000: Frame = Frame::new(EARTH_MOON_BARYCENTER, J2000);
+    /// The Mars frame is not available in the standard DE files, and requires a Mars specific BSP.
+    pub const MARS_J2000: Frame = Frame::new(MARS, J2000);
     pub const MARS_BARYCENTER_J2000: Frame = Frame::new(MARS_BARYCENTER, J2000);
     pub const JUPITER_BARYCENTER_J2000: Frame = Frame::new(JUPITER_BARYCENTER, J2000);
     pub const SATURN_BARYCENTER_J2000: Frame = Frame::new(SATURN_BARYCENTER, J2000);
diff --git a/anise/src/frames/frame.rs b/anise/src/frames/frame.rs
@@ -18,9 +18,9 @@ use serde_dhall::StaticType;
 
 use crate::astro::PhysicsResult;
 use crate::constants::celestial_objects::{
-    celestial_name_from_id, id_to_celestial_name, SOLAR_SYSTEM_BARYCENTER,
+    celestial_name_from_id, id_from_celestial_name, SOLAR_SYSTEM_BARYCENTER,
 };
-use crate::constants::orientations::{id_to_orientation_name, orientation_name_from_id, J2000};
+use crate::constants::orientations::{id_from_orientation_name, orientation_name_from_id, J2000};
 use crate::errors::{AlmanacError, EphemerisSnafu, OrientationSnafu, PhysicsError};
 use crate::prelude::FrameUid;
 use crate::structure::planetocentric::ellipsoid::Ellipsoid;
@@ -75,11 +75,11 @@ impl Frame {
     /// Attempts to create a new frame from its center and reference frame name.
     /// This function is compatible with the CCSDS OEM names.
     pub fn from_name(center: &str, ref_frame: &str) -> Result<Self, AlmanacError> {
-        let ephemeris_id = id_to_celestial_name(center).context(EphemerisSnafu {
+        let ephemeris_id = id_from_celestial_name(center).context(EphemerisSnafu {
             action: "converting center name to its ID",
         })?;
 
-        let orientation_id = id_to_orientation_name(ref_frame).context(OrientationSnafu {
+        let orientation_id = id_from_orientation_name(ref_frame).context(OrientationSnafu {
             action: "converting reference frame to its ID",
         })?;
 
diff --git a/anise/src/naif/daf/data_types.rs b/anise/src/naif/daf/data_types.rs
@@ -179,7 +179,7 @@ mod ut_datatype {
         let invalid_values = [0, 4, 6, 7, 11, 16, 22, 23, 100, -1, -5];
         for &value in &invalid_values {
             match DataType::try_from(value) {
-                Ok(_) => panic!("Expected error for value {}", value),
+                Ok(_) => panic!("Expected error for value {value}"),
                 Err(e) => match e {
                     DAFError::Datatype { id, kind } => {
                         assert_eq!(id, value);
diff --git a/anise/src/naif/spk/summary.rs b/anise/src/naif/spk/summary.rs
@@ -86,7 +86,7 @@ impl SPKSummaryRecord {
 
     /// Converts the provided ID to its human name.
     /// Only works for the common celestial bodies
-    #[cfg(feature = "spkezr_validation")]
+    #[cfg(feature = "validation")]
     pub fn id_to_spice_name(id: i32) -> Result<&'static str, EphemerisError> {
         if id % 100 == 99 {
             // This is the planet itself
@@ -127,7 +127,7 @@ impl SPKSummaryRecord {
 
     /// Converts the provided ID to its human name.
     /// Only works for the common celestial bodies
-    #[cfg(feature = "spkezr_validation")]
+    #[cfg(feature = "validation")]
     pub fn spice_name_to_id(name: &str) -> Result<i32, EphemerisError> {
         match name {
             "Mercury" => Ok(1),
diff --git a/anise/src/structure/lookuptable.rs b/anise/src/structure/lookuptable.rs
@@ -205,7 +205,7 @@ impl<const ENTRIES: usize> LookUpTable<ENTRIES> {
     ) -> (
         SequenceOf<i32, ENTRIES>,
         SequenceOf<u32, ENTRIES>,
-        SequenceOf<OctetStringRef, ENTRIES>,
+        SequenceOf<OctetStringRef<'_>, ENTRIES>,
         SequenceOf<u32, ENTRIES>,
     ) {
         // Build the list of entries
@@ -326,7 +326,7 @@ mod lut_ut {
         let mut repr = LookUpTable::<LUT_SIZE>::default();
 
         for i in 0..LUT_SIZE {
-            names.push(format!("Name{}", i));
+            names.push(format!("Name{i}"));
         }
 
         for (i, name) in names.iter().enumerate().take(LUT_SIZE) {
diff --git a/anise/tests/ephemerides/mod.rs b/anise/tests/ephemerides/mod.rs
@@ -12,5 +12,5 @@ mod parent_translation_verif;
 mod paths;
 mod transform;
 mod translation;
-#[cfg(feature = "spkezr_validation")]
+#[cfg(feature = "validation")]
 mod validation;
diff --git a/anise/tests/ephemerides/parent_translation_verif.rs b/anise/tests/ephemerides/parent_translation_verif.rs
@@ -77,15 +77,11 @@ fn de440s_parent_translation_verif() {
     // We expect exactly the same output as SPICE to machine precision.
     assert!(
         (pos_km - pos_expct_km).norm() < f64::EPSILON,
-        "got {} but want {}",
-        pos_km,
-        pos_expct_km
+        "got {pos_km} but want {pos_expct_km}",
     );
 
     assert!(
         (vel_km_s - vel_expct_km_s).norm() < f64::EPSILON,
-        "got {} but want {}",
-        vel_km_s,
-        vel_expct_km_s
+        "got {vel_km_s} but want {vel_expct_km_s}",
     );
 }
diff --git a/anise/tests/ephemerides/transform.rs b/anise/tests/ephemerides/transform.rs
@@ -367,10 +367,7 @@ fn validate_gh_283_multi_barycenter_and_los(almanac: Almanac) {
                     // We've had a full access strand.
                     let access_end = aer.epoch;
                     let access_duration = (access_end - access_start).round(Unit::Second * 1);
-                    println!(
-                        "#{access_count}\t{access_start} - {access_end}\t{}",
-                        access_duration
-                    );
+                    println!("#{access_count}\t{access_start} - {access_end}\t{access_duration}",);
                     assert_eq!(access_times[access_count], access_duration);
                 }
             }
@@ -463,10 +460,7 @@ fn validate_gh_283_multi_barycenter_and_los(almanac: Almanac) {
         // We've had a full access strand.
         let access_end = epoch + period;
         let access_duration = (access_end - access_start).round(Unit::Second * 1);
-        println!(
-            "#{access_count}\t{access_start} - {access_end}\t{}",
-            access_duration
-        );
+        println!("#{access_count}\t{access_start} - {access_end}\t{access_duration}",);
         assert_eq!(access_times[access_count], access_duration);
     }
 
diff --git a/anise/tests/ephemerides/translation.rs b/anise/tests/ephemerides/translation.rs
@@ -383,7 +383,7 @@ fn hermite_query() {
 
     let traj = SPK::load("../data/gmat-hermite.bsp").unwrap();
     let summary = traj.data_summaries().unwrap()[0];
-    println!("{}", summary);
+    println!("{summary}");
 
     let mut ctx = Almanac::from_spk(traj).unwrap();
     // Also load the plantery data
diff --git a/anise/tests/frames/format.rs b/anise/tests/frames/format.rs
diff --git a/anise/tests/naif.rs b/anise/tests/naif.rs
