four more /usr/bin/env r conversions

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,14 @@
+2016-02-27  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/examples/RcppInline/RcppInlineWithLibsExamples.r: Switched to
+        using '/usr/bin/env r', switch to using 'cxxfunction' and RcppGSL plugin
+
+        * inst/examples/RcppInline/external_pointer.r: Switched to '/usr/bin/env r'
+        * inst/examples/RcppInline/RcppInlineExample.r: Idem
+        * inst/examples/ConvolveBenchmarks/overhead.r: Idem
+
+        * inst/include/Rcpp/Fast.h (Rcpp): Undo two const declarations
+
 2016-02-23  Dirk Eddelbuettel  <[email protected]>
 
         * inst/examples/OpenMP/OpenMPandInline.r: Switched to '/usr/bin/env r'

inst/examples/ConvolveBenchmarks/overhead.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r
+#!/usr/bin/env r
 
 set.seed(42)
 a <- rnorm(100)
@@ -17,12 +17,8 @@ overhead_cpp <- function(a,b) .Call( overhead_cpp_symbol, a, b )
 ## load benchmarkin helper function
 suppressMessages(library(rbenchmark))
 
-benchmark(
-
-    overhead_cpp(a,b),
-    overhead_c(a,b),
-    
-            columns=c("test", "replications", "elapsed", "relative", "user.self", "sys.self"),
-                order="relative",
-                replications=10000)
-
+res <- benchmark(overhead_cpp(a,b), overhead_c(a,b),
+                 columns=c("test", "replications", "elapsed", "relative", "user.self", "sys.self"),
+                 order="relative",
+                 replications=10000)
+print(res)

inst/examples/RcppInline/RcppInlineExample.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r
+#!/usr/bin/env r
 
 suppressMessages(library(Rcpp))
 suppressMessages(library(inline))

inst/examples/RcppInline/RcppInlineWithLibsExamples.r

@@ -1,6 +1,6 @@
-#!/usr/bin/r -t
+#!/usr/bin/env r
 #
-# Copyright (C) 2009 - 2010	Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2016  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -18,6 +18,7 @@
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 suppressMessages(library(Rcpp))
+suppressMessages(library(RcppGSL))
 suppressMessages(library(inline))
 
 firstExample <- function() {
@@ -29,22 +30,20 @@ firstExample <- function() {
 
     r = gsl_rng_alloc (gsl_rng_default);
 
-    printf("generator type: %s\\n", gsl_rng_name (r));
-    printf("seed = %lu\\n", gsl_rng_default_seed);
+    printf("  generator type: %s\\n", gsl_rng_name (r));
+    printf("  seed = %lu\\n", gsl_rng_default_seed);
     v = gsl_rng_get (r);
-    printf("first value = %.0f\\n", v);
+    printf("  first value = %.0f\\n", v);
 
     gsl_rng_free(r);
     return R_NilValue;
     '
 
     ## turn into a function that R can call
     ## compileargs redundant on Debian/Ubuntu as gsl headers are found anyway
-    funx <- cfunction(signature(), gslrng,
-                      includes="#include <gsl/gsl_rng.h>",
-                      Rcpp=FALSE,
-                      cppargs="-I/usr/include",
-                      libargs="-lgsl -lgslcblas")
+    funx <- cxxfunction(signature(), gslrng,
+                        includes="#include <gsl/gsl_rng.h>",
+                        plugin="RcppGSL")
 
     cat("Calling first example\n")
     funx()
@@ -67,9 +66,9 @@ secondExample <- function() {
     v = gsl_rng_get (r);
 
     #ifndef BeSilent
-    printf("generator type: %s\\n", gsl_rng_name (r));
-    printf("seed = %d\\n", seed);
-    printf("first value = %.0f\\n", v);
+    printf("  generator type: %s\\n", gsl_rng_name (r));
+    printf("  seed = %d\\n", seed);
+    printf("  first value = %.0f\\n", v);
     #endif
 
     gsl_rng_free(r);
@@ -79,19 +78,20 @@ secondExample <- function() {
     ## turn into a function that R can call
     ## compileargs redundant on Debian/Ubuntu as gsl headers are found anyway
     ## use additional define for compile to suppress output
-    funx <- cfunction(signature(par="numeric"), gslrng,
-                      includes="#include <gsl/gsl_rng.h>",
-                      Rcpp=TRUE,
-                      cppargs="-I/usr/include",
-                      libargs="-lgsl -lgslcblas")
+    funx <- cxxfunction(signature(par="numeric"), gslrng,
+                        includes="#include <gsl/gsl_rng.h>",
+                        plugin="RcppGSL")
     cat("\n\nCalling second example without -DBeSilent set\n")
     print(funx(0))
 
-    funx <- cfunction(signature(par="numeric"), gslrng,
-                      includes="#include <gsl/gsl_rng.h>",
-                      Rcpp=TRUE,
-                      cppargs="-I/usr/include -DBeSilent",
-                      libargs="-lgsl -lgslcblas")
+
+    ## now override settings to add -D flag
+    settings <- getPlugin("RcppGSL")
+    settings$env$PKG_CPPFLAGS <- paste(settings$PKG_CPPFLAGS, "-DBeSilent")
+    
+    funx <- cxxfunction(signature(par="numeric"), gslrng,
+                        includes="#include <gsl/gsl_rng.h>",
+                        settings=settings)
     cat("\n\nCalling second example with -DBeSilent set\n")
     print(funx(0))
 
@@ -123,12 +123,10 @@ thirdExample <- function() {
     ## turn into a function that R can call
     ## compileargs redundant on Debian/Ubuntu as gsl headers are found anyway
     ## use additional define for compile to suppress output
-    funx <- cfunction(signature(s="numeric", n="numeric"),
-                      gslrng,
-                      includes="#include <gsl/gsl_rng.h>",
-                      Rcpp=TRUE,
-                      cppargs="-I/usr/include",
-                      libargs="-lgsl -lgslcblas")
+    funx <- cxxfunction(signature(s="numeric", n="numeric"),
+                        gslrng,
+                        includes="#include <gsl/gsl_rng.h>",
+                        plugin="RcppGSL")
     cat("\n\nCalling third example with seed and length\n")
     print(funx(0, 5))
 
@@ -160,14 +158,12 @@ fourthExample <- function() {
     ## turn into a function that R can call
     ## compileargs redundant on Debian/Ubuntu as gsl headers are found anyway
     ## use additional define for compile to suppress output
-    funx <- cfunction(signature(s="numeric", n="numeric"),
-                      gslrng,
-                      includes=c("#include <gsl/gsl_rng.h>",
-                                 "using namespace Rcpp;",
-                                 "using namespace std;"),
-                      Rcpp=TRUE,
-                      cppargs="-I/usr/include",
-                      libargs="-lgsl -lgslcblas")
+    funx <- cxxfunction(signature(s="numeric", n="numeric"),
+                        gslrng,
+                        includes=c("#include <gsl/gsl_rng.h>",
+                                   "using namespace Rcpp;",
+                                   "using namespace std;"),
+                        plugin="RcppGSL")
     cat("\n\nCalling fourth example with seed, length and namespaces\n")
     print(funx(0, 5))
 

inst/examples/RcppInline/external_pointer.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r -t
+#!/usr/bin/env r
 #
 # Copyright (C) 2009 - 2010	Romain Francois
 #

inst/include/Rcpp/Fast.h

@@ -2,7 +2,7 @@
 //
 // Fast.h: Rcpp R/C++ interface class library -- faster vectors (less interface)
 //
-// Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2016  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -26,19 +26,19 @@ namespace Rcpp {
 template <typename VECTOR>
 class Fast {
 public:
-    typedef typename VECTOR::stored_type value_type ;
+    typedef typename VECTOR::stored_type value_type;
 
-    Fast( const VECTOR& v_) : v(v_), data( v_.begin() ){}
+    Fast( /*const*/ VECTOR& v_) : v(v_), data(v_.begin()) {}
 
-    inline value_type& operator[]( R_xlen_t i){ return data[i] ; }
-    inline const value_type& operator[]( R_xlen_t i) const { return data[i] ; }
-    inline R_xlen_t size() const { return v.size() ; }
+    inline value_type& operator[](R_xlen_t i) { return data[i]; }
+    inline const value_type& operator[](R_xlen_t i) const { return data[i]; }
+    inline R_xlen_t size() const { return v.size(); }
 
 private:
-    const VECTOR& v ;
-    value_type* data ;
+    /*const*/ VECTOR& v;
+    value_type* data;
 
-} ;
+};
 }
 
 #endif