Algorithm is Send+static

Author: Siel

src/algorithms/mod.rs

@@ -28,7 +28,7 @@ pub enum Algorithm {
     POSTPROB,
 }
 
-pub trait Algorithms<E: Equation>: Sync {
+pub trait Algorithms<E: Equation + Send + 'static>: Sync + Send + 'static {
     fn new(config: Settings, equation: E, data: Data) -> Result<Box<Self>>
     where
         Self: Sized;
@@ -262,7 +262,7 @@ pub trait Algorithms<E: Equation>: Sync {
     fn into_npresult(&self) -> NPResult<E>;
 }
 
-pub fn dispatch_algorithm<E: Equation>(
+pub fn dispatch_algorithm<E: Equation + Send + 'static>(
     settings: Settings,
     equation: E,
     data: Data,

src/algorithms/npag.rs

@@ -29,7 +29,7 @@ const THETA_F: f64 = 1e-2;
 const THETA_D: f64 = 1e-4;
 
 #[derive(Debug)]
-pub struct NPAG<E: Equation> {
+pub struct NPAG<E: Equation + Send + 'static> {
     equation: E,
     ranges: Vec<(f64, f64)>,
     psi: Psi,
@@ -51,7 +51,7 @@ pub struct NPAG<E: Equation> {
     settings: Settings,
 }
 
-impl<E: Equation> Algorithms<E> for NPAG<E> {
+impl<E: Equation + Send + 'static> Algorithms<E> for NPAG<E> {
     fn new(settings: Settings, equation: E, data: Data) -> Result<Box<Self>, anyhow::Error> {
         Ok(Box::new(Self {
             equation,

src/algorithms/npod.rs

@@ -34,7 +34,7 @@ use ndarray::{
 const THETA_F: f64 = 1e-2;
 const THETA_D: f64 = 1e-4;
 
-pub struct NPOD<E: Equation> {
+pub struct NPOD<E: Equation + Send + 'static> {
     equation: E,
     psi: Psi,
     theta: Theta,
@@ -52,7 +52,7 @@ pub struct NPOD<E: Equation> {
     settings: Settings,
 }
 
-impl<E: Equation> Algorithms<E> for NPOD<E> {
+impl<E: Equation + Send + 'static> Algorithms<E> for NPOD<E> {
     fn new(settings: Settings, equation: E, data: Data) -> Result<Box<Self>, anyhow::Error> {
         Ok(Box::new(Self {
             equation,
@@ -397,7 +397,7 @@ impl<E: Equation> Algorithms<E> for NPOD<E> {
     }
 }
 
-impl<E: Equation> NPOD<E> {
+impl<E: Equation + Send + 'static> NPOD<E> {
     fn validate_psi(&mut self) -> Result<()> {
         let mut psi = self.psi().matrix().as_ref().into_ndarray().to_owned();
         // First coerce all NaN and infinite in psi to 0.0

src/algorithms/postprob.rs

@@ -21,7 +21,7 @@ use crate::routines::settings::Settings;
 
 /// Posterior probability algorithm
 /// Reweights the prior probabilities to the observed data and error model
-pub struct POSTPROB<E: Equation> {
+pub struct POSTPROB<E: Equation + Send + 'static> {
     equation: E,
     psi: Psi,
     theta: Theta,
@@ -35,7 +35,7 @@ pub struct POSTPROB<E: Equation> {
     error_models: ErrorModels,
 }
 
-impl<E: Equation> Algorithms<E> for POSTPROB<E> {
+impl<E: Equation + Send + 'static> Algorithms<E> for POSTPROB<E> {
     fn new(settings: Settings, equation: E, data: Data) -> Result<Box<Self>, anyhow::Error> {
         Ok(Box::new(Self {
             equation,