From 7cfa9ef5d89e54dbb6aeb11b9bf33189afc5ee62 Mon Sep 17 00:00:00 2001 From: Anders Olsson Date: Mon, 14 Dec 2020 23:16:56 +0100 Subject: [PATCH] Change vs to be a vec instead of array --- src/fitter/recursive.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/fitter/recursive.rs b/src/fitter/recursive.rs index e865e63..199a55c 100644 --- a/src/fitter/recursive.rs +++ b/src/fitter/recursive.rs @@ -2,7 +2,6 @@ use std::fmt; use std::iter; use ndarray::prelude::*; -use ndarray::stack; use crate::kernel::Kernel; @@ -12,10 +11,10 @@ pub struct RecursiveFitter { ts_new: Vec, kernel: Box, ts: Vec, - ms: Vec, // TODO Replace with a vec - vs: Array1, // TODO Replace with a vec - ns: Vec, // TODO Replace with a vec - xs: Vec, // TODO Replace with a vec + ms: Vec, + vs: Vec, + ns: Vec, + xs: Vec, is_fitted: bool, h: Array1, i: Array2, @@ -39,7 +38,7 @@ impl RecursiveFitter { kernel, ts: Vec::new(), ms: Vec::new(), - vs: Array1::zeros(0), + vs: Vec::new(), ns: Vec::new(), xs: Vec::new(), is_fitted: true, @@ -101,7 +100,7 @@ impl Fitter for RecursiveFitter { // Usual variables. self.ts.extend(self.ts_new.iter()); 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.vs.extend(self.kernel.k_diag(&self.ts_new).iter()); self.ns.extend(iter::repeat(0.0).take(n_new)); self.xs.extend(iter::repeat(0.0).take(n_new));