diff --git a/src/lib.rs b/src/lib.rs index aac5145..22502a9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ //! include `"serde1"` in your list of features. //! //! Note that deserializing does not currently check for all invalid inputs. -//! For example, if you deserialize a corrupted [`Variance`] it may return +//! For example, if you deserialize a corrupted [`Variance1`] it may return //! a negative value for variance, even though that is mathematically impossible. //! In a future minor release some of these checks may be added. //! @@ -41,7 +41,7 @@ //! * Mean ([`Mean`]) and its error ([`MeanWithError`]). //! * Weighted mean ([`WeightedMean`]) and its error //! ([`WeightedMeanWithError`]). -//! * Variance ([`Variance`]), skewness ([`Skewness`]) and kurtosis +//! * Variance1 ([`Variance1`]), skewness ([`Skewness`]) and kurtosis //! ([`Kurtosis`]). //! * Arbitrary higher moments ([`define_moments`]). //! * Quantiles ([`Quantile`]). @@ -74,7 +74,7 @@ //! [`MeanWithError`]: ./type.MeanWithError.html //! [`WeightedMean`]: ./struct.WeightedMean.html //! [`WeightedMeanWithError`]: ./struct.WeightedMeanWithError.html -//! [`Variance`]: ./struct.Variance.html +//! [`Variance1`]: ./struct.Variance1.html //! [`Skewness`]: ./struct.Skewness.html //! [`Kurtosis`]: ./struct.Kurtosis.html //! [`Quantile`]: ./struct.Quantile.html @@ -98,7 +98,7 @@ mod quantile; mod traits; #[macro_use] mod histogram; -pub use crate::moments::{Mean, Variance, Skewness, Kurtosis, MeanWithError}; +pub use crate::moments::{Mean, Variance0, Variance1, Skewness, Kurtosis, MeanWithError}; pub use crate::weighted_mean::{WeightedMean, WeightedMeanWithError}; pub use crate::minmax::{Min, Max}; pub use crate::quantile::Quantile; diff --git a/src/macros.rs b/src/macros.rs index e18630e..de7e82a 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -81,10 +81,10 @@ macro_rules! assert_almost_eq { /// can do the following: /// /// ``` -/// use average::{Variance, Quantile, Estimate, concatenate}; +/// use average::{Variance1, Quantile, Estimate, concatenate}; /// /// concatenate!(Estimator, -/// [Variance, variance, mean, sample_variance], +/// [Variance1, variance, mean, sample_variance], /// [Quantile, quantile, quantile]); /// ``` #[macro_export]