--- imach/src/imach.c	2002/02/28 17:49:07	1.27
+++ imach/src/imach.c	2002/03/08 16:17:18	1.30
@@ -1,4 +1,4 @@
-/* $Id: imach.c,v 1.27 2002/02/28 17:49:07 lievre Exp $
+/* $Id: imach.c,v 1.30 2002/03/08 16:17:18 lievre Exp $
    Interpolated Markov Chain
 
   Short summary of the programme:
@@ -1185,7 +1185,7 @@ void  freqsummary(char fileres[], int ag
   double pos, k2, dateintsum=0,k2cpt=0;
   FILE *ficresp;
   char fileresp[FILENAMELENGTH];
-
+ 
   pp=vector(1,nlstate);
   probs= ma3x(1,AGESUP,1,NCOVMAX, 1,NCOVMAX);
   strcpy(fileresp,"p");
@@ -1307,7 +1307,7 @@ void  freqsummary(char fileres[], int ag
 }
 
 /************ Prevalence ********************/
-void prevalence(int agemin, int agemax, int **s, double **agev, int nlstate, int imx, int *Tvar, int **nbcode, int *ncodemax,double **mint,double **anint, double dateprev1,double dateprev2, double calagedate)
+void prevalence(int agemin, float agemax, int **s, double **agev, int nlstate, int imx, int *Tvar, int **nbcode, int *ncodemax,double **mint,double **anint, double dateprev1,double dateprev2, double calagedate)
 {  /* Some frequencies */
  
   int i, m, jk, k1, i1, j1, bool, z1,z2,j;
@@ -1332,14 +1332,14 @@ void prevalence(int agemin, int agemax,
 	for (jk=-1; jk<=nlstate+ndeath; jk++)  
 	  for(m=agemin; m <= agemax+3; m++)
 	    freq[i][jk][m]=0;
-      
+     
       for (i=1; i<=imx; i++) {
 	bool=1;
 	if  (cptcovn>0) {
 	  for (z1=1; z1<=cptcoveff; z1++) 
 	    if (covar[Tvaraff[z1]][i]!= nbcode[Tvaraff[z1]][codtab[j1][z1]]) 
 	      bool=0;
-	}
+	} 
 	if (bool==1) { 
 	  for(m=firstpass; m<=lastpass; m++){
 	    k2=anint[m][i]+(mint[m][i]/12.);
@@ -1347,12 +1347,11 @@ void prevalence(int agemin, int agemax,
 	      if(agev[m][i]==0) agev[m][i]=agemax+1;
 	      if(agev[m][i]==1) agev[m][i]=agemax+2;
 	      freq[s[m][i]][s[m+1][i]][(int)(agev[m][i]+1-((int)calagedate %12)/12.)] += weight[i];
-	      freq[s[m][i]][s[m+1][i]][(int)(agemax+3+1)] += weight[i];   
+	      /* freq[s[m][i]][s[m+1][i]][(int)(agemax+3+1)] += weight[i];  */ 
 	    }
 	  }
 	}
       }
-      
 	for(i=(int)agemin; i <= (int)agemax+3; i++){ 
 	  for(jk=1; jk <=nlstate ; jk++){
 	    for(m=-1, pp[jk]=0; m <=nlstate+ndeath ; m++)
@@ -1444,7 +1443,7 @@ void  concatwav(int wav[], int **dh, int
 	  if (j >= jmax) jmax=j;
 	  if (j <= jmin) jmin=j;
 	  sum=sum+j;
-	  /* if (j<10) printf("j=%d num=%d ",j,i); */
+	  /*if (j<0) printf("j=%d num=%d \n",j,i); */
 	  }
 	}
 	else{
@@ -1452,7 +1451,7 @@ void  concatwav(int wav[], int **dh, int
 	  k=k+1;
 	  if (j >= jmax) jmax=j;
 	  else if (j <= jmin)jmin=j;
-	  /*   if (j<10) printf("j=%d jmin=%d num=%d ",j,jmin,i); */
+	  /*	    if (j<10) printf("j=%d jmin=%d num=%d ",j,jmin,i); */
 	  sum=sum+j;
 	}
 	jk= j/stepm;
@@ -1547,26 +1546,29 @@ void evsij(char fileres[], double ***eij
     /* nhstepm age range expressed in number of stepm */
     nhstepm=(int) rint((agelim-age)*YEARM/stepm); 
     /* Typically if 20 years = 20*12/6=40 stepm */ 
-    if (stepm >= YEARM) hstepm=1;
+    /*if (stepm >= YEARM) hstepm=1;*/
+hstepm=1;
     nhstepm = nhstepm/hstepm;/* Expressed in hstepm, typically 40/4=10 */
     p3mat=ma3x(1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
     /* Computed by stepm unit matrices, product of hstepm matrices, stored
        in an array of nhstepm length: nhstepm=10, hstepm=4, stepm=6 months */
     hpxij(p3mat,nhstepm,age,hstepm,x,nlstate,stepm,oldm, savm, ij);  
-
-
+hf=stepm/YEARM;
+/*printf("stepm=%d nhstepm=%d hstepm=%d age=%lf ",stepm, nhstepm, hstepm, age);*/
     for(i=1; i<=nlstate;i++)
       for(j=1; j<=nlstate;j++)
-	for (h=0, eij[i][j][(int)age]=0; h<=nhstepm; h++){
-	  eij[i][j][(int)age] +=p3mat[i][j][h];
+	for (h=0, eij[i][j][(int)age]=0; h<=nhstepm-1; h++){
+	  eij[i][j][(int)age] +=hf*(p3mat[i][j][h]+p3mat[i][j][h+1])/2.0;
 	}
     
-    hf=1;
-    if (stepm >= YEARM) hf=stepm/YEARM;
-    fprintf(ficreseij,"%.0f",age );
+    /* hf=1;
+       if (stepm >= YEARM) hf=stepm/YEARM;*/
+hf=stepm/YEARM;
+ 
+    fprintf(ficreseij,"%3.0f",age );
     for(i=1; i<=nlstate;i++)
       for(j=1; j<=nlstate;j++){
-	fprintf(ficreseij," %.4f", hf*eij[i][j][(int)age]);
+	fprintf(ficreseij," %9.4f", eij[i][j][(int)age]);
       }
     fprintf(ficreseij,"\n");
     free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
@@ -1883,7 +1885,7 @@ fclose(ficresprob);
 }
 
 /******************* Printing html file ***********/
-void printinghtml(char fileres[], char title[], char datafile[], int firstpass, int lastpass, int stepm, int weightopt, char model[],int imx,int jmin, int jmax, double jmeanint,char optionfile[],char optionfilehtm[] ){
+void printinghtml(char fileres[], char title[], char datafile[], int firstpass, int lastpass, int stepm, int weightopt, char model[],int imx,int jmin, int jmax, double jmeanint,char optionfile[],char optionfilehtm[],char rfileres[] ){
   int jj1, k1, i1, cpt;
   FILE *fichtm;
   /*char optionfilehtm[FILENAMELENGTH];*/
@@ -1894,7 +1896,7 @@ void printinghtml(char fileres[], char t
     printf("Problem with %s \n",optionfilehtm), exit(0);
   }
 
- fprintf(fichtm,"<body><ul> <font size=\"6\">Imach, Version 0.7 </font> <hr size=\"2\" color=\"#EC5E5E\"> 
+ fprintf(fichtm,"<body><ul> <font size=\"6\">Imach, Version 0.71 </font> <hr size=\"2\" color=\"#EC5E5E\"> 
 Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s<br>
 
 Total number of observations=%d <br>
@@ -1910,8 +1912,9 @@ Interval (in months) between two waves:
         - Variances of life expectancies by age and initial health status: <a href=\"v%s\">v%s</a><br>
         - Health expectancies with their variances: <a href=\"t%s\">t%s</a> <br>
         - Standard deviation of stationary prevalences: <a href=\"vpl%s\">vpl%s</a> <br>
-        - Prevalences and population forecasting: <a href=\"f%s\">f%s</a> <br>
-	<br>",title,datafile,firstpass,lastpass,stepm, weightopt,model,imx,jmin,jmax,jmean,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres);
+        - Prevalences forecasting: <a href=\"f%s\">f%s</a> <br>
+        - Population forecasting (if popforecast=1): <a href=\"pop%s\">pop%s</a> <br>
+	<br>",title,datafile,firstpass,lastpass,stepm, weightopt,model,imx,jmin,jmax,jmean,fileres,fileres,rfileres,rfileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres);
  
 fprintf(fichtm," <li>Graphs</li><p>");
 
@@ -1953,7 +1956,7 @@ fclose(fichtm);
 }
 
 /******************* Gnuplot file **************/
-void printinggnuplot(char fileres[],char optionfilefiname[],char optionfile[],char optionfilegnuplot[], double agemin, double agemax, double fage , char pathc[], double p[]){
+void printinggnuplot(char fileres[],char optionfilefiname[],char optionfile[],char optionfilegnuplot[], double agemin, double agemaxpar, double fage , char pathc[], double p[]){
 
   int m,cpt,k1,i,k,j,jk,k2,k3,ij,l;
 
@@ -2048,7 +2051,7 @@ fprintf(ficgp,"\nset out \"v%s%d%d.gif\"
     for (k1=1; k1<= m ; k1 ++) { 
     for (cpt=1; cpt<nlstate ; cpt ++) {
       k=3;
-      fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter gif small size 400,300\nplot [%.f:%.f] \"pij%s\" u ($1==%d ? ($3):1/0):($%d/($%d",agemin,agemax,fileres,k1,k+cpt+1,k+1);
+      fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter gif small size 400,300\nplot [%.f:%.f] \"pij%s\" u ($1==%d ? ($3):1/0):($%d/($%d",agemin,agemaxpar,fileres,k1,k+cpt+1,k+1);
 
       for (i=1; i< nlstate ; i ++)
 	fprintf(ficgp,"+$%d",k+i+1);
@@ -2080,7 +2083,7 @@ fprintf(ficgp,"\nset out \"v%s%d%d.gif\"
     }
 
     for(jk=1; jk <=m; jk++) {
-  fprintf(ficgp,"\nset ter gif small size 400,300\nset log y\nplot  [%.f:%.f] ",agemin,agemax);
+  fprintf(ficgp,"\nset ter gif small size 400,300\nset log y\nplot  [%.f:%.f] ",agemin,agemaxpar);
    i=1;
    for(k2=1; k2<=nlstate; k2++) {
      k3=i;
@@ -2159,9 +2162,9 @@ prevforecast(char fileres[], double anpr
 
  agelim=AGESUP;
 calagedate=(anproj1+mproj1/12.+jproj1/365.-dateintmean)*YEARM;
-  
-  prevalence(agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax,mint,anint,dateprev1,dateprev2, calagedate);
 
+  prevalence(agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax,mint,anint,dateprev1,dateprev2, calagedate);
+ 
  
   strcpy(fileresf,"f"); 
   strcat(fileresf,fileres);
@@ -2210,7 +2213,7 @@ calagedate=(anproj1+mproj1/12.+jproj1/36
       for (cpt=0; cpt<=(anproj2-anproj1);cpt++) { 
 	fprintf(ficresf,"\n");
 	fprintf(ficresf,"\n# Forecasting at date %.lf/%.lf/%.lf ",jproj1,mproj1,anproj1+cpt);   
-	
+
      	for (agedeb=(fage-((int)calagedate %12/12.)); agedeb>=(agemin-((int)calagedate %12)/12.); agedeb--){ 
 	  nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); 
 	  nhstepm = nhstepm/hstepm; 
@@ -2250,7 +2253,7 @@ calagedate=(anproj1+mproj1/12.+jproj1/36
   fclose(ficresf);
 }
 /************** Forecasting ******************/
-populforecast(char fileres[], double anproj1,double mproj1,double jproj1,double agemin, double agemax,double dateprev1, double dateprev2, int mobilav, double agedeb, double fage, int popforecast, char popfile[], double anproj2,double p[], int i2){
+populforecast(char fileres[], double anpyram,double mpyram,double jpyram,double agemin, double agemax,double dateprev1, double dateprev2, int mobilav, double agedeb, double fage, int popforecast, char popfile[], double anpyram1,double p[], int i2){
   
   int cpt, stepsize, hstepm, nhstepm, j,k,c, cptcod, i,h;
   int *popage;
@@ -2259,14 +2262,14 @@ populforecast(char fileres[], double anp
   double ***p3mat,***tabpop,***tabpopprev;
   char filerespop[FILENAMELENGTH];
 
-tabpop= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
-tabpopprev= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
- agelim=AGESUP;
-calagedate=(anproj1+mproj1/12.+jproj1/365.-dateintmean)*YEARM;
+  tabpop= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
+  tabpopprev= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
+  agelim=AGESUP;
+  calagedate=(anpyram+mpyram/12.+jpyram/365.-dateintmean)*YEARM;
   
   prevalence(agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax,mint,anint,dateprev1,dateprev2, calagedate);
-
- 
+  
+  
   strcpy(filerespop,"pop"); 
   strcat(filerespop,fileres);
   if((ficrespop=fopen(filerespop,"w"))==NULL) {
@@ -2312,12 +2315,12 @@ calagedate=(anproj1+mproj1/12.+jproj1/36
 	fprintf(ficrespop," V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]);
       }
       fprintf(ficrespop,"******\n");
-      fprintf(ficrespop,"# StartingAge FinalAge");
+      fprintf(ficrespop,"# Age");
       for(j=1; j<=nlstate+ndeath;j++) fprintf(ficrespop," P.%d",j);
       if (popforecast==1)  fprintf(ficrespop," [Population]");
       
       for (cpt=0; cpt<=0;cpt++) { 
-	fprintf(ficrespop,"\n# Forecasting at date %.lf/%.lf/%.lf ",jproj1,mproj1,anproj1+cpt);   
+	fprintf(ficrespop,"\n\n# Forecasting at date %.lf/%.lf/%.lf ",jpyram,mpyram,anpyram+cpt);   
 	
      	for (agedeb=(fage-((int)calagedate %12/12.)); agedeb>=(agemin-((int)calagedate %12)/12.); agedeb--){ 
 	  nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); 
@@ -2329,7 +2332,7 @@ calagedate=(anproj1+mproj1/12.+jproj1/36
 	
 	  for (h=0; h<=nhstepm; h++){
 	    if (h==(int) (calagedate+YEARM*cpt)) {
-	      fprintf(ficrespop,"\n %.f ",agedeb+h*hstepm/YEARM*stepm);
+	      fprintf(ficrespop,"\n %3.f ",agedeb+h*hstepm/YEARM*stepm);
 	    } 
 	    for(j=1; j<=nlstate+ndeath;j++) {
 	      kk1=0.;kk2=0;
@@ -2349,12 +2352,13 @@ calagedate=(anproj1+mproj1/12.+jproj1/36
 	    for(i=1; i<=nlstate;i++){
 	      kk1=0.;
 		for(j=1; j<=nlstate;j++){
-		  kk1= kk1+Tabpop[(int)(agedeb)][j][cptcod]; 
+		  kk1= kk1+tabpop[(int)(agedeb)][j][cptcod]; 
 		}
 		  tabpopprev[(int)(agedeb)][i][cptcod]=tabpop[(int)(agedeb)][i][cptcod]/kk1*popeffectif[(int)(agedeb+(calagedate+12*cpt)*hstepm/YEARM*stepm-1)];
 	    }
 
-if (h==(int)(calagedate+12*cpt)) for(j=1; j<=nlstate;j++) fprintf(ficrespop," %.3f",tabpopprev[(int)(agedeb+1)][j][cptcod]);
+	    if (h==(int)(calagedate+12*cpt)) for(j=1; j<=nlstate;j++) 
+	      fprintf(ficrespop," %15.2f",tabpopprev[(int)(agedeb+1)][j][cptcod]);
 	  }
 	  free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
 	}
@@ -2362,8 +2366,8 @@ if (h==(int)(calagedate+12*cpt)) for(j=1
  
   /******/
 
-      for (cpt=1; cpt<=4;cpt++) { 
-	fprintf(ficrespop,"\n# Forecasting at date %.lf/%.lf/%.lf ",jproj1,mproj1,anproj1+cpt);   
+      for (cpt=1; cpt<=(anpyram1-anpyram);cpt++) { 
+	fprintf(ficrespop,"\n\n# Forecasting at date %.lf/%.lf/%.lf ",jpyram,mpyram,anpyram+cpt);   
 	for (agedeb=(fage-((int)calagedate %12/12.)); agedeb>=(agemin-((int)calagedate %12)/12.); agedeb--){ 
 	  nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); 
 	  nhstepm = nhstepm/hstepm; 
@@ -2373,14 +2377,14 @@ if (h==(int)(calagedate+12*cpt)) for(j=1
 	  hpxij(p3mat,nhstepm,agedeb,hstepm,p,nlstate,stepm,oldm,savm, k);  
 	  for (h=0; h<=nhstepm; h++){
 	    if (h==(int) (calagedate+YEARM*cpt)) {
-	      fprintf(ficresf,"\n %.f ",agedeb+h*hstepm/YEARM*stepm);
+	      fprintf(ficresf,"\n %3.f ",agedeb+h*hstepm/YEARM*stepm);
 	    } 
 	    for(j=1; j<=nlstate+ndeath;j++) {
 	      kk1=0.;kk2=0;
 	      for(i=1; i<=nlstate;i++) {	      
 		kk1=kk1+p3mat[i][j][h]*tabpopprev[(int)agedeb+1][i][cptcod];	
 	      }
-	      if (h==(int)(calagedate+12*cpt)) fprintf(ficresf," %.3f", kk1);	
+	      if (h==(int)(calagedate+12*cpt)) fprintf(ficresf," %15.2f", kk1);	
 	    }
 	  }
 	  free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
@@ -2410,7 +2414,7 @@ int main(int argc, char *argv[])
 
   int i,j, k, n=MAXN,iter,m,size,cptcode, cptcod;
   double agedeb, agefin,hf;
-  double agemin=1.e20, agemax=-1.e20;
+  double agemin=1.e20, agemaxpar=-1.e20, agemax=-1.e20;
 
   double fret;
   double **xi,tmp,delta;
@@ -2423,7 +2427,7 @@ int main(int argc, char *argv[])
   char optionfile[FILENAMELENGTH], datafile[FILENAMELENGTH],  filerespl[FILENAMELENGTH];
   char optionfilext[10], optionfilefiname[FILENAMELENGTH], optionfilehtm[FILENAMELENGTH], optionfilegnuplot[FILENAMELENGTH], plotcmd[FILENAMELENGTH];
   
-  char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH];
+  char fileres[FILENAMELENGTH], filerespij[FILENAMELENGTH], filereso[FILENAMELENGTH], rfileres[FILENAMELENGTH];
 
   char filerest[FILENAMELENGTH];
   char fileregp[FILENAMELENGTH];
@@ -2437,7 +2441,7 @@ int main(int argc, char *argv[])
   int jnais,jdc,jint4,jint1,jint2,jint3,**outcome,**adl,*tab; 
   int mobilav=0,popforecast=0;
   int hstepm, nhstepm;
-  double jprev1, mprev1,anprev1,jprev2, mprev2,anprev2;
+  double jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,jpyram, mpyram,anpyram,jpyram1, mpyram1,anpyram1;
 
   double bage, fage, age, agelim, agebase;
   double ftolpl=FTOL;
@@ -2455,7 +2459,7 @@ int main(int argc, char *argv[])
   double dateprev1, dateprev2,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2;
   
 
-  char version[80]="Imach version 0.7, February 2002, INED-EUROREVES ";
+  char version[80]="Imach version 0.71, February 2002, INED-EUROREVES ";
   char *alph[]={"a","a","b","c","d","e"}, str[4];
 
 
@@ -2623,12 +2627,17 @@ while((c=getc(ficpar))=='#' && c!= EOF){
   printf("\n");
 
 
-    /*-------- data file ----------*/
-    if((ficres =fopen(fileres,"w"))==NULL) {
-      printf("Problem with resultfile: %s\n", fileres);goto end;
+    /*-------- Rewriting paramater file ----------*/
+     strcpy(rfileres,"r");    /* "Rparameterfile */
+     strcat(rfileres,optionfilefiname);    /* Parameter file first name*/
+     strcat(rfileres,".");    /* */
+     strcat(rfileres,optionfilext);    /* Other files have txt extension */
+    if((ficres =fopen(rfileres,"w"))==NULL) {
+      printf("Problem writing new parameter file: %s\n", fileres);goto end;
     }
     fprintf(ficres,"#%s\n",version);
     
+    /*-------- data file ----------*/
     if((fic=fopen(datafile,"r"))==NULL)    {
       printf("Problem with datafile: %s\n", datafile);goto end;
     }
@@ -2901,7 +2910,7 @@ printf("Total number of individuals= %d,
     }
     
     /*--------- results files --------------*/
-    fprintf(ficres,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncov=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=%s\n", title, datafile, lastobs, firstpass,lastpass,ftol, stepm, ncov, nlstate, ndeath, maxwav, mle,weightopt,model);
+    fprintf(ficres,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncov=%d nlstate=%d ndeath=%d maxwav=%d mle= 0 weight=%d\nmodel=%s\n", title, datafile, lastobs, firstpass,lastpass,ftol, stepm, ncov, nlstate, ndeath, maxwav, weightopt,model);
   
 
    jk=1;
@@ -2973,16 +2982,16 @@ printf("Total number of individuals= %d,
     }
     ungetc(c,ficpar);
   
-    fscanf(ficpar,"agemin=%lf agemax=%lf bage=%lf fage=%lf\n",&agemin,&agemax, &bage, &fage);
+    fscanf(ficpar,"agemin=%lf agemax=%lf bage=%lf fage=%lf\n",&agemin,&agemaxpar, &bage, &fage);
     
     if (fage <= 2) {
       bage = agemin;
-      fage = agemax;
+      fage = agemaxpar;
     }
     
     fprintf(ficres,"# agemin agemax for life expectancy, bage fage (if mle==0 ie no data nor Max likelihood).\n");
-    fprintf(ficres,"agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemax,bage,fage);
-    fprintf(ficparo,"agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemax,bage,fage);
+    fprintf(ficres,"agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemaxpar,bage,fage);
+    fprintf(ficparo,"agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemaxpar,bage,fage);
  
     while((c=getc(ficpar))=='#' && c!= EOF){
     ungetc(c,ficpar);
@@ -3009,9 +3018,9 @@ printf("Total number of individuals= %d,
    dateprev2=anprev2+mprev2/12.+jprev2/365.;
 
   fscanf(ficpar,"pop_based=%d\n",&popbased);
-   fprintf(ficparo,"pop_based=%d\n",popbased);   
-   fprintf(ficres,"pop_based=%d\n",popbased);   
-
+  fprintf(ficparo,"pop_based=%d\n",popbased);   
+  fprintf(ficres,"pop_based=%d\n",popbased);   
+  
   while((c=getc(ficpar))=='#' && c!= EOF){
     ungetc(c,ficpar);
     fgets(line, MAXLINE, ficpar);
@@ -3019,14 +3028,28 @@ printf("Total number of individuals= %d,
     fputs(line,ficparo);
   }
   ungetc(c,ficpar);
-  fscanf(ficpar,"popforecast=%d popfile=%s starting-proj-date=%lf/%lf/%lf final-proj-date=%lf/%lf/%lf mov_average=%d\n",&popforecast,popfile,&jproj1,&mproj1,&anproj1,&jproj2,&mproj2,&anproj2,&mobilav);
-fprintf(ficparo,"popforecast=%d popfile=%s starting-proj-date=%.lf/%.lf/%.lf final-proj-date=%.lf/%.lf/%.lf mov_average=%d\n",popforecast,popfile,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2,mobilav);
-fprintf(ficres,"popforecast=%d popfile=%s starting-proj-date=%.lf/%.lf/%.lf final-proj-date=%.lf/%.lf/%.lf mov_average=%d\n",popforecast,popfile,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2,mobilav);
+
+  fscanf(ficpar,"starting-proj-date=%lf/%lf/%lf final-proj-date=%lf/%lf/%lf mov_average=%d\n",&jproj1,&mproj1,&anproj1,&jproj2,&mproj2,&anproj2,&mobilav);
+fprintf(ficparo,"starting-proj-date=%.lf/%.lf/%.lf final-proj-date=%.lf/%.lf/%.lf mov_average=%d\n",jproj1,mproj1,anproj1,jproj2,mproj2,anproj2,mobilav);
+fprintf(ficres,"starting-proj-date=%.lf/%.lf/%.lf final-proj-date=%.lf/%.lf/%.lf mov_average=%d\n",jproj1,mproj1,anproj1,jproj2,mproj2,anproj2,mobilav);
+
+
+while((c=getc(ficpar))=='#' && c!= EOF){
+    ungetc(c,ficpar);
+    fgets(line, MAXLINE, ficpar);
+    puts(line);
+    fputs(line,ficparo);
+  }
+  ungetc(c,ficpar);
+
+  fscanf(ficpar,"popforecast=%d popfile=%s popfiledate=%lf/%lf/%lf last-popfiledate=%lf/%lf/%lf\n",&popforecast,popfile,&jpyram,&mpyram,&anpyram,&jpyram1,&mpyram1,&anpyram1);
+  fprintf(ficparo,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);
+  fprintf(ficres,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);
 
  freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax,mint,anint,dateprev1,dateprev2,jprev1, mprev1,anprev1,jprev2, mprev2,anprev2);
 
 /*------------ gnuplot -------------*/
- printinggnuplot(fileres,optionfilefiname,optionfile,optionfilegnuplot, agemin,agemax,fage, pathc,p);
+ printinggnuplot(fileres,optionfilefiname,optionfile,optionfilegnuplot, agemin,agemaxpar,fage, pathc,p);
  
 /*------------ free_vector  -------------*/
  chdir(path);
@@ -3039,22 +3062,10 @@ fprintf(ficres,"popforecast=%d popfile=%
  /*free_matrix(covar,1,NCOVMAX,1,n);*/
  fclose(ficparo);
  fclose(ficres);
- 
-  /* Reads comments: lines beginning with '#' */
-  while((c=getc(ficpar))=='#' && c!= EOF){
-    ungetc(c,ficpar);
-    fgets(line, MAXLINE, ficpar);
-    puts(line);
-    fputs(line,ficparo);
-  }
-  ungetc(c,ficpar);
-  
-  fscanf(ficpar,"agemin=%lf agemax=%lf bage=%lf fage=%lf\n",&agemin,&agemax, &bage, &fage);
-  printf("agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemax, bage, fage);
-  fprintf(ficparo,"agemin=%.0f agemax=%.0f bage=%.0f fage=%.0f\n",agemin,agemax,bage,fage);
+
 /*--------- index.htm --------*/
 
-  printinghtml(fileres,title,datafile, firstpass, lastpass, stepm, weightopt,model,imx,jmin,jmax,jmean,optionfile,optionfilehtm);
+  printinghtml(fileres,title,datafile, firstpass, lastpass, stepm, weightopt,model,imx,jmin,jmax,jmean,optionfile,optionfilehtm,rfileres);
 
   
   /*--------------- Prevalence limit --------------*/
@@ -3078,7 +3089,7 @@ fprintf(ficres,"popforecast=%d popfile=%
   oldm=oldms; newm=newms; savm=savms; /* Keeps fixed addresses to free */
   k=0;
   agebase=agemin;
-  agelim=agemax;
+  agelim=agemaxpar;
   ftolpl=1.e-10;
   i1=cptcoveff;
   if (cptcovn < 1){i1=1;}
@@ -3157,9 +3168,9 @@ fprintf(ficres,"popforecast=%d popfile=%
 
 
   /*---------- Forecasting ------------------*/
-  if(stepm == 1) {
+  if((stepm == 1) && (model==".")){
     prevforecast(fileres, anproj1,mproj1,jproj1, agemin,agemax, dateprev1, dateprev2,mobilav, agedeb, fage, popforecast, popfile, anproj2,p, i1);
-populforecast(fileres, anproj1,mproj1,jproj1, agemin,agemax, dateprev1, dateprev2,mobilav, agedeb, fage, popforecast, popfile, anproj2,p, i1);
+if (popforecast==1) populforecast(fileres, anpyram,mpyram,jpyram, agemin,agemax, dateprev1, dateprev2,mobilav, agedeb, fage, popforecast, popfile, anpyram1,p, i1);
     free_matrix(mint,1,maxwav,1,n);
     free_matrix(anint,1,maxwav,1,n); free_imatrix(s,1,maxwav+1,1,n);
     free_vector(weight,1,n);}