Convert y_fn_x (analytical solution) to Fn

cpmech · May 15, 2024 · b1a6486 · b1a6486
1 parent 82c7082
commit b1a6486
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/russell_ode/src/output.rs b/russell_ode/src/output.rs
@@ -8,11 +8,6 @@ use std::io::BufReader;
 use std::marker::PhantomData;
 use std::path::Path;
 
-/// Defines a function to compute y(x) (e.g, the analytical solution)
-///
-/// Use `|y, x, args|` or `|y: &mut Vector, x: f64, args, &mut A|`
-pub type YxFunction<A> = fn(&mut Vector, f64, &mut A);
-
 /// Holds the data generated at an accepted step or during the dense output
 #[derive(Clone, Debug, Deserialize)]
 pub struct OutData {
@@ -129,7 +124,7 @@ pub struct Output<'a, A> {
     y_aux: Vector,
 
     /// Holds the y(x) function (e.g., to compute the correct/analytical solution)
-    yx_function: Option<YxFunction<A>>,
+    yx_function: Option<Box<dyn Fn(&mut Vector, f64, &mut A) + 'a>>,
 
     /// Handles the generic argument
     phantom: PhantomData<fn() -> A>,
@@ -374,8 +369,10 @@ impl<'a, A> Output<'a, A> {
     }
 
     /// Sets the function to compute the correct/reference results y(x)
-    pub fn set_yx_correct(&mut self, y_fn_x: fn(&mut Vector, f64, &mut A)) -> &mut Self {
-        self.yx_function = Some(y_fn_x);
+    ///
+    /// Use `|y, x, args|` or `|y: &mut Vector, x: f64, args, &mut A|`
+    pub fn set_yx_correct(&mut self, y_fn_x: impl Fn(&mut Vector, f64, &mut A) + 'a) -> &mut Self {
+        self.yx_function = Some(Box::new(y_fn_x));
         self
     }
 

diff --git a/russell_ode/src/samples.rs b/russell_ode/src/samples.rs
@@ -1,5 +1,5 @@
 use crate::StrError;
-use crate::{HasJacobian, NoArgs, PdeDiscreteLaplacian2d, Side, System, YxFunction};
+use crate::{HasJacobian, NoArgs, PdeDiscreteLaplacian2d, Side, System};
 use russell_lab::math::PI;
 use russell_lab::Vector;
 use russell_sparse::{CooMatrix, Genie, Sym};
@@ -53,7 +53,7 @@ impl Samples {
         f64,
         Vector,
         NoArgs,
-        YxFunction<NoArgs>,
+        impl Fn(&mut Vector, f64, &mut NoArgs),
     ) {
         // system
         let ndim = 1;
@@ -169,7 +169,7 @@ impl Samples {
         f64,
         Vector,
         NoArgs,
-        YxFunction<NoArgs>,
+        impl Fn(&mut Vector, f64, &mut NoArgs),
     ) {
         // selected symmetric option (for both Mass and Jacobian matrices)
         let sym = genie.symmetry(symmetric);
@@ -820,7 +820,7 @@ impl Samples {
         f64,
         Vector,
         NoArgs,
-        YxFunction<NoArgs>,
+        impl Fn(&mut Vector, f64, &mut NoArgs),
     ) {
         // constants
         const L: f64 = -50.0; // lambda
@@ -1225,7 +1225,7 @@ impl Samples {
         f64,
         Vector,
         NoArgs,
-        YxFunction<NoArgs>,
+        impl Fn(&mut Vector, f64, &mut NoArgs),
     ) {
         // system
         let ndim = 1;
@@ -1306,7 +1306,7 @@ impl Samples {
         f64,
         Vector,
         NoArgs,
-        YxFunction<NoArgs>,
+        impl Fn(&mut Vector, f64, &mut NoArgs),
     ) {
         // system
         let ndim = 2;