[Lme4-commits] r1444 - pkg/lme4Eigen/src

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

Author: dmbates
Date: 2011-11-16 17:03:48 +0100 (Wed, 16 Nov 2011)
New Revision: 1444

Modified:
   pkg/lme4Eigen/src/predModule.cpp
   pkg/lme4Eigen/src/predModule.h
Log:
Change L method for merPredD class to use the wrap method in RcppEigen


Modified: pkg/lme4Eigen/src/predModule.cpp
===================================================================
--- pkg/lme4Eigen/src/predModule.cpp	2011-11-04 19:54:50 UTC (rev 1443)
+++ pkg/lme4Eigen/src/predModule.cpp	2011-11-16 16:03:48 UTC (rev 1444)
@@ -203,7 +203,7 @@
 	int*                 ppt = (int*)cf->Perm;
 	return IntegerVector(ppt, ppt + cf->n);
     }
-
+#if 0
     S4 merPredD::L() const {
 	const cholmod_factor* f = d_L.factor();
 	if (f->minor < f->n)
@@ -234,4 +234,5 @@
 	}
 	return ans;
     }
+#endif
 }

Modified: pkg/lme4Eigen/src/predModule.h
===================================================================
--- pkg/lme4Eigen/src/predModule.h	2011-11-04 19:54:50 UTC (rev 1443)
+++ pkg/lme4Eigen/src/predModule.h	2011-11-16 16:03:48 UTC (rev 1444)
@@ -182,8 +182,6 @@
 	VectorXd            linPred(const Scalar& f) const;
 	VectorXd                  u(const Scalar& f) const;
 
-	S4                        L() const;
-
 	Scalar              CcNumer() const {return d_CcNumer;}
 	Scalar                 ldL2() const {return d_ldL2;}
 	Scalar                ldRX2() const {return d_ldRX2;}
@@ -191,6 +189,8 @@
 	Scalar               solveU();
 	Scalar                 sqrL(const Scalar& f) const;
 
+	const ChmDecomp&          L() const {return d_L;}
+
 	const MatrixXd&           V() const {return d_V;}
 	const MatrixXd&         VtV() const {return d_VtV;}
 	const MatrixXd&         RZX() const {return d_RZX;}