--- imach/src/imach.c	2002/03/11 14:17:15	1.32
+++ imach/src/imach.c	2002/03/12 22:13:38	1.33
@@ -1,4 +1,4 @@
-/* $Id: imach.c,v 1.32 2002/03/11 14:17:15 brouard Exp $
+/* $Id: imach.c,v 1.33 2002/03/12 22:13:38 brouard Exp $
    Interpolated Markov Chain
 
   Short summary of the programme:
@@ -1559,7 +1559,7 @@ void evsij(char fileres[], double ***eij
     /* nhstepm age range expressed in number of stepm */
     nstepm=(int) rint((agelim-age)*YEARM/stepm); 
     /* Typically if 20 years nstepm = 20*12/6=40 stepm */ 
-    if (stepm >= YEARM) hstepm=1;
+    /* if (stepm >= YEARM) hstepm=1;*/
     nhstepm = nstepm/hstepm;/* Expressed in hstepm, typically nhstepm=40/4=10 */
     p3mat=ma3x(1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
     /* Computed by stepm unit matrices, product of hstepm matrices, stored
@@ -1903,7 +1903,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.71c </font> <hr size=\"2\" color=\"#EC5E5E\"> 
+ fprintf(fichtm,"<body><ul> <font size=\"6\">Imach, Version 0.71e </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>
@@ -2466,7 +2466,7 @@ int main(int argc, char *argv[])
   double dateprev1, dateprev2,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2;
   
 
-  char version[80]="Imach version 0.71c, March 2002, INED-EUROREVES ";
+  char version[80]="Imach version 0.71e, March 2002, INED-EUROREVES ";
   char *alph[]={"a","a","b","c","d","e"}, str[4];
 
 
@@ -3243,8 +3243,6 @@ while((c=getc(ficpar))=='#' && c!= EOF){
       for (i=1;i<=nlstate;i++) fprintf(ficrest,"e.%d (std) ",i);
       fprintf(ficrest,"\n");
 
-      hf=1;
-      if (stepm >= YEARM) hf=stepm/YEARM;
       epj=vector(1,nlstate+1);
       for(age=bage; age <=fage ;age++){
 	prevalim(prlim, nlstate, p, age, oldm, savm,ftolpl,k);
@@ -3253,19 +3251,19 @@ while((c=getc(ficpar))=='#' && c!= EOF){
 	    prlim[i][i]=probs[(int)age][i][k];
 	}
 	
-	fprintf(ficrest," %.0f",age);
+	fprintf(ficrest," %4.0f",age);
 	for(j=1, epj[nlstate+1]=0.;j <=nlstate;j++){
 	  for(i=1, epj[j]=0.;i <=nlstate;i++) {
-	    epj[j] += prlim[i][i]*hf*eij[i][j][(int)age];
+	    epj[j] += prlim[i][i]*eij[i][j][(int)age];
 	  }
 	  epj[nlstate+1] +=epj[j];
 	}
 	for(i=1, vepp=0.;i <=nlstate;i++)
 	  for(j=1;j <=nlstate;j++)
 	    vepp += vareij[i][j][(int)age];
-	fprintf(ficrest," %.2f (%.2f)", epj[nlstate+1],hf*sqrt(vepp));
+	fprintf(ficrest," %7.2f (%7.2f)", epj[nlstate+1],sqrt(vepp));
 	for(j=1;j <=nlstate;j++){
-	  fprintf(ficrest," %.2f (%.2f)", epj[j],hf*sqrt(vareij[j][j][(int)age]));
+	  fprintf(ficrest," %7.2f (%7.2f)", epj[j],sqrt(vareij[j][j][(int)age]));
 	}
 	fprintf(ficrest,"\n");
       }
