[Rcpp-commits] r921 - pkg/RcppArmadillo/src

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

Author: romain
Date: 2010-03-19 17:30:45 +0100 (Fri, 19 Mar 2010)
New Revision: 921

Modified:
   pkg/RcppArmadillo/src/RcppArmadillo.cpp
   pkg/RcppArmadillo/src/fastLm.cpp
Log:
bring back Named as it is now working again

Modified: pkg/RcppArmadillo/src/RcppArmadillo.cpp
===================================================================
--- pkg/RcppArmadillo/src/RcppArmadillo.cpp	2010-03-19 16:04:18 UTC (rev 920)
+++ pkg/RcppArmadillo/src/RcppArmadillo.cpp	2010-03-19 16:30:45 UTC (rev 921)
@@ -25,14 +25,16 @@
 
 extern "C" SEXP RcppArmadillo_wrap(){
 	
-    // using the Argument(.) = . notation
+    // using the Named(.) = . notation
     List cols = List::create( 
-    	Argument( "Col<double>" ) = arma::zeros<arma::mat>(5,1), 
-    	Argument( "Col<float>" )  = arma::zeros<arma::fmat>(5,1)
-    	) ; 
+    	Named( "Col<double>" ) = arma::zeros<arma::mat>(5,1), 
+    	Named( "Col<float>" )  = arma::zeros<arma::fmat>(5,1)
+    	) ;
+    
+    // using the Named(., .)  notation
     List rows = List::create( 
-    	Argument( "Row<double>") = arma::zeros<arma::mat>(1,5),
-    	Argument( "Row<float>" ) = arma::zeros<arma::fmat>(1,5)
+    	Named( "Row<double>",  arma::zeros<arma::mat>(1,5)  ),
+    	Named( "Row<float>" ,  arma::zeros<arma::fmat>(1,5) )
     	) ;
 	
     // using the _[.] = . notation

Modified: pkg/RcppArmadillo/src/fastLm.cpp
===================================================================
--- pkg/RcppArmadillo/src/fastLm.cpp	2010-03-19 16:04:18 UTC (rev 920)
+++ pkg/RcppArmadillo/src/fastLm.cpp	2010-03-19 16:30:45 UTC (rev 921)
@@ -47,8 +47,8 @@
     arma::colvec stderrest = arma::sqrt( sig2 * arma::diagvec( arma::inv(arma::trans(X)*X)) );
 
     return Rcpp::List::create( 
-    	Rcpp::Argument("coefficients") = coef,
-    	Rcpp::Argument("stderr")       = stderrest
+    	Rcpp::Named("coefficients") = coef,
+    	Rcpp::Named("stderr")       = stderrest
     ) ;
     
 }