Updated default controller
This commit is contained in:
@@ -40,7 +40,7 @@ let y0 = Vector3::new(1.0, 1.0, 1.0);
|
|||||||
|
|
||||||
let ode = ODE::new(&derivative, 0.0, 5.0, y0);
|
let ode = ODE::new(&derivative, 0.0, 5.0, y0);
|
||||||
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
||||||
let controller = PIController::new(0.17, 0.04, 10.0, 0.2, 0.1, 0.9, 1e-8);
|
let controller = PIController::new();
|
||||||
|
|
||||||
let value_too_high = Callback {
|
let value_too_high = Callback {
|
||||||
event: &|_: f64, y: SVector<f64,3>| { 10.0 - y[0] },
|
event: &|_: f64, y: SVector<f64,3>| { 10.0 - y[0] },
|
||||||
|
|||||||
@@ -51,6 +51,9 @@ impl PIController {
|
|||||||
old_h: initial_h,
|
old_h: initial_h,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pub fn default() -> Self {
|
||||||
|
Self::new(0.17, 0.04, 10.0, 0.2, 10.0, 0.9, 1e-4)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ mod tests {
|
|||||||
|
|
||||||
let ode = ODE::new(&derivative, 0.0, 1.0, y0);
|
let ode = ODE::new(&derivative, 0.0, 1.0, y0);
|
||||||
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
||||||
let controller = PIController::new(0.17, 0.04, 10.0, 0.2, 0.1, 0.9, 1e-8);
|
let controller = PIController::default();
|
||||||
|
|
||||||
let mut problem = Problem::new(ode, dp45, controller);
|
let mut problem = Problem::new(ode, dp45, controller);
|
||||||
|
|
||||||
@@ -162,7 +162,7 @@ mod tests {
|
|||||||
|
|
||||||
let ode = ODE::new(&derivative, 0.0, 5.0, y0);
|
let ode = ODE::new(&derivative, 0.0, 5.0, y0);
|
||||||
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
let dp45 = DormandPrince45::new(1e-12_f64, 1e-5_f64);
|
||||||
let controller = PIController::new(0.17, 0.04, 10.0, 0.2, 0.1, 0.9, 1e-8);
|
let controller = PIController::default();
|
||||||
|
|
||||||
let value_too_high = Callback {
|
let value_too_high = Callback {
|
||||||
event: &|_: f64, y: SVector<f64,3>| { 10.0 - y[0] },
|
event: &|_: f64, y: SVector<f64,3>| { 10.0 - y[0] },
|
||||||
@@ -183,7 +183,7 @@ mod tests {
|
|||||||
|
|
||||||
let ode = ODE::new(&derivative, 0.0, 10.0, y0);
|
let ode = ODE::new(&derivative, 0.0, 10.0, y0);
|
||||||
let dp45 = DormandPrince45::new(1e-12_f64, 1e-6_f64);
|
let dp45 = DormandPrince45::new(1e-12_f64, 1e-6_f64);
|
||||||
let controller = PIController::new(0.17, 0.04, 10.0, 0.2, 0.1, 0.9, 1e-8);
|
let controller = PIController::default();
|
||||||
|
|
||||||
let mut problem = Problem::new(ode, dp45, controller);
|
let mut problem = Problem::new(ode, dp45, controller);
|
||||||
let solution = problem.solve();
|
let solution = problem.solve();
|
||||||
|
|||||||
Reference in New Issue
Block a user