Merge pull request #4 from rustodeans/main

Use a reference of problem for set_problem()
martinjrobins · Mar 23, 2024 · 0fc656d · 0fc656d
2 parents 8d45e9c + 490b815
commit 0fc656d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -115,7 +115,7 @@ mod tests {
         let y = solver.solve(&problem, t).unwrap();
 
         let mut state = OdeSolverState::new(&problem);
-        solver.set_problem(&mut state, problem);
+        solver.set_problem(&mut state, &problem);
         while state.t <= t {
             solver.step(&mut state).unwrap();
         }

diff --git a/src/ode_solver/bdf.rs b/src/ode_solver/bdf.rs
@@ -259,10 +259,9 @@ where
     fn problem(&self) -> Option<&OdeSolverProblem<Eqn>> {
         self.ode_problem.as_ref()
     }
-
-    fn set_problem(&mut self, state: &mut OdeSolverState<Eqn::M>, problem: OdeSolverProblem<Eqn>) {
-        self.ode_problem = Some(problem);
-        let problem = self.ode_problem.as_ref().unwrap();
+
+    fn set_problem(&mut self, state: &mut OdeSolverState<Eqn::M>, problem: &OdeSolverProblem<Eqn>) {
+        self.ode_problem = Some(problem.clone());
         let nstates = problem.eqn.nstates();
         self.order = 1usize;
         self.n_equal_steps = 0;

diff --git a/src/ode_solver/mod.rs b/src/ode_solver/mod.rs
@@ -26,13 +26,12 @@ pub mod diffsl;
 
 pub trait OdeSolverMethod<Eqn: OdeEquations> {
     fn problem(&self) -> Option<&OdeSolverProblem<Eqn>>;
-    fn set_problem(&mut self, state: &mut OdeSolverState<Eqn::M>, problem: OdeSolverProblem<Eqn>);
+    fn set_problem(&mut self, state: &mut OdeSolverState<Eqn::M>, problem: &OdeSolverProblem<Eqn>);
     fn step(&mut self, state: &mut OdeSolverState<Eqn::M>) -> Result<()>;
     fn interpolate(&self, state: &OdeSolverState<Eqn::M>, t: Eqn::T) -> Eqn::V;
     fn solve(&mut self, problem: &OdeSolverProblem<Eqn>, t: Eqn::T) -> Result<Eqn::V> {
-        let problem = problem.clone();
         let mut state = OdeSolverState::new(&problem);
-        self.set_problem(&mut state, problem);
+        self.set_problem(&mut state, &problem);
         while state.t <= t {
             self.step(&mut state)?;
         }
@@ -44,9 +43,8 @@ pub trait OdeSolverMethod<Eqn: OdeEquations> {
         t: Eqn::T,
         root_solver: &mut RS,
     ) -> Result<Eqn::V> {
-        let problem = problem.clone();
         let mut state = OdeSolverState::new_consistent(&problem, root_solver)?;
-        self.set_problem(&mut state, problem);
+        self.set_problem(&mut state, &problem);
         while state.t <= t {
             self.step(&mut state)?;
         }
@@ -254,7 +252,7 @@ mod tests {
         Eqn: OdeEquations<M = M, T = M::T, V = M::V>,
     {
         let mut state = OdeSolverState::new_consistent(&problem, &mut root_solver).unwrap();
-        method.set_problem(&mut state, problem);
+        method.set_problem(&mut state, &problem);
         for point in solution.solution_points.iter() {
             while state.t < point.t {
                 method.step(&mut state).unwrap();