[Rcpp-commits] r2377 - in pkg/RcppDE: . R src

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

Author: edd
Date: 2010-10-31 04:51:07 +0100 (Sun, 31 Oct 2010)
New Revision: 2377

Modified:
   pkg/RcppDE/ChangeLog
   pkg/RcppDE/R/DEoptim.R
   pkg/RcppDE/src/deoptim.cpp
Log:
call the top-level C++ function as DEoptim()


Modified: pkg/RcppDE/ChangeLog
===================================================================
--- pkg/RcppDE/ChangeLog	2010-10-31 03:48:26 UTC (rev 2376)
+++ pkg/RcppDE/ChangeLog	2010-10-31 03:51:07 UTC (rev 2377)
@@ -1,5 +1,8 @@
 2010-10-30  Dirk Eddelbuettel  <edd at debian.org>
 
+	* src/deoptim.cpp: Renamed from de4_0.cpp; function renamed DEoptim
+	* R/DEoptim.R: Call renamed function "DEoptim"
+
 	* src/devol.cpp: Split function devol() off into its own file
 	* src/permute.cpp: Split function devol() off into its own file
 

Modified: pkg/RcppDE/R/DEoptim.R
===================================================================
--- pkg/RcppDE/R/DEoptim.R	2010-10-31 03:48:26 UTC (rev 2376)
+++ pkg/RcppDE/R/DEoptim.R	2010-10-31 03:51:07 UTC (rev 2377)
@@ -93,7 +93,7 @@
   ctrl$trace <- as.numeric(ctrl$trace)
   ctrl$specinitialpop <- as.numeric(ctrl$specinitialpop)
 
-  outC <- .Call("DEoptimC", lower, upper, fn1, ctrl, new.env(), PACKAGE = "RcppDE")
+  outC <- .Call("DEoptim", lower, upper, fn1, ctrl, new.env(), PACKAGE = "RcppDE")
   ##
   if (length(outC$storepop) > 0) {
     nstorepop <- floor((outC$iter - ctrl$storepopfrom) / ctrl$storepopfreq)

Modified: pkg/RcppDE/src/deoptim.cpp
===================================================================
--- pkg/RcppDE/src/deoptim.cpp	2010-10-31 03:48:26 UTC (rev 2376)
+++ pkg/RcppDE/src/deoptim.cpp	2010-10-31 03:51:07 UTC (rev 2377)
@@ -20,7 +20,7 @@
            arma::colvec & t_bestitP, arma::colvec & t_tmpP, arma::mat & d_pop, Rcpp::List & d_storepop, 
 	   arma::mat & d_bestmemit, arma::colvec & d_bestvalit, int & i_iterations, double i_pPct, long & l_nfeval);
 
-RcppExport SEXP DEoptimC(SEXP lowerS, SEXP upperS, SEXP fnS, SEXP controlS, SEXP rhoS) {
+RcppExport SEXP DEoptim(SEXP lowerS, SEXP upperS, SEXP fnS, SEXP controlS, SEXP rhoS) {
     
     try {
 	Rcpp::NumericVector f_lower(lowerS), f_upper(upperS); 		// User-defined bounds