Skip to content
Snippets Groups Projects
Commit dda165d0 authored by Mark Jenkinson's avatar Mark Jenkinson
Browse files

changed getdiag() to diag()

parent 8baa5c32
No related branches found
No related tags found
No related merge requests found
...@@ -185,13 +185,15 @@ namespace SIGPROC { ...@@ -185,13 +185,15 @@ namespace SIGPROC {
// e is the estimate of the variance of the timeseries, sigma^2 // e is the estimate of the variance of the timeseries, sigma^2
Matrix varmat = (r.Columns(batch_pos, numrand+1).t()*r.Columns(batch_pos, numrand+1))*var_on_e/sizeTS; Matrix varmat = (r.Columns(batch_pos, numrand+1).t()*r.Columns(batch_pos, numrand+1))*var_on_e/sizeTS;
ColumnVector vartemp; ColumnVector vartemp;
getdiag(vartemp, varmat); //getdiag(vartemp, varmat); // obsolete fn
vartemp = diag(varmat); // MJ NOTE: new fn
var.Rows(batch_pos, numrand+1) = vartemp; var.Rows(batch_pos, numrand+1) = vartemp;
} }
else else
{ {
varmatfull = (r.Columns(batch_pos, batch_pos+batch_size-1).t()*r.Columns(batch_pos, batch_pos+batch_size-1))*var_on_e/sizeTS; varmatfull = (r.Columns(batch_pos, batch_pos+batch_size-1).t()*r.Columns(batch_pos, batch_pos+batch_size-1))*var_on_e/sizeTS;
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; var.Rows(batch_pos, batch_pos+batch_size-1) = vartempfull;
} }
batch_pos += batch_size; batch_pos += batch_size;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment