minor cleanup

Author: ebilir

C/mcmc_fun/MHMCMC/MCMC_FUN/STEP_AFDEMCMC.c

@@ -11,7 +11,7 @@ double STEP_AFDEMCMC(double *PARS, double *pars_new, PARAMETER_INFO PI, int C, i
     /* Step 1. Find random sample (reference chain) other than current chain */
     C1=C;
     while (C1==C){
-        C1 = ceil((double)random() * NC / ((double)RAND_MAX)) - 1;
+        C1 = floor((double)random() * NC / ((double)RAND_MAX + 1.0));
     }
 
     // /* Step 2. Allocate memory for normalized parameter vectors */

C/mcmc_fun/MHMCMC/MCMC_FUN/STEP_DEMCMC.c

@@ -27,9 +27,9 @@ int withinlim=1;
 
 	/*first: pick c1 and c2, make sure that (a) they are between 1 and NC, and (b) they are not C*/
 	c1=C;c2=C;
-	while (c1==C | c2==C | c1==c2){
-	c1=ceil((double)random()*NC/((double)RAND_MAX))-1;
-	c2=ceil((double)random()*NC/((double)RAND_MAX))-1;}
+	while (c1==C || c2==C || c1==c2){
+	c1=floor((double)random() * NC / ((double)RAND_MAX + 1.0));
+	c2=floor((double)random() * NC / ((double)RAND_MAX + 1.0));}
 mstep=0;
 	/*SAMPLING PARAMETERS*/
 	for (n=0;n<PI.npars;n++){
@@ -42,7 +42,7 @@ mstep=0;
 
 
 	npar[n]=npar[n]+step[n];
-                if (npar[n]<0 | npar[n]>1){withinlim=0;}
+                if (npar[n]<0 || npar[n]>1){withinlim=0;}
 
 }
 

C/mcmc_fun/MHMCMC/MCMC_FUN/WRITE_DEMCMC_RESULTS.c

@@ -90,7 +90,7 @@ int WRITE_DEMCMC_RESTART(double *PARS,PARAMETER_INFO PI,MCMC_OPTIONS MCO, int IT
   FAILONERROR(nc_def_dim(ncid,"Sample",NC_UNLIMITED,&sampleDimID));
   FAILONERROR(nc_def_var(ncid,"Parameters",NC_DOUBLE,2,(const int[]){sampleDimID,paramDimID},&parsVarID));
   //Note: it's a bit odd this is an int, and not a uint or long. Likely does not matter though.
-  FAILONERROR(nc_put_att_int(ncid,parsVarID,"N",NC_INT,sizeof(int),&ITER));
+  FAILONERROR(nc_put_att_int(ncid,parsVarID,"N",NC_INT,1,&ITER));
 
 
 //TODO: store N and rng seed ------------------------------------------------------