more /usr/bin/env r conversions

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,11 @@
+2016-03-03  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/examples/FastLM/benchmarkLongley.r: Switched to '/usr/bin/env r'
+        * inst/examples/FastLM/fastLMviaArmadillo.r: Idem
+        * inst/examples/FastLM/fastLMviaGSL.r: Idem
+        * inst/examples/FastLM/lmArmadillo.R: Idem
+        * inst/examples/FastLM/lmGSL.R: Idem
+
 2016-02-27  Dirk Eddelbuettel  <[email protected]>
 
         * inst/examples/RcppInline/RcppInlineWithLibsExamples.r: Switched to

inst/examples/FastLM/benchmarkLongley.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r -t
+#!/usr/bin/env r
 #
 # Comparison benchmark -- using old and small Longley data set
 #

inst/examples/FastLM/fastLMviaArmadillo.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r -t
+#!/usr/bin/env r
 #
 # A faster lm() replacement based on Armadillo
 #

inst/examples/FastLM/fastLMviaGSL.r

@@ -1,4 +1,4 @@
-#!/usr/bin/r -t
+#!/usr/bin/env r
 #
 # A faster lm() replacement based on GNU GSL
 #

inst/examples/FastLM/lmArmadillo.R

@@ -49,11 +49,9 @@ lmArmadillo <- function() {
     '
 
     ## turn into a function that R can call
-    fun <- cfunction(signature(Ysexp="numeric", Xsexp="numeric"),
-                     src,
-                     includes="#include <armadillo>",
-                     Rcpp=TRUE,
-                     cppargs="-I/usr/include",
-                     libargs="-larmadillo -llapack")
+    fun <- cxxfunction(signature(Ysexp="numeric", Xsexp="numeric"),
+                       src,
+                       includes="#include <armadillo>",
+                       plugin="RcppArmadillo")
 }
 

inst/examples/FastLM/lmGSL.R

@@ -62,10 +62,8 @@ lmGSL <- function() {
 
     ## turn into a function that R can call
     ## compileargs redundant on Debian/Ubuntu as gsl headers are found anyway
-    fun <- cfunction(signature(Ysexp="numeric", Xsexp="numeric"),
-                     src,
-                     includes="#include <gsl/gsl_multifit.h>",
-                     Rcpp=TRUE,
-                     cppargs="-I/usr/include",
-                     libargs="-lgsl -lgslcblas")
+    fun <- cxxfunction(signature(Ysexp="numeric", Xsexp="numeric"),
+                       src,
+                       includes="#include <gsl/gsl_multifit.h>",
+                       plugin="RcppGSL")
 }