bump to v4.1.1 (#8)

* bump to v4.1.1
* scheduler: fit the measure ionospheric delay when feasible
* run clippy

---------

Signed-off-by: Guillaume W. Bres <[email protected]>

Author: gwbres

cggtts-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cggtts-cli"
-version = "1.0.1"
+version = "1.0.2"
 license = "MIT OR Apache-2.0"
 authors = ["Guillaume W. Bres <[email protected]>"]
 description = "Command line tool parse and analyze CGGTTS data"
@@ -17,6 +17,6 @@ itertools = "0.11.0"
 env_logger = "0.10"
 clap = { version = "4.4.6", features = ["derive", "color"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-cggtts = { path = "../cggtts", version = "=4.1.0" }
+cggtts = { path = "../cggtts", version = "=4.1.1" }
 plotly =  "0.8.4"
 # plotly = { git = "https://github.com/gwbres/plotly", branch = "density-mapbox" }

cggtts-cli/src/processing.rs

@@ -209,7 +209,7 @@ pub fn clock_comparison(workspace: &Path, pool: &Vec<CGGTTS>, ctx: &mut PlotCont
                     .tracks()
                     .filter_map(|trk| {
                         if trk.sv == *sv && &trk.frc == code {
-                            if let Some(_) = refsys.get(&trk.epoch) {
+                            if refsys.get(&trk.epoch).is_some() {
                                 Some(trk.epoch)
                             } else {
                                 None
@@ -223,11 +223,9 @@ pub fn clock_comparison(workspace: &Path, pool: &Vec<CGGTTS>, ctx: &mut PlotCont
                     .tracks()
                     .filter_map(|trk| {
                         if trk.sv == *sv && &trk.frc == code {
-                            if let Some(refsys) = refsys.get(&trk.epoch) {
-                                Some(trk.data.refsys - refsys)
-                            } else {
-                                None
-                            }
+                            refsys
+                                .get(&trk.epoch)
+                                .map(|refsys| trk.data.refsys - refsys)
                         } else {
                             None
                         }
@@ -248,7 +246,7 @@ pub fn clock_comparison(workspace: &Path, pool: &Vec<CGGTTS>, ctx: &mut PlotCont
     let mut fd = File::create(workspace.join(&pool[0].station))
         .expect("failed to create textfile: permission denied");
 
-    writeln!(fd, "{}", "t, CLOCK(A), CLOCK(B), SV, (elev[°], azi[°]) @REF, (elev[°], azi[°]) @CLOCK, SIGNAL, CLOCK(A) - CLOCK(B) [s]")
+    writeln!(fd, "t, CLOCK(A), CLOCK(B), SV, (elev[°], azi[°]) @REF, (elev[°], azi[°]) @CLOCK, SIGNAL, CLOCK(A) - CLOCK(B) [s]")
         .expect("failed to generate textfile");
 
     for trk in ref_clock.tracks() {

cggtts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cggtts"
-version = "4.1.0"
+version = "4.1.1"
 license = "MIT OR Apache-2.0"
 authors = ["Guillaume W. Bres <[email protected]>"]
 description = "Package to analyze and create CGGTTS data"

cggtts/src/tests/parser.rs

@@ -147,7 +147,7 @@ mod test {
 
         let _dumped = cggtts.to_string();
         let _compare = std::fs::read_to_string(
-            (env!("CARGO_MANIFEST_DIR").to_owned() + "/../data/single/GZSY8259.568"),
+            env!("CARGO_MANIFEST_DIR").to_owned() + "/../data/single/GZSY8259.568",
         )
         .unwrap();
     }

cggtts/src/track/scheduler.rs

@@ -1,4 +1,4 @@
-use crate::prelude::{Duration, Epoch, TimeScale, TrackData};
+use crate::prelude::{Duration, Epoch, IonosphericData, TimeScale, TrackData};
 use polyfit_rs::polyfit_rs::polyfit;
 use std::collections::BTreeMap;
 use thiserror::Error;
@@ -59,14 +59,22 @@ pub struct FitData {
 }
 
 impl SVTracker {
+    /* has msio data */
+    fn has_msio(&self) -> bool {
+        self.buffer
+            .values()
+            .filter(|data| data.msio.is_some())
+            .count()
+            > 0
+    }
     /// Try to fit a track. You need to provide the ongoing IOE.
     pub fn fit(
         &self,
         ioe: u16,
         trk_duration: Duration,
         sampling_period: Duration,
         trk_midpoint: Epoch,
-    ) -> Result<((f64, f64), TrackData), FitError> {
+    ) -> Result<((f64, f64), TrackData, Option<IonosphericData>), FitError> {
         // verify tracking completion
         //  complete if we have enough measurements
         let expected_nb =
@@ -209,21 +217,6 @@ impl SVTracker {
         let (smdi, smdi_b) = (fit[1], fit[0]);
         let mdio = smdi * t_mid_s + smdi_b;
 
-        let fit = polyfit(
-            &t_xs,
-            &self
-                .buffer
-                .values()
-                .map(|f| f.msio.unwrap_or(0.0_f64))
-                .collect::<Vec<_>>()
-                .as_slice(),
-            1,
-        )
-        .map_err(|_| FitError::LinearRegressionFailure)?;
-
-        let (smsi, smsi_b) = (fit[1], fit[0]);
-        let msio = smsi * t_mid_s + smsi_b;
-
         let trk_data = TrackData {
             refsv,
             srsv,
@@ -237,7 +230,36 @@ impl SVTracker {
             smdi,
         };
 
-        Ok(((elev, azi), trk_data))
+        let iono_data = match self.has_msio() {
+            false => None,
+            true => {
+                let fit = polyfit(
+                    &t_xs,
+                    &self
+                        .buffer
+                        .values()
+                        .map(|f| f.msio.unwrap())
+                        .collect::<Vec<_>>()
+                        .as_slice(),
+                    1,
+                )
+                .map_err(|_| FitError::LinearRegressionFailure)?;
+
+                let (smsi, smsi_b) = (fit[1], fit[0]);
+                let msio = smsi * t_mid_s + smsi_b;
+
+                let mut isg = 0.0_f64;
+                let msio_fit: Vec<_> = t_xs.iter().map(|t_s| smsi * t_s + smsi_b).collect();
+                for msio_fit in msio_fit {
+                    isg += (msio_fit - msio).powi(2);
+                }
+                isg = isg.sqrt();
+
+                Some(IonosphericData { msio, smsi, isg })
+            },
+        };
+
+        Ok(((elev, azi), trk_data, iono_data))
     }
 
     /// Latch a new measurement at given UTC Epoch.