From 913c5bdff2298e94e9100b40c7621ac2c20ab91a Mon Sep 17 00:00:00 2001
From: Christian Beckmann <c.beckmann@donders.ru.nl>
Date: Wed, 2 Oct 2013 09:15:04 +0000
Subject: [PATCH] update instacorr
---
meldata.cc | 8 +++++++-
melodic.h | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meldata.cc b/meldata.cc
index 1eba93e..e1fd9b4 100644
--- a/meldata.cc
+++ b/meldata.cc
@@ -120,7 +120,7 @@ namespace Melodic{
tmpTC = tmpData * insta_maps.t();
if(opts.insta_fn.value().length()>0){
-
+ dbgmsg(string("BEGIN: INSTACORR") << endl);
if(opts.insta_idx.value()<1 || opts.insta_idx.value()>tmpTC.Ncols()){
cerr << "ERROR:: INSTACORR index is wrong \n\n";
exit(2);
@@ -129,25 +129,31 @@ namespace Melodic{
Matrix tmpRef = tmpTC.Column(opts.insta_idx.value());
if(opts.insta_idx.value()>1){
// swap columns
+ dbgmsg(string("INSTACORR: swap columns") << endl);
tmpTC.Column(opts.insta_idx.value()) << tmpTC.Column(1);
tmpTC.Column(1) << tmpRef;
}
if(opts.insta_partial.value() && tmpTC.Ncols()>1){
// partal correlations
+ dbgmsg(string("INSTACORR: partial analysis") << endl);
Matrix tmpConf = tmpTC.Columns(2,tmpTC.Ncols());
tmpData -= tmpConf * (pinv(tmpConf) * tmpData);
tmpRef -= tmpConf * (pinv(tmpConf) * tmpRef);
}
if(opts.insta_varnorm.value()){
+ dbgmsg(string("INSTACORR: varnorm") << endl);
Matrix vscales = pow(stdev(tmpData,1),-1);
varnorm(tmpData,vscales);
varnorm(tmpRef,pow(stdev(tmpRef,1),-1));
}
// Shur product
+ dbgmsg(string("INSTACORR: SP") << endl);
SP4(tmpData,tmpRef);
+
+ dbgmsg(string("END: INSTACORR") << endl);
}
//END INSTACORRS
diff --git a/melodic.h b/melodic.h
index 6721b42..3e3e32d 100644
--- a/melodic.h
+++ b/melodic.h
@@ -66,7 +66,7 @@
namespace Melodic{
-const string version = "3.14";
+const string version = "3.141";
// The two strings below specify the title and example usage that is
// printed out as the help or usage message
--
GitLab