From 63dccce7d0d4cf29ff79b26ab4c59ce301e3c1e4 Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Mon, 14 Dec 2020 23:13:29 +0100 Subject: [PATCH] Change ms to be a vec instead of array --- src/fitter/recursive.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fitter/recursive.rs b/src/fitter/recursive.rs index 1b107a7..01155a0 100644 --- a/src/fitter/recursive.rs +++ b/src/fitter/recursive.rs @@ -1,6 +1,6 @@ use std::fmt; +use std::iter; -// use derivative::Derivative; use ndarray::prelude::*; use ndarray::stack; @@ -12,7 +12,7 @@ pub struct RecursiveFitter { ts_new: Vec, kernel: Box, ts: Vec, - ms: ArrayD, // TODO Replace with a vec + ms: Vec, // TODO Replace with a vec vs: Array1, // TODO Replace with a vec ns: ArrayD, // TODO Replace with a vec xs: ArrayD, // TODO Replace with a vec @@ -38,7 +38,7 @@ impl RecursiveFitter { ts_new: Vec::new(), kernel, ts: Vec::new(), - ms: Array::zeros(0).into_dyn(), + ms: Vec::new(), vs: Array1::zeros(0), ns: Array::zeros(0).into_dyn(), xs: Array::zeros(0).into_dyn(), @@ -102,7 +102,7 @@ impl Fitter for RecursiveFitter { let zeros = Array::zeros(n_new).into_dyn(); self.ts.extend(self.ts_new.iter()); - self.ms = stack![Axis(0), self.ms, zeros]; + self.ms.extend(iter::repeat(0.0).take(n_new)); self.vs = stack![Axis(0), self.vs, self.kernel.k_diag(&self.ts_new)]; self.ns = stack![Axis(0), self.ns, zeros]; self.xs = stack![Axis(0), self.xs, zeros];