correct memset

Author: merliseclyde

src/glm_mcmc.c

@@ -100,7 +100,7 @@ SEXP glm_mcmc(SEXP Y, SEXP X, SEXP Roffset, SEXP Rweights,
 	SET_STRING_ELT(ANS_names, 8, mkChar("mle.se"));
 
 	SEXP shrinkage = allocVector(REALSXP, nModels); 
-	memset(REAL(shrinkage), 0.0, sizeof(double) *nModels);
+  memset(REAL(shrinkage), 0.0, sizeof(double) *nModels);
 	SET_VECTOR_ELT(ANS, 9, shrinkage);
 	SET_STRING_ELT(ANS_names, 9, mkChar("shrinkage"));
 

src/glm_mcmc_grow.c

@@ -92,7 +92,6 @@ SEXP glm_mcmc_grow(SEXP Y, SEXP X, SEXP Roffset, SEXP Rweights,
 	SET_STRING_ELT(ANS_names, 12, mkChar("freq"));
 
 	SEXP MCMCprobs= duplicate(Rprobinit);
-	memset(REAL(MCMCprobs), 0, nModels * sizeof(double));
 	SET_VECTOR_ELT(ANS, 13, MCMCprobs);
 	SET_STRING_ELT(ANS_names, 13, mkChar("probne0.MCMC"));
 

src/lm_amcmc_growable.c

@@ -37,22 +37,27 @@ SEXP amcmc_grow(SEXP Y, SEXP X, SEXP Rweights, SEXP Rprobinit, SEXP RnModels,
   SET_STRING_ELT(ANS_names, 1, mkChar("which"));
 
   SEXP Rlogmarg = allocVector(REALSXP, nModels); 
+  memset(REAL(Rlogmarg), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 2, Rlogmarg);
   SET_STRING_ELT(ANS_names, 2, mkChar("logmarg"));
 
   SEXP modelprobs = allocVector(REALSXP, nModels);  
+  memset(REAL(modelprobs), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 3, modelprobs);
   SET_STRING_ELT(ANS_names, 3, mkChar("postprobs"));
 
   SEXP priorprobs = allocVector(REALSXP, nModels); 
+  memset(REAL(priorprobs), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 4, priorprobs);
   SET_STRING_ELT(ANS_names, 4, mkChar("priorprobs"));
 
   SEXP sampleprobs = allocVector(REALSXP, nModels); 
+  memset(REAL(sampleprobs), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 5, sampleprobs);
   SET_STRING_ELT(ANS_names, 5, mkChar("sampleprobs"));
 
   SEXP mse = allocVector(REALSXP, nModels); 
+  memset(REAL(mse), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 6, mse);
   SET_STRING_ELT(ANS_names, 6, mkChar("mse"));
 
@@ -65,23 +70,28 @@ SEXP amcmc_grow(SEXP Y, SEXP X, SEXP Rweights, SEXP Rprobinit, SEXP RnModels,
   SET_STRING_ELT(ANS_names, 8, mkChar("mle.se"));
 
   SEXP shrinkage = allocVector(REALSXP, nModels); 
+  memset(REAL(shrinkage), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 9, shrinkage);
   SET_STRING_ELT(ANS_names, 9, mkChar("shrinkage"));
 
   SEXP modeldim =  allocVector(INTSXP, nModels); 
+  memset(INTEGER(modeldim), 0, nModels * sizeof(int));
   SET_VECTOR_ELT(ANS, 10, modeldim);
   SET_STRING_ELT(ANS_names, 10, mkChar("size"));
 
   SEXP R2 = allocVector(REALSXP, nModels); 
+  memset(REAL(R2), 0.0, sizeof(double) *nModels);
   SET_VECTOR_ELT(ANS, 11, R2);
   SET_STRING_ELT(ANS_names, 11, mkChar("R2"));
 
   SEXP rank = allocVector(INTSXP, nModels); 
+  memset(INTEGER(rank), 0, nModels * sizeof(int));
   SET_VECTOR_ELT(ANS, 12, rank);
   SET_STRING_ELT(ANS_names, 12, mkChar("rank"));
 
   SEXP Rcounts =  allocVector(INTSXP, nModels); 
   counts = INTEGER(Rcounts);
+  memset(counts, 0, nModels * sizeof(int));
   SET_VECTOR_ELT(ANS, 13, Rcounts);
   SET_STRING_ELT(ANS_names, 13, mkChar("freq"));
 
@@ -92,19 +102,7 @@ SEXP amcmc_grow(SEXP Y, SEXP X, SEXP Rweights, SEXP Rprobinit, SEXP RnModels,
   SEXP NumUnique = allocVector(INTSXP, 1); 
   SET_VECTOR_ELT(ANS, 15, NumUnique);
   SET_STRING_ELT(ANS_names, 15, mkChar("n.Unique"));
-  
-  memset(REAL(Rlogmarg), 0.0, sizeof(double) *nModels);
-  memset(REAL(modelprobs), 0.0, sizeof(double) *nModels);
-  memset(REAL(priorprobs), 0.0, sizeof(double) *nModels);
-  memset(REAL(shrinkage), 0.0, sizeof(double) *nModels);
-  memset(REAL(R2), 0.0, sizeof(double) *nModels);
-  memset(REAL(Rlogmarg), 0.0, sizeof(double) *nModels);
-  memset(REAL(sampleprobs), 0.0, sizeof(double) *nModels);
-  memset(INTEGER(modeldim), 0, sizeof(int) *nModels);
-  memset(counts, 0, sizeof(int) *nModels);
-  memset(REAL(mse), 0.0, sizeof(double) *nModels);
-  memset(INTEGER(rank), 0, sizeof(int) *nModels);
-  
+
 
   setAttrib(ANS, R_NamesSymbol, ANS_names);