From 8baa5c32a950e2bcb232efd4de9145871253ac20 Mon Sep 17 00:00:00 2001
From: Mark Jenkinson <mark@fmrib.ox.ac.uk>
Date: Mon, 13 Nov 2000 15:36:32 +0000
Subject: [PATCH] Changed getdiag() to diag()
---
ols.cc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ols.cc b/ols.cc
index 9573110..be2b54f 100644
--- a/ols.cc
+++ b/ols.cc
@@ -194,13 +194,15 @@ namespace SIGPROC {
// e is the estimate of the variance of the timeseries, sigma^2
Matrix varmat = (r.Columns(batch_pos, numTS).t()*r.Columns(batch_pos, numTS)/Trace(RV))*var_on_e;
ColumnVector vartemp;
- getdiag(vartemp, varmat);
+ //getdiag(vartemp, varmat); // obsolete fn
+ vartemp = diag(varmat); // MJ NOTE: new fn
var.Rows(batch_pos, numTS) = vartemp;
}
else
{
varmatfull = (r.Columns(batch_pos, batch_pos+batch_size-1).t()*r.Columns(batch_pos, batch_pos+batch_size-1)/Trace(RV))*var_on_e;
- getdiag(vartempfull, varmatfull);
+ //getdiag(vartempfull, varmatfull); // obsolete fn
+ vartempfull = diag(varmatfull); // MJ NOTE: new fn
var.Rows(batch_pos, batch_pos+batch_size-1) = vartempfull;
}
batch_pos += batch_size;
--
GitLab