From noreply at r-forge.r-project.org  Fri Apr 19 17:50:42 2013
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Fri, 19 Apr 2013 17:50:42 +0200 (CEST)
Subject: [Deoptim-commits] r112 - pkg/DEoptim/src
Message-ID: <20130419155042.52D6F184C2B@r-forge.r-project.org>

Author: bodanker
Date: 2013-04-19 17:50:42 +0200 (Fri, 19 Apr 2013)
New Revision: 112

Modified:
   pkg/DEoptim/src/de4_0.c
Log:
- fix valgrind report of memory overlap


Modified: pkg/DEoptim/src/de4_0.c
===================================================================
--- pkg/DEoptim/src/de4_0.c	2012-09-30 07:18:17 UTC (rev 111)
+++ pkg/DEoptim/src/de4_0.c	2013-04-19 15:50:42 UTC (rev 112)
@@ -174,11 +174,9 @@
   PROTECT(sexp_gta_popP = allocMatrix(REALSXP, i_NP, i_D)); P++; /* FIXME THIS HAD 2x the rows!!! */
   PROTECT(sexp_gta_oldP = allocMatrix(REALSXP, i_NP, i_D)); P++;
   PROTECT(sexp_gta_newP = allocMatrix(REALSXP, i_NP, i_D)); P++;
-  PROTECT(sexp_map_pop  = allocMatrix(REALSXP, i_NP, i_D)); P++;
   double *ngta_popP = REAL(sexp_gta_popP); /* FIXME THIS HAD 2x the rows!!! */
   double *ngta_oldP = REAL(sexp_gta_oldP);
   double *ngta_newP = REAL(sexp_gta_newP);
-  double *nmap_pop  = REAL(sexp_map_pop);
 
   /* Data structures for objective function values associated with
    * parameter vectors */
@@ -263,7 +261,7 @@
     }
   }
   PROTECT(sexp_map_pop  = popEvaluate(l_nfeval, sexp_gta_popP, fnMap, rho, 0));
-  memcpy(REAL(sexp_gta_popP), REAL(sexp_map_pop), i_NP * i_D * sizeof(double));
+  memmove(REAL(sexp_gta_popP), REAL(sexp_map_pop), i_NP * i_D * sizeof(double)); // valgrind reports memory overlap here
   UNPROTECT(1);  // sexp_map_pop
   PROTECT(sexp_gta_popC = popEvaluate(l_nfeval, sexp_gta_popP,  fcall, rho, 1));
   ngta_popC = REAL(sexp_gta_popC);
@@ -424,7 +422,7 @@
     /* evaluate mutated population */
     if(i_iter > 1) UNPROTECT(1);  // previous iteration's sexp_t_tmpC
     PROTECT(sexp_map_pop = popEvaluate(l_nfeval, sexp_t_tmpP,  fnMap, rho, 0));
-    memcpy(REAL(sexp_t_tmpP), REAL(sexp_map_pop), i_NP * i_D * sizeof(double));
+    memmove(REAL(sexp_t_tmpP), REAL(sexp_map_pop), i_NP * i_D * sizeof(double)); // valgrind reports memory overlap here
     UNPROTECT(1);  // sexp_map_pop
     PROTECT(sexp_t_tmpC  = popEvaluate(l_nfeval, sexp_t_tmpP, fcall, rho, 1));
     nt_tmpC = REAL(sexp_t_tmpC);


From noreply at r-forge.r-project.org  Sat Apr 20 08:13:09 2013
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sat, 20 Apr 2013 08:13:09 +0200 (CEST)
Subject: [Deoptim-commits] r113 - in pkg/DEoptim: . R
Message-ID: <20130420061309.8EE791812C1@r-forge.r-project.org>

Author: kmm
Date: 2013-04-20 08:13:09 +0200 (Sat, 20 Apr 2013)
New Revision: 113

Modified:
   pkg/DEoptim/DESCRIPTION
   pkg/DEoptim/NEWS
   pkg/DEoptim/R/zzz.R
Log:
zzz.R, DESCRIPTION

Modified: pkg/DEoptim/DESCRIPTION
===================================================================
--- pkg/DEoptim/DESCRIPTION	2013-04-19 15:50:42 UTC (rev 112)
+++ pkg/DEoptim/DESCRIPTION	2013-04-20 06:13:09 UTC (rev 113)
@@ -1,13 +1,13 @@
 Package: DEoptim
-Version: 2.3.1
-Date: $Date$
+Version: 2.3-1
 Title: Global optimization by Differential Evolution
-Author: David Ardia, Katharine Mullen, Brian Peterson, Joshua Ulrich
-Contributor:  Kris Boudt 
+Author: David Ardia, Katharine Mullen, Brian Peterson, and Joshua Ulrich, with contributions from Kris Boudt
+Authors at R: c(person("David", "Ardia", role = c("aut")),person("Katharine", "Mullen", role = c("aut", "cre"), email="mullenkate at gmail.com"),person("Brian", "Peterson", role = "aut"),person("Joshua", "Ulrich", role = "aut"))
 Maintainer: Katharine Mullen <mullenkate at gmail.com>
 Description: This package provides the DEoptim function which performs
         global optimization by differential evolution.
 Suggests: foreach
 License: GPL (>= 2)
 Repository: CRAN
-
+Packaged: 2012-07-01 21:09:15 UTC; kmm
+Date/Publication: 2012-07-01 21:59:57

Modified: pkg/DEoptim/NEWS
===================================================================
--- pkg/DEoptim/NEWS	2013-04-19 15:50:42 UTC (rev 112)
+++ pkg/DEoptim/NEWS	2013-04-20 06:13:09 UTC (rev 113)
@@ -1,3 +1,9 @@
+Changes in version 2.2-2
+  o Change to de4_0.c to replace memcpy with memmove
+
+Changes in version 2.2-1
+  o Invisible-to-users changes to evaluate.c to fix misuse of isnan
+
 Changes in version 2.2-0
   o Thanks to Joshua Ulrich and Kris Boudt, parallel operation is possible, 
     using foreach.

Modified: pkg/DEoptim/R/zzz.R
===================================================================
--- pkg/DEoptim/R/zzz.R	2013-04-19 15:50:42 UTC (rev 112)
+++ pkg/DEoptim/R/zzz.R	2013-04-20 06:13:09 UTC (rev 113)
@@ -1,6 +1,10 @@
 ".onLoad" <- function (lib, pkg)
 {
   library.dynam(pkg, pkg, lib)
+  
+}
+".onAttach" <- function (lib, pkg)
+{
   packageStartupMessage("\nDEoptim package",
    "\nDifferential Evolution algorithm in R",
    "\nAuthors: D. Ardia, K. Mullen, B. Peterson and J. Ulrich\n")