--- imach/src/imach.c	2019/05/20 13:03:18	1.296
+++ imach/src/imach.c	2019/05/22 18:37:08	1.299
@@ -1,6 +1,15 @@
-/* $Id: imach.c,v 1.296 2019/05/20 13:03:18 brouard Exp $
+/* $Id: imach.c,v 1.299 2019/05/22 18:37:08 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.299  2019/05/22 18:37:08  brouard
+  Summary: Cleaned 0.99r19
+
+  Revision 1.298  2019/05/22 18:19:56  brouard
+  *** empty log message ***
+
+  Revision 1.297  2019/05/22 17:56:10  brouard
+  Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1
+
   Revision 1.296  2019/05/20 13:03:18  brouard
   Summary: Projection syntax simplified
 
@@ -1107,12 +1116,12 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.296 2019/05/20 13:03:18 brouard Exp $ */
+/* $Id: imach.c,v 1.299 2019/05/22 18:37:08 brouard Exp $ */
 /* $State: Exp $ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
 char copyright[]="April 2018,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2018";
-char fullversion[]="$Revision: 1.296 $ $Date: 2019/05/20 13:03:18 $"; 
+char fullversion[]="$Revision: 1.299 $ $Date: 2019/05/22 18:37:08 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -3046,7 +3055,7 @@ double **pmij(double **ps, double *cov,
   sumnew=0.;
   /*for (ii=1;ii<=nlstate+ndeath;ii++){*/
   for (ii=1;ii<=nlstate;ii++){ /* Only on live states */
-    /* printf(" agefin=%d, ii=%d, ij=%d, prev=%f\n",(int)agefin,ii, ij, prevacurrent[(int)agefin][ii][ij]);  */
+    /* printf(" agefin=%d, ii=%d, ij=%d, prev=%f\n",(int)agefin,ii, ij, prevacurrent[(int)agefin][ii][ij]); */
     sumnew+=prevacurrent[(int)agefin][ii][ij];
   }
   if(sumnew >0.01){  /* At least some value in the prevalence */
@@ -4421,6 +4430,20 @@ void pstamp(FILE *fichier)
   fprintf(fichier,"# %s.%s\n#IMaCh version %s, %s\n#%s\n# %s", optionfilefiname,optionfilext,version,copyright, fullversion, strstart);
 }
 
+void date2dmy(double date,double *day, double *month, double *year){
+  double yp=0., yp1=0., yp2=0.;
+  
+  yp1=modf(date,&yp);/* extracts integral of date in yp  and
+			fractional in yp1 */
+  *year=yp;
+  yp2=modf((yp1*12),&yp);
+  *month=yp;
+  yp1=modf((yp2*30.5),&yp);
+  *day=yp;
+  if(*day==0) *day=1;
+  if(*month==0) *month=1;
+}
+
 
 
 /************ Frequencies ********************/
@@ -5189,11 +5212,11 @@ void prevalence(double ***probs, double
 
 void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc, double **agev, int  firstpass, int lastpass, int imx, int nlstate, int stepm)
 {
-  /* Concatenates waves: wav[i] is the number of effective (useful waves) of individual i.
+  /* Concatenates waves: wav[i] is the number of effective (useful waves in the sense that a non interview is useless) of individual i.
      Death is a valid wave (if date is known).
      mw[mi][i] is the mi (mi=1 to wav[i])  effective wave of individual i
      dh[m][i] or dh[mw[mi][i]][i] is the delay between two effective waves m=mw[mi][i]
-     and mw[mi+1][i]. dh depends on stepm.
+     and mw[mi+1][i]. dh depends on stepm. s[m][i] exists for any wave from firstpass to lastpass
   */
 
   int i=0, mi=0, m=0, mli=0;
@@ -8321,20 +8344,6 @@ set ter svg size 640, 480\nunset log y\n
  }/* End movingaverage */
  
 
- int date2dmy(double date,double *day, double *month, double *year){
-   double yp=0., yp1=0., yp2=0.;
-   
-   yp1=modf(date,&yp);/* extracts integral of date in yp  and
-                          fractional in yp1 */
-   *year=yp;
-   yp2=modf((yp1*12),&yp);
-   *month=yp;
-   yp1=modf((yp2*30.5),&yp);
-   *day=yp;
-   if(*day==0) *day=1;
-   if(*month==0) *month=1;
-   return;
- }
  
 /************** Forecasting ******************/
 /* void prevforecast(char fileres[], double dateintmean, double anprojd, double mprojd, double jprojd, double ageminpar, double agemax, double dateprev1, double dateprev2, int mobilav, double ***prev, double bage, double fage, int firstpass, int lastpass, double anprojf, double p[], int cptcoveff)*/
@@ -10748,8 +10757,8 @@ int hPijx(double *p, int bage, int fage)
       /* for (agedeb=fage; agedeb>=bage; agedeb--){ /\* If stepm=6 months *\/ */
       for (agedeb=bage; agedeb<=fage; agedeb++){ /* If stepm=6 months and estepm=24 (2 years) */
 	/* nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); /\* Typically 20 years = 20*12/6=40 *\/ */
-	nhstepm=(int) rint((agedeb-ageminl)*YEARM/stepm); /* Typically 20 years = 20*12/6=40 */
-	nhstepm = nhstepm/hstepm; /* Typically 40/4=10, because estepm=24 stepm=6 => hstepm=24/6=4 */
+	nhstepm=(int) rint((agedeb-ageminl)*YEARM/stepm+0.1)-1; /* Typically 20 years = 20*12/6=40 or 55*12/24=27.5-1.1=>27 */
+	nhstepm = nhstepm/hstepm; /* Typically 40/4=10, because estepm=24 stepm=6 => hstepm=24/6=4 or 28*/
 	
 	/*	  nhstepm=nhstepm*YEARM; aff par mois*/
 	
@@ -12224,6 +12233,7 @@ Please run with mle=-1 to get a correct
 	fputs(line,stdout);
 	fputs(line,ficparo);
 	fputs(line,ficlog);
+	fputs(line,ficres);
 	continue;
       }else
 	break;
@@ -12269,6 +12279,7 @@ Please run with mle=-1 to get a correct
 	fputs(line,stdout);
 	fputs(line,ficparo);
 	fputs(line,ficlog);
+	fputs(line,ficres);
 	continue;
       }else
 	break;
@@ -12294,6 +12305,7 @@ Please run with mle=-1 to get a correct
 	fputs(line,stdout);
 	fputs(line,ficparo);
 	fputs(line,ficlog);
+	fputs(line,ficres);
 	continue;
       }else
 	break;
@@ -12327,6 +12339,7 @@ Please run with mle=-1 to get a correct
 	fputs(line,stdout);
 	fputs(line,ficparo);
 	fputs(line,ficlog);
+	fputs(line,ficres);
 	continue;
       }else if(sscanf(line,"prevforecast=%[^\n]\n",modeltemp))
 	parameterline=11;
@@ -12350,7 +12363,9 @@ Please run with mle=-1 to get a correct
           prvforecast = 1;
 	} 
 	else if((num_filled=sscanf(line,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",&prevfcast,&yrfproj,&mobilavproj)) !=EOF){/* && (num_filled == 3))*/
-          printf(" Num_filled=%d, yearsfproj=%lf, mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+	  printf("prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+	  fprintf(ficlog,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
+	  fprintf(ficres,"prevforecast=%d yearsfproj=%lf mobil_average=%d\n",prevfcast,yrfproj,mobilavproj);
           prvforecast = 2;
 	}
 	else {
@@ -12371,7 +12386,9 @@ Please run with mle=-1 to get a correct
           prvbackcast = 1;
 	} 
 	else if((num_filled=sscanf(line,"prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",&prevbcast,&yrbproj,&mobilavproj)) ==3){/* && (num_filled == 3))*/
-          printf(" Num_filled=%d, yearsbproj=%lf, mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+	  printf("prevbackcast=%d yearsbproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+	  fprintf(ficlog,"prevbackcast=%d yearsfproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
+	  fprintf(ficres,"prevbackcast=%d yearsfproj=%lf mobil_average=%d\n",prevbcast,yrbproj,mobilavproj);
           prvbackcast = 2;
 	}
 	else {
@@ -12380,22 +12397,6 @@ Please run with mle=-1 to get a correct
 	  goto end;
 	}
 	break;
-	/* /\*fscanf(ficpar,"backcast=%d starting-back-date=%lf/%lf/%lf final-back-date=%lf/%lf/%lf mobil_average=%d\n",&backcast,&jback1,&mback1,&anback1,&jback2,&mback2,&anback2,&mobilavproj);*\/ */
-	/* if((num_filled=sscanf(line,"backcast=%d starting-back-date=%lf/%lf/%lf final-back-date=%lf/%lf/%lf mobil_average=%d\n",&backcast,&jback1,&mback1,&anback1,&jback2,&mback2,&anback2,&mobilavproj)) !=EOF){ */
-	/*   if (num_filled != 8) { */
-	/*     printf("Error: Not 8 (data)parameters in line but %d, for example:backcast=1 starting-back-date=1/1/1990 final-back-date=1/1/1970 mobil_average=1\n, your line=%s . Probably you are running an older format.\n",num_filled,line); */
-	/*     fprintf(ficlog,"Error: Not 8 (data)parameters in line but %d, for example:backcast=1 starting-back-date=1/1/1990 final-back-date=1/1/1970 mobil_average=1\n, your line=%s . Probably you are running an older format.\n",num_filled,line); */
-	/*     goto end; */
-	/*   } */
-	/*   printf("backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-	/*   fprintf(ficparo,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-	/*   fprintf(ficlog,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-	/*   fprintf(ficres,"backcast=%d starting-back-date=%.lf/%.lf/%.lf final-back-date=%.lf/%.lf/%.lf mobil_average=%d\n",backcast,jback1,mback1,anback1,jback2,mback2,anback2,mobilavproj); */
-	/*   /\* day and month of proj2 are not used but only year anproj2.*\/ */
-	/*   dateback1=anback1+(mback1-1)/12.+(jback1-1)/365.; */
-	/*   dateback2=anback2+(mback2-1)/12.+(jback2-1)/365.; */
-	/* } */
-	/* break; */
       case 13:
 	if((num_filled=sscanf(line,"result:%[^\n]\n",resultline)) !=EOF){
 	  if (num_filled == 0){