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

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Mar 2 21:18:28 CET 2014


Author: maartenk
Date: 2014-03-02 21:18:28 +0100 (Sun, 02 Mar 2014)
New Revision: 1630

Modified:
   branches/ProbABEL-0.50/src/reg1.cpp
Log:
mmscore .Ugly convert to use more fixed size matrixes as proof of principle

Modified: branches/ProbABEL-0.50/src/reg1.cpp
===================================================================
--- branches/ProbABEL-0.50/src/reg1.cpp	2014-03-01 23:59:02 UTC (rev 1629)
+++ branches/ProbABEL-0.50/src/reg1.cpp	2014-03-02 20:18:28 UTC (rev 1630)
@@ -326,8 +326,9 @@
     }
     else if (X.data.cols() == 2)
     {
-        Matrix<double, 2, Dynamic> tXW = X.data.transpose()* W_masked.masked_data->data;
-        Matrix2d xWx = tXW * X.data;
+        Matrix<double,  Dynamic,2> X2=X.data;
+        Matrix<double, 2, Dynamic> tXW = X2.transpose()* W_masked.masked_data->data;
+        Matrix2d xWx = tXW * X2;
         Ch = LDLT<MatrixXd>(xWx);
         Vector2d beta_2f = Ch.solve(tXW * Y);
         sigma2 = (Y - tXW.transpose() * beta_2f).squaredNorm();



More information about the Genabel-commits mailing list