Merge pull request #407 from nyx-space/bug/gh-339

Unit test showing convert_tpc not working with gm_de440.tpc

Author: ChristopherRabotin

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["anise", "anise-cli", "anise-gui", "anise-py", "anise/fuzz"]
 
 [workspace.package]
-version = "0.5.3"
+version = "0.5.4"
 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."
@@ -45,7 +45,7 @@ pyo3-log = "0.12"
 numpy = "0.23"
 ndarray = ">= 0.15, < 0.17"
 
-anise = { version = "0.5.3", path = "anise", default-features = false }
+anise = { version = "0.5.4", path = "anise", default-features = false }
 
 [profile.bench]
 debug = true

anise-py/tests/test_almanac.py

@@ -1,11 +1,13 @@
+import os
 from pathlib import Path
 import pickle
 
-from anise import Almanac, MetaAlmanac
+from anise import Almanac, MetaAlmanac, MetaFile
 from anise.astro import *
 from anise.astro.constants import Frames
 from anise.rotation import DCM
 from anise.time import Epoch
+from anise.utils import convert_tpc
 
 from os import environ
 
@@ -126,6 +128,29 @@ def test_state_transformation():
     # cf. https://github.com/nyx-space/hifitime/issues/270
 
 
+def test_convert_tpc():
+    """Attempt to reproduce GH issue #339"""
+    try:
+        os.remove("test_constants.tpc")
+    except FileNotFoundError:
+        pass
+
+    # First call to convert_tpc works
+    convert_tpc("data/pck00011.tpc", "data/gm_de440.tpc", "test_constants.tpc")
+
+    # Second call, with overwrite enabled, also works
+    convert_tpc("data/pck00011.tpc", "data/gm_de440.tpc", "test_constants.tpc", overwrite=True)
+
+    # Try to load the constants file
+    constants_file = MetaFile("test_constants.tpc")
+    new_meta = MetaAlmanac()
+    new_meta.files = [constants_file,]
+    almanac = new_meta.process()
+
+    earth_j2k = almanac.frame_info(Frames.EARTH_J2000)
+    assert earth_j2k.mu_km3_s2 != None
+    almanac.describe()
+
 def test_meta_load():
     data_path = Path(__file__).parent.joinpath("..", "..", "data", "local.dhall")
     meta = MetaAlmanac(str(data_path))

anise/src/almanac/metaload/metafile.rs

@@ -74,7 +74,10 @@ impl MetaFile {
                     return Ok(());
                 }
                 // Build the path for this file.
-                match url.path_segments().and_then(|segments| segments.last()) {
+                match url
+                    .path_segments()
+                    .and_then(|mut segments| segments.next_back())
+                {
                     Some(remote_file_path) => {
                         match Path::new(remote_file_path).file_name() {
                             Some(file_name) => {

anise/src/almanac/mod.rs

@@ -32,7 +32,7 @@ use core::fmt;
 pub const MAX_LOADED_SPKS: usize = 32;
 pub const MAX_LOADED_BPCS: usize = 8;
 pub const MAX_SPACECRAFT_DATA: usize = 16;
-pub const MAX_PLANETARY_DATA: usize = 64;
+pub const MAX_PLANETARY_DATA: usize = 128;
 
 pub mod aer;
 pub mod bpc;

anise/src/math/interpolation/hermite.rs

@@ -172,8 +172,8 @@ pub fn hermite_eval(
             /*  physical XVALS array, in which the abscissa values are not */
             /*  repeated. */
 
-            let xi = (i + 1) / 2;
-            let xij = (i + j + 1) / 2;
+            let xi = i.div_ceil(2);
+            let xij = (i + j).div_ceil(2);
             let c1 = xs[xij - 1] - x_eval;
             let c2 = x_eval - xs[xi - 1];
             let denom = xs[xij - 1] - xs[xi - 1];

anise/src/naif/daf/file_record.rs

@@ -92,7 +92,7 @@ impl FileRecord {
     }
 
     pub fn summary_size(&self) -> usize {
-        (self.nd + (self.ni + 1) / 2) as usize
+        (self.nd + self.ni.div_ceil(2)) as usize
     }
 
     pub fn identification(&self) -> Result<&str, FileRecordError> {

anise/src/naif/kpl/parser.rs

@@ -70,7 +70,7 @@ impl Assignment {
             // We have exactly one item, let's try to convert it as an integer first
             if let Ok(as_int) = vec[0].parse::<i32>() {
                 KPLValue::Integer(as_int)
-            } else if let Ok(as_f64) = vec[0].parse::<f64>() {
+            } else if let Ok(as_f64) = vec[0].trim().replace("D", "E").parse::<f64>() {
                 KPLValue::Float(as_f64)
             } else {
                 // Darn, let's default to string
@@ -191,7 +191,13 @@ pub fn convert_tpc_items(
                                     }),
                                     _ => unreachable!(),
                                 },
-                                _ => panic!("radii_km should be float or matrix, got {radii_km:?}"),
+                                _ => {
+                                    return Err(DataSetError::Conversion {
+                                        action: format!(
+                                            "radii_km should be float or matrix, got {radii_km:?}"
+                                        ),
+                                    })
+                                }
                             },
                             None => None,
                         };
@@ -303,17 +309,17 @@ pub fn convert_tpc_items(
                         info!("Added {object_id}");
                     }
                     _ => error!(
-                        "expected gravity parameter to be a float but got {mu_km3_s2_value:?}"
+                        "skipping {object_id}: gravity data is {mu_km3_s2_value:?} (want float)"
                     ),
                 }
             }
             None => {
-                warn!("Skipping {object_id}: no gravity data")
+                warn!("skipping {object_id}: no gravity data")
             }
         }
     }
 
-    println!("Added {} items", dataset.lut.by_id.len());
+    info!("added {} items", dataset.lut.by_id.len());
 
     dataset.set_crc32();
     dataset.metadata = Metadata::default();

anise/src/structure/dataset/error.rs

@@ -24,7 +24,7 @@ pub enum DataSetError {
         action: &'static str,
         source: DecodingError,
     },
-    #[snafu(display("input/output error while {action}"))]
+    #[snafu(display("input/output error while {action}, {source}"))]
     IO {
         action: &'static str,
         source: IOError,

data/.gitignore

@@ -1,4 +1,5 @@
 !pck08.pca
 !pck11.pca
 !moon_fk.epa
-!moon_fk_de440.epa
+!moon_fk_de440.epa
+de*.bsp