Formatting changes

src/lib.rs

@@ -1,24 +1,24 @@
 #![allow(dead_code)]
 
-pub mod ode;
-pub mod integrator;
-pub mod controller;
 pub mod callback;
+pub mod controller;
+pub mod integrator;
+pub mod ode;
 pub mod problem;
 
 pub mod prelude {
-    pub use super::ode::ODE;
-    pub use super::integrator::dormand_prince::DormandPrince45;
+    pub use super::callback::{stop, Callback};
     pub use super::controller::PIController;
-    pub use super::callback::{Callback, stop};
+    pub use super::integrator::dormand_prince::DormandPrince45;
+    pub use super::ode::ODE;
     pub use super::problem::{Problem, Solution};
 }
 
 #[cfg(test)]
 mod tests {
-    use nalgebra::{Vector2, Vector6};
-    use approx::assert_relative_eq;
     use crate::prelude::*;
+    use approx::assert_relative_eq;
+    use nalgebra::{Vector2, Vector6};
     use std::f64::consts::PI;
 
     #[test]
@@ -31,10 +31,10 @@ mod tests {
             let &(g, l) = p;
             let theta = y[0];
             let d_theta = y[1];
-            Vector2::new( d_theta, -(g/l) * theta.sin() )
+            Vector2::new(d_theta, -(g / l) * theta.sin())
         }
 
-        let y0 = Vector2::new(0.0, PI/2.0);
+        let y0 = Vector2::new(0.0, PI / 2.0);
 
         // Set up the problem (ODE, Integrator, Controller, and Callbacks)
         let ode = ODE::new(&derivative, 0.0, 6.3, y0, params);
@@ -42,7 +42,7 @@ mod tests {
         let controller = PIController::default();
 
         let value_too_high = Callback {
-            event: &|t: f64, _y: Vector2<f64>, _p: &Params| { 5.0 - t },
+            event: &|t: f64, _y: Vector2<f64>, _p: &Params| 5.0 - t,
             effect: &stop,
         };
 
@@ -59,7 +59,7 @@ mod tests {
         // Calculate one period
         let a = 6.7781363e6_f64;
         let mu = 3.98600441500000e14;
-        let period = 2.0 * PI * (a.powi(3)/mu).sqrt();
+        let period = 2.0 * PI * (a.powi(3) / mu).sqrt();
 
         // Set up the system
         type Params = (f64,);
@@ -78,7 +78,7 @@ mod tests {
         );
 
         // Integrate
-        let ode = ODE::new(&derivative, 0.0, 10.0*period, y0, params);
+        let ode = ODE::new(&derivative, 0.0, 10.0 * period, y0, params);
         let dp45 = DormandPrince45::new(1e-12_f64, 1e-12_f64);
         let controller = PIController::new(0.37, 0.04, 10.0, 0.2, 1000.0, 0.9, 0.01);
 
@@ -86,12 +86,40 @@ mod tests {
 
         let solution = problem.solve();
 
-        assert_relative_eq!(solution.times[solution.states.len()-1], 10.0 * period, max_relative=1e-12);
-        assert_relative_eq!(solution.states[solution.states.len()-1][0], y0[0], max_relative=1e-9);
-        assert_relative_eq!(solution.states[solution.states.len()-1][1], y0[1], max_relative=1e-9);
-        assert_relative_eq!(solution.states[solution.states.len()-1][2], y0[2], max_relative=1e-9);
-        assert_relative_eq!(solution.states[solution.states.len()-1][3], y0[3], max_relative=1e-9);
-        assert_relative_eq!(solution.states[solution.states.len()-1][4], y0[4], max_relative=1e-9);
-        assert_relative_eq!(solution.states[solution.states.len()-1][5], y0[5], max_relative=1e-9);
+        assert_relative_eq!(
+            solution.times[solution.states.len() - 1],
+            10.0 * period,
+            max_relative = 1e-12
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][0],
+            y0[0],
+            max_relative = 1e-9
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][1],
+            y0[1],
+            max_relative = 1e-9
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][2],
+            y0[2],
+            max_relative = 1e-9
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][3],
+            y0[3],
+            max_relative = 1e-9
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][4],
+            y0[4],
+            max_relative = 1e-9
+        );
+        assert_relative_eq!(
+            solution.states[solution.states.len() - 1][5],
+            y0[5],
+            max_relative = 1e-9
+        );
     }
 }