[Rcpp-commits] r3227 - pkg/RcppEigen/inst/include

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

Author: dmbates
Date: 2011-10-26 20:59:34 +0200 (Wed, 26 Oct 2011)
New Revision: 3227

Modified:
   pkg/RcppEigen/inst/include/RcppEigenCholmod.h
   pkg/RcppEigen/inst/include/RcppEigenStubs.h
Log:
Update to Matrix_1.0.2 versions


Modified: pkg/RcppEigen/inst/include/RcppEigenCholmod.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigenCholmod.h	2011-10-26 18:58:56 UTC (rev 3226)
+++ pkg/RcppEigen/inst/include/RcppEigenCholmod.h	2011-10-26 18:59:34 UTC (rev 3227)
@@ -957,6 +957,7 @@
 CHM_DN M_cholmod_copy_dense(const_CHM_DN, CHM_CM);
 CHM_SP M_cholmod_aat(const_CHM_SP, int *fset, size_t fsize, int mode,
 		     CHM_CM);
+int M_cholmod_band_inplace(CHM_SP A, int k1, int k2, int mode, CHM_CM);
 CHM_SP M_cholmod_add(const_CHM_SP, const_CHM_SP, double alpha[2], double beta[2],
 		     int values, int sorted, CHM_CM);
 CHM_DN M_cholmod_allocate_dense(size_t nrow, size_t ncol, size_t d,

Modified: pkg/RcppEigen/inst/include/RcppEigenStubs.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigenStubs.h	2011-10-26 18:58:56 UTC (rev 3226)
+++ pkg/RcppEigen/inst/include/RcppEigenStubs.h	2011-10-26 18:59:34 UTC (rev 3227)
@@ -58,11 +58,11 @@
     return fun(ans, x, check_Udiag, sort_in_place);
 }
 
-inline CHM_SP M_as_cholmod_triplet(CHM_SP ans, SEXP x, Rboolean check_Udiag)
+inline CHM_TR M_as_cholmod_triplet(CHM_TR ans, SEXP x, Rboolean check_Udiag)
 {
-    static CHM_SP(*fun)(CHM_SP,SEXP,Rboolean)= NULL;
+    static CHM_TR(*fun)(CHM_TR,SEXP,Rboolean)= NULL;
     if(fun == NULL)
-	fun = (CHM_SP(*)(CHM_SP,SEXP,Rboolean))
+	fun = (CHM_TR(*)(CHM_TR,SEXP,Rboolean))
 	    R_GetCCallable("Matrix", "as_cholmod_triplet");
     return fun(ans, x, check_Udiag);
 }
@@ -108,11 +108,11 @@
 
 inline SEXP
 M_chm_sparse_to_SEXP(const_CHM_SP a, int dofree,
-		     int uploT, int Rkind, char *diag, SEXP dn)
+		     int uploT, int Rkind, const char *diag, SEXP dn)
 {
-    static SEXP(*fun)(const_CHM_SP,int,int,int,char*,SEXP) = NULL;
+    static SEXP(*fun)(const_CHM_SP,int,int,int,const char*,SEXP) = NULL;
     if(fun == NULL)
-	fun = (SEXP(*)(const_CHM_SP,int,int,int,char*,SEXP))
+	fun = (SEXP(*)(const_CHM_SP,int,int,int,const char*,SEXP))
 	    R_GetCCallable("Matrix", "chm_sparse_to_SEXP");
     return fun(a, dofree, uploT, Rkind, diag, dn);
 }