[Genabel-commits] r1533 - branches/ProbABEL-0.50/src

[noreply at r-forge.r-project.org]

Author: maartenk
Date: 2014-01-10 23:04:59 +0100 (Fri, 10 Jan 2014)
New Revision: 1533

Modified:
   branches/ProbABEL-0.50/src/reg1.cpp
Log:
added beta calculation in EIGEN specific code. 

Modified: branches/ProbABEL-0.50/src/reg1.cpp
===================================================================
--- branches/ProbABEL-0.50/src/reg1.cpp	2014-01-10 20:29:35 UTC (rev 1532)
+++ branches/ProbABEL-0.50/src/reg1.cpp	2014-01-10 22:04:59 UTC (rev 1533)
@@ -402,8 +402,15 @@
     // before was
     // mematrix<double> tXX_i = invert(tXX);
 
+#if EIGEN
+    beta.data=tXX.data*(X.data.transpose()*rdata.Y.data);
+    beta.nrow=beta.data.rows();
+    beta.ncol=beta.data.cols();
+    beta.nelements=beta.ncol*beta.nrow;
+#else
     mematrix<double> tXY = tX * (rdata.Y);
-    beta = tXX_i * tXY;
+    beta = tXX * tXY;
+#endif
 
     if (verbose)
     {