Finished dopri5, interpolation, and callbacks

src/lib.rs

@@ -3,7 +3,7 @@
 pub mod ode;
 pub mod integrator;
 pub mod controller;
-// pub mod callback;
+pub mod callback;
 pub mod problem;
 
 
@@ -23,7 +23,6 @@ mod tests {
         // Calculate one period
         let a = 6.7781363e6_f64;
         let period = 2.0 * PI * (a.powi(3)/3.98600441500000e14).sqrt();
-        println!("{}", period);
 
         // Set up the system
         fn derivative(_t: f64, state: Vector6<f64>) -> Vector6<f64> {
@@ -31,32 +30,29 @@ mod tests {
             Vector6::new(state[3], state[4], state[5], acc[0], acc[1], acc[2])
         }
         let y0 = Vector6::new(
-            4.26387250e+06,
-            5.14619397e+06,
-            1.13102192e+06,
-            -5.92345023e+03,
-            4.49679662e+03,
-            1.87038714e+03,
+            4.263868426884883e6,
+            5.146189057155391e6,
+            1.1310208421331816e6,
+            -5923.454461876975,
+            4496.802639690076,
+            1870.3893008991558,
         );
 
         // Integrate
-        let ode = ODE::new(&derivative, 0.0, period, y0);
-        let dp45 = DormandPrince45::new(1e-12_f64, 1e-8_f64);
-        let controller = PIController::new(0.37, 0.04, 10.0, 0.2, 10.0, 0.9, 1e-4);
+        let ode = ODE::new(&derivative, 0.0, 10.0*period, y0);
+        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);
 
         let mut problem = Problem::new(ode, dp45, controller);
 
         let solution = problem.solve();
 
-        println!("{}", solution.times.len());
-        // panic!();
-        // TODO: Something still isn't right with these tolerances I think...
-        assert_relative_eq!(solution.times[solution.states.len()-1], period, max_relative=1e-7);
-        assert_relative_eq!(solution.states[solution.states.len()-1][0], y0[0], max_relative=1e-3);
-        assert_relative_eq!(solution.states[solution.states.len()-1][1], y0[1], max_relative=1e-3);
-        assert_relative_eq!(solution.states[solution.states.len()-1][2], y0[2], max_relative=1e-3);
-        assert_relative_eq!(solution.states[solution.states.len()-1][3], y0[3], max_relative=1e-3);
-        assert_relative_eq!(solution.states[solution.states.len()-1][4], y0[4], max_relative=1e-3);
-        assert_relative_eq!(solution.states[solution.states.len()-1][5], y0[5], max_relative=1e-3);
+        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);
     }
 }