[Rcpp-commits] r2403 - pkg/RcppDE/src

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

Author: edd
Date: 2010-11-06 21:14:57 +0100 (Sat, 06 Nov 2010)
New Revision: 2403

Added:
   pkg/RcppDE/src/evaluate.h
Removed:
   pkg/RcppDE/src/evaluate.cpp
Log:
evaluate.cpp is now evaluate.h

Deleted: pkg/RcppDE/src/evaluate.cpp
===================================================================
--- pkg/RcppDE/src/evaluate.cpp	2010-11-06 20:14:16 UTC (rev 2402)
+++ pkg/RcppDE/src/evaluate.cpp	2010-11-06 20:14:57 UTC (rev 2403)
@@ -1,33 +0,0 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
-//
-// Port of DEoptim (2.0.7) by Ardia et al to Rcpp/RcppArmadillo/Armadillo
-// Copyright (C) 2010  Dirk Eddelbuettel <edd at debian.org>
-//
-// DEoptim is Copyright (C) 2009 David Ardia and Katharine Mullen
-
-#ifndef USE_OPENMP
-#include <RcppArmadillo.h>
-
-// Slighly accelerated version of evaluate to evaluate function fcall with parameters param in environment env
-// Uses externally allocated par() vector into which param are copied
-#if 0
-double evaluate(long &l_nfeval, const double *param, SEXP par, SEXP fcall, SEXP env) {
-    memcpy(REAL(par), param, Rf_nrows(par) * sizeof(double));      // -- faster: direct access _assuming_ numeric vector
-    SEXP fn = ::Rf_lang2(fcall, par); 				   // this could be done with Rcpp 
-    SEXP sexp_fvec = ::Rf_eval(fn, env);		           // but is still a lot slower right now
-    double f_result = REAL(sexp_fvec)[0];
-    if (ISNAN(f_result)) 
-	::Rf_error("NaN value of objective function! \nPerhaps adjust the bounds.");
-    l_nfeval++;  						   // increment function evaluation count 
-    return(f_result); 
-}
-#endif
-double evaluate(SEXP par, SEXP fcall, SEXP env) {
-    SEXP fn = ::Rf_lang2(fcall, par); 				   // this could be done with Rcpp 
-    SEXP sexp_fvec = ::Rf_eval(fn, env);		           // but is still a lot slower right now
-    double f_result = REAL(sexp_fvec)[0];
-    if (ISNAN(f_result)) 
-	::Rf_error("NaN value of objective function! \nPerhaps adjust the bounds.");
-    return(f_result); 
-}
-#endif 

Copied: pkg/RcppDE/src/evaluate.h (from rev 2402, pkg/RcppDE/src/evaluate.cpp)
===================================================================
--- pkg/RcppDE/src/evaluate.h	                        (rev 0)
+++ pkg/RcppDE/src/evaluate.h	2010-11-06 20:14:57 UTC (rev 2403)
@@ -0,0 +1,33 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// Port of DEoptim (2.0.7) by Ardia et al to Rcpp/RcppArmadillo/Armadillo
+// Copyright (C) 2010  Dirk Eddelbuettel <edd at debian.org>
+//
+// DEoptim is Copyright (C) 2009 David Ardia and Katharine Mullen
+
+#ifndef USE_OPENMP
+#include <RcppArmadillo.h>
+
+// Slighly accelerated version of evaluate to evaluate function fcall with parameters param in environment env
+// Uses externally allocated par() vector into which param are copied
+#if 0
+double evaluate(long &l_nfeval, const double *param, SEXP par, SEXP fcall, SEXP env) {
+    memcpy(REAL(par), param, Rf_nrows(par) * sizeof(double));      // -- faster: direct access _assuming_ numeric vector
+    SEXP fn = ::Rf_lang2(fcall, par); 				   // this could be done with Rcpp 
+    SEXP sexp_fvec = ::Rf_eval(fn, env);		           // but is still a lot slower right now
+    double f_result = REAL(sexp_fvec)[0];
+    if (ISNAN(f_result)) 
+	::Rf_error("NaN value of objective function! \nPerhaps adjust the bounds.");
+    l_nfeval++;  						   // increment function evaluation count 
+    return(f_result); 
+}
+#endif
+double evaluate(SEXP par, SEXP fcall, SEXP env) {
+    SEXP fn = ::Rf_lang2(fcall, par); 				   // this could be done with Rcpp 
+    SEXP sexp_fvec = ::Rf_eval(fn, env);		           // but is still a lot slower right now
+    double f_result = REAL(sexp_fvec)[0];
+    if (ISNAN(f_result)) 
+	::Rf_error("NaN value of objective function! \nPerhaps adjust the bounds.");
+    return(f_result); 
+}
+#endif