From 37926b360a3e9546e5c9a2a1915e75d6dc478c9b Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Wed, 1 Apr 2015 14:33:08 +1300 Subject: [PATCH] update for latest rust --- src/lib.rs | 4 ++-- src/structs/dmat.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 1b269153..14a58164 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -541,7 +541,7 @@ pub fn prepend_rotation>(m: &M, v: &V) -> M { /// use na::{BaseFloat, Rot3, Vec3}; /// /// fn main() { -/// let t = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * BaseFloat::pi())); +/// let t = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5_f64 * ::pi())); /// let v = Vec3::new(1.0, 0.0, 0.0); /// /// let tv = na::rotate(&t, &v); @@ -562,7 +562,7 @@ pub fn rotate>(m: &M, v: &V) -> V { /// use na::{BaseFloat, Rot3, Vec3}; /// /// fn main() { -/// let t = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5 * BaseFloat::pi())); +/// let t = Rot3::new(Vec3::new(0.0f64, 0.0, 0.5_f64 * ::pi())); /// let v = Vec3::new(1.0, 0.0, 0.0); /// /// let tv = na::inv_rotate(&t, &v); diff --git a/src/structs/dmat.rs b/src/structs/dmat.rs index c7c2481a..f68e3a6b 100644 --- a/src/structs/dmat.rs +++ b/src/structs/dmat.rs @@ -498,7 +498,8 @@ impl Transpose for DMat { impl + Clone> Mean> for DMat { fn mean(&self) -> DVec { let mut res: DVec = DVec::new_zeros(self.ncols); - let normalizer: N = Cast::from(1.0f64 / Cast::from(self.nrows)); + let nrows_f64: f64 = Cast::from(self.nrows); + let normalizer: N = Cast::from(1.0f64 / nrows_f64); for i in 0..self.nrows { for j in 0..self.ncols {