From ee3ef7394fb139ad5b0ce4a043e40f0825b37256 Mon Sep 17 00:00:00 2001
From: "N. Brouard" <brouard@ined.fr>
Date: Tue, 27 Jun 2017 10:17:50 +0000
Subject: [PATCH] Summary: Some bug with rint

---
 src/imach.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/imach.c b/src/imach.c
index cb9fe75..1d85e91 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.270  2017/05/24 05:45:29  brouard
+  *** empty log message ***
+
   Revision 1.269  2017/05/23 08:39:25  brouard
   Summary: Code into subroutine, cleanings
 
@@ -3240,7 +3243,7 @@ double ***hbxij(double ***po, int nhstepm, double age, int hstepm, double *x, do
       newm=savm;
       /* Covariates have to be included here again */
       cov[1]=1.;
-      agexact=age-((h-1)*hstepm + (d))*stepm/YEARM; /* age just before transition, d or d-1? */
+      agexact=age-( (h-1)*hstepm + (d)  )*stepm/YEARM; /* age just before transition, d or d-1? */
       /* agexact=age+((h-1)*hstepm + (d-1))*stepm/YEARM; /\* age just before transition *\/ */
       cov[2]=agexact;
       if(nagesqr==1)
@@ -7039,7 +7042,7 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
 	
 	fprintf(ficgp,"\" t\"\" w l lt 1,\"%s\" u 1:((",subdirf2(fileresu,"P_"));
         if(cptcoveff ==0){
-	  fprintf(ficgp,"$%d)) t 'Observed prevalence in state %d' with line lt 3",	 2+(cpt-1),  cpt );
+	  fprintf(ficgp,"$%d)) t 'Observed prevalence in state %d' with line lt 3",	 2+3*(cpt-1),  cpt );
 	}else{
 	  kl=0;
 	  for (k=1; k<=cptcoveff; k++){    /* For each combination of covariate  */
@@ -7097,17 +7100,17 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
 	      if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
 	      else        fprintf(ficgp," %%*lf (%%*lf)");
 	    }
-	    fprintf(ficgp,"\" t\"Backward (stable) prevalence\" w l lt 0,\"%s\" every :::%d::%d u 1:($2==%d ? $3+1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres);
+	    fprintf(ficgp,"\" t\"Backward (stable) prevalence\" w l lt 6 dt 3,\"%s\" every :::%d::%d u 1:($2==%d ? $3+1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres);
 	    for (i=1; i<= nlstate ; i ++) {
 	      if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
 	      else fprintf(ficgp," %%*lf (%%*lf)");
 	    } 
-	    fprintf(ficgp,"\" t\"95%% CI\" w l lt 1,\"%s\" every :::%d::%d u 1:($2==%d ? $3-1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres); 
+	    fprintf(ficgp,"\" t\"95%% CI\" w l lt 6,\"%s\" every :::%d::%d u 1:($2==%d ? $3-1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres); 
 	    for (i=1; i<= nlstate ; i ++) {
 	      if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
 	      else fprintf(ficgp," %%*lf (%%*lf)");
 	    } 
-	    fprintf(ficgp,"\" t\"\" w l lt 1");
+	    fprintf(ficgp,"\" t\"\" w l lt 6");
 	  } /* end if backprojcast */
 	} /* end if backcast */
 	fprintf(ficgp,"\nset out ;unset label;\n");
@@ -8342,15 +8345,16 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
       /* for (yearp=0; yearp<=(anproj2-anproj1);yearp +=stepsize) {  */
       fprintf(ficresfb,"\n");
       fprintf(ficresfb,"\n# Back Forecasting at date %.lf/%.lf/%.lf ",jback1,mback1,anback1+yearp);
-      /* printf("\n# Back Forecasting at date %.lf/%.lf/%.lf ",jback1,mback1,anback1+yearp); */
+      printf("\n# Back Forecasting at date %.lf/%.lf/%.lf ",jback1,mback1,anback1+yearp);
       /* for (agec=bage; agec<=agemax-1; agec++){  /\* testing *\/ */
       for (agec=bage; agec<=fage; agec++){  /* testing */
 	/* We compute bij at age agec over nhstepm, nhstepm decreases when agec increases because of agemax;*/
-	nhstepm=(int) rint((agec-agelim)*YEARM/stepm);
+	nhstepm=(int) (agec-agelim) *YEARM/stepm;/*	nhstepm=(int) rint((agec-agelim)*YEARM/stepm);*/
 	nhstepm = nhstepm/hstepm;
 	p3mat=ma3x(1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
 	oldm=oldms;savm=savms;
 	/* computes hbxij at age agec over 1 to nhstepm */
+	/* printf("####prevbackforecast debug  agec=%.2f nhstepm=%d\n",agec, nhstepm);fflush(stdout); */
 	hbxij(p3mat,nhstepm,agec,hstepm,p,prevacurrent,nlstate,stepm, k, nres);
 	/* hpxij(p3mat,nhstepm,agec,hstepm,p,             nlstate,stepm,oldm,savm, k,nres); */
 	/* Then we print p3mat for h corresponding to the right agec+h*stepms=yearp */
-- 
2.43.0