From 6075e8c5137eee9700350fc0600cce73471844f9 Mon Sep 17 00:00:00 2001 From: "Guillaume W. Bres" Date: Mon, 27 Dec 2021 18:26:09 +0100 Subject: [PATCH] working on mdev tdev --- src/lib.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9719726..e90cde7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -195,11 +195,10 @@ fn calc_modified (data: &Vec, tau: f64, is_var: bool) -> Result<(f64,f64), n += 1.0_f64; i += 1 } - let mut dev = sum /2.0 /n; + let mut dev = sum /2.0 /n /tau /tau; // * rate if !is_var { - dev = dev.powf(0.5_f64) + dev = dev.powf(0.5_f64) / tau } - dev /= tau; // * rate Ok((dev, dev/(n.powf(0.5_f64)))) } @@ -207,9 +206,11 @@ fn calc_modified (data: &Vec, tau: f64, is_var: bool) -> Result<(f64,f64), /// Computes `time` deviation / variance /// at desired `tau` offset (s) fn calc_time (data: &Vec, tau: f64, is_var: bool) -> Result<(f64,f64), Error> { - let (mdev,err) = calc_modified(data, tau, is_var)?; - //Ok((mdev * tau / 3.0), err) - Ok((mdev * tau / (3.0_f64).powf(0.5_f64), err)) + let (mdev,mderr) = calc_modified(data, tau, is_var)?; + Ok(( + mdev * tau / (3.0_f64).powf(0.5_f64), + mderr // mderr / ns.powf(0.5_f64) + )) } /// Computes desired statistics in `Three Cornerned Hat` fashion.