Merge branch 'master' of github.com:RcppCore/Rcpp

Author: eddelbuettel

inst/examples/Attributes/Export.cpp

@@ -5,34 +5,34 @@ using namespace Rcpp;
 
 // [[Rcpp::export]]
 int fibonacci(const int x) {
-        
+
      if (x == 0) return(0);
      if (x == 1) return(1);
-     
+
      return (fibonacci(x - 1)) + fibonacci(x - 2);
 }
 
 
 // [[Rcpp::export("convolveCpp")]]
 NumericVector convolve(NumericVector a, NumericVector b) {
-    
+
     int na = a.size(), nb = b.size();
     int nab = na + nb - 1;
     NumericVector xab(nab);
-    
+
     for (int i = 0; i < na; i++)
         for (int j = 0; j < nb; j++)
             xab[i + j] += a[i] * b[j];
-    
+
     return xab;
 }
 
 
 // [[Rcpp::export]]
 List lapplyCpp(List input, Function f) {
-    
+
     List output(input.size());
-    
+
     std::transform(input.begin(), input.end(), output.begin(), f);
     output.names() = input.names();
 

inst/examples/ConvolveBenchmarks/convolve10_cpp.cpp

@@ -1,13 +1,13 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 
-// this version expands convolve8_cpp by making Vec mimic the structure of 
-// NumericVector. It peforms well, so this is is not the structure of 
+// this version expands convolve8_cpp by making Vec mimic the structure of
+// NumericVector. It peforms well, so this is is not the structure of
 // NumericVector that is the problem. So what is it then ?
 //
-// could it be because NumericVector is in a different library than 
+// could it be because NumericVector is in a different library than
 // this code, so that operator[] is not inlined ?
-// 
-// clues: 
+//
+// clues:
 // - http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka3538.html
 
 #include <Rcpp.h>
@@ -21,11 +21,11 @@ RcppExport SEXP convolve10cpp(SEXP a, SEXP b){
     int n_xb = xb.size() ;
     int nab = n_xa + n_xb - 1;
     Rcpp::NumericVector xab(nab);
-    
+
     Vec vab(xab.begin()), va(xa.begin()), vb(xb.begin()) ;
-    
+
     for (int i = 0; i < n_xa; i++)
-        for (int j = 0; j < n_xb; j++) 
+        for (int j = 0; j < n_xb; j++)
             vab[i + j] += va[i] * vb[j];
 
     return xab ;

inst/examples/ConvolveBenchmarks/convolve10_cpp.h

@@ -3,24 +3,24 @@ class Cache{
 public:
     typedef double& proxy ;
     typedef double* iterator ;
-    
+
     Cache( iterator data_) : data(data_){}
-    
+
     inline proxy ref(int i){ return data[i] ; }
     inline proxy ref(int i) const { return data[i] ; }
-            
-private:    
+
+private:
     iterator data ;
 } ;
 
 class Vec {
 public:
     typedef double& proxy ;
-    
+
     Vec( double* data_ ) : cache(data_){}
     inline proxy operator[]( int i){ return cache.ref(i) ; }
     inline proxy operator[]( int i) const { return cache.ref(i) ; }
-    
+
 private:
     Cache cache ;
 } ;

inst/examples/ConvolveBenchmarks/convolve11_cpp.cpp

@@ -11,7 +11,7 @@ RcppExport SEXP convolve11cpp(SEXP a, SEXP b) {
     NumericVector xa(a); int n_xa = xa.size() ;
     NumericVector xb(b); int n_xb = xb.size() ;
     NumericVector xab(n_xa + n_xb - 1,0.0);
-    
+
     Range r( 0, n_xb-1 );
     for(int i=0; i<n_xa; i++, r++){
     	xab[ r ] += noNA(xa[i]) * noNA(xb) ;

inst/examples/ConvolveBenchmarks/convolve12_cpp.cpp

@@ -8,12 +8,12 @@ RcppExport SEXP convolve12cpp(SEXP a, SEXP b){
     Rcpp::NumericVector xa(a), xb(b);
     int n_xa = xa.size(), n_xb = xb.size();
     Rcpp::NumericVector xab(n_xa + n_xb - 1);
-    
+
     typedef Rcpp::NumericVector::iterator vec_iterator ;
     vec_iterator ia = xa.begin(), ib = xb.begin();
     vec_iterator iab = xab.begin();
     for (int i = 0; i < n_xa; i++)
-        for (int j = 0; j < n_xb; j++) 
+        for (int j = 0; j < n_xb; j++)
             iab[i + j] += ia[i] * ib[j];
 
     return xab;

inst/examples/ConvolveBenchmarks/convolve13_cpp.cpp

@@ -9,9 +9,9 @@ T convolve( const T& a, const T& b ){
     int na = a.size() ; int nb = b.size() ;
     T out(na + nb - 1);
     typename T::iterator iter_a(a.begin()), iter_b(b.begin()), iter_ab( out.begin() ) ;
-    
+
     for (int i = 0; i < na; i++)
-        for (int j = 0; j < nb; j++) 
+        for (int j = 0; j < nb; j++)
             iter_ab[i + j] += iter_a[i] * iter_b[j];
 
     return out ;

inst/examples/ConvolveBenchmarks/convolve14_cpp.cpp

@@ -12,9 +12,9 @@ RcppExport SEXP convolve14cpp(SEXP a, SEXP b){
     int nab = n_xa + n_xb - 1;
     NumericVector xab(nab);
     Fast<NumericVector> fa(xa), fb(xb), fab(xab) ;
-    
+
     for (int i = 0; i < n_xa; i++)
-        for (int j = 0; j < n_xb; j++) 
+        for (int j = 0; j < n_xb; j++)
             fab[i + j] += fa[i] * fb[j];
 
     return xab ;

inst/examples/ConvolveBenchmarks/convolve3_cpp.cpp

@@ -13,7 +13,7 @@ RcppExport SEXP convolve3cpp(SEXP a, SEXP b){
     Rcpp::NumericVector xab(nab);
 
     for (int i = 0; i < n_xa; i++)
-        for (int j = 0; j < n_xb; j++) 
+        for (int j = 0; j < n_xb; j++)
             xab[i + j] += xa[i] * xb[j];
 
     return xab ;

inst/examples/ConvolveBenchmarks/convolve4_cpp.cpp

@@ -11,13 +11,13 @@ RcppExport SEXP convolve4cpp(SEXP a, SEXP b) {
     int n_xb = xb.size() ;
     int nab = n_xa + n_xb - 1;
     Rcpp::NumericVector xab(nab,0.0);
-    
+
     double* pa = xa.begin() ;
     double* pb = xb.begin() ;
     double* pab = xab.begin() ;
-    int i,j=0; 
+    int i,j=0;
     for (i = 0; i < n_xa; i++)
-	for (j = 0; j < n_xb; j++) 
+	for (j = 0; j < n_xb; j++)
 	    pab[i + j] += pa[i] * pb[j];
 
     return xab ;

inst/examples/ConvolveBenchmarks/convolve5_cpp.cpp

@@ -10,7 +10,7 @@ RcppExport SEXP convolve5cpp(SEXP a, SEXP b) {
     NumericVector xa(a); int n_xa = xa.size() ;
     NumericVector xb(b); int n_xb = xb.size() ;
     NumericVector xab(n_xa + n_xb - 1,0.0);
-    
+
     Range r( 0, n_xb-1 );
     for(int i=0; i<n_xa; i++, r++){
     	xab[ r ] += xa[i] * xb ;