The bug in printinghtm is corrected

diff --git a/src/imach.c b/src/imach.c
index 7ed78d36e8dd329feccfa9d69209ac303b0f91e6..0c01f952ef1bfe364470cf4e9a0e77cffb65a725 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -2059,12 +2059,13 @@ fprintf(ficresprob,"#One-step probabilities and standard deviation in parenthese
   \r
 }\r
 \r
+\r
 /******************* Printing html file ***********/\r
 void printinghtml(char fileres[], char title[], char datafile[], int firstpass, \\r
                  int lastpass, int stepm, int weightopt, char model[],\\r
                  int imx,int jmin, int jmax, double jmeanint,char optionfile[], \\r
                  char optionfilehtm[],char rfileres[], char optionfilegnuplot[],\\r
-                 char version[], int popforecast, int estepm ,/* \ */\r
+                 char version[], int popforecast, int estepm ,\\r
                  double jprev1, double mprev1,double anprev1, \\r
                  double jprev2, double mprev2,double anprev2){\r
   int jj1, k1, i1, cpt;\r
@@ -2116,19 +2117,19 @@ fprintf(fichtm," <li>Graphs</li><p>");
  jj1=0;\r
  for(k1=1; k1<=m;k1++){\r
    for(i1=1; i1<=ncodemax[k1];i1++){\r
-       jj1++;\r
-       if (cptcovn > 0) {\r
-        fprintf(fichtm,"<hr  size=\"2\" color=\"#EC5E5E\">************ Results for covariates");\r
-        for (cpt=1; cpt<=cptcoveff;cpt++) \r
-          fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]);\r
-        fprintf(fichtm," ************\n<hr size=\"2\" color=\"#EC5E5E\">");\r
-       }\r
-       /* Pij */\r
-       fprintf(fichtm,"<br>- Pij or Conditional probabilities to be observed in state j being in state i %d (stepm) months before: pe%s%d1.png<br>\r
-<img src=\"pe%s%d1.png\">",strtok(optionfile, "."),jj1,stepm,strtok(optionfile, "."),jj1);     \r
-       /* Quasi-incidences */\r
-       fprintf(fichtm,"<br>- Pij or Conditional probabilities to be observed in state j being in state i %d (stepm) months before but expressed in per year i.e. quasi incidences if stepm is small and probabilities too: pe%s%d2.png<br>\r
-<img src=\"pe%s%d2.png\">",strtok(optionfile, "."),jj1,stepm,strtok(optionfile, "."),jj1);     \r
+     jj1++;\r
+     if (cptcovn > 0) {\r
+       fprintf(fichtm,"<hr  size=\"2\" color=\"#EC5E5E\">************ Results for covariates");\r
+       for (cpt=1; cpt<=cptcoveff;cpt++) \r
+        fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]);\r
+       fprintf(fichtm," ************\n<hr size=\"2\" color=\"#EC5E5E\">");\r
+     }\r
+     /* Pij */\r
+     fprintf(fichtm,"<br>- Pij or Conditional probabilities to be observed in state j being in state i %d (stepm) months before: pe%s%d1.png<br>\r
+<img src=\"pe%s%d1.png\">",stepm,strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);     \r
+     /* Quasi-incidences */\r
+     fprintf(fichtm,"<br>- Pij or Conditional probabilities to be observed in state j being in state i %d (stepm) months before but expressed in per year i.e. quasi incidences if stepm is small and probabilities too: pe%s%d2.png<br>\r
+<img src=\"pe%s%d2.png\">",stepm,strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1); \r
        /* Stable prevalence in each health state */\r
        for(cpt=1; cpt<nlstate;cpt++){\r
         fprintf(fichtm,"<br>- Stable prevalence in each health state : p%s%d%d.png<br>\r
@@ -2148,7 +2149,7 @@ health expectancies in states (1) and (2): e%s%d.png<br>
 <img src=\"e%s%d.png\">",strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);\r
 fprintf(fichtm,"\n</body>");\r
    }\r
-   }\r
+ }\r
 fclose(fichtm);\r
 }\r
 \r
@@ -2674,7 +2675,7 @@ int main(int argc, char *argv[])
   double dateprev1, dateprev2,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2;\r
   \r
 \r
-  char version[80]="Imach version 0.8e, May 2002, INED-EUROREVES ";\r
+  char version[80]="Imach version 0.8f, May 2002, INED-EUROREVES ";\r
   char *alph[]={"a","a","b","c","d","e"}, str[4];\r
 \r
 \r
@@ -3285,7 +3286,7 @@ while((c=getc(ficpar))=='#' && c!= EOF){
 \r
 /*--------- index.htm --------*/\r
 \r
-  printinghtml(fileres,title,datafile, firstpass, lastpass, stepm, weightopt,model,imx,jmin,jmax,jmean,optionfile,optionfilehtm,rfileres,optionfilegnuplot,version,popforecast,estepm,jprev1,mprev1,anprev1,jprev2,mprev2,anprev2);\r
+ printinghtml(fileres,title,datafile, firstpass, lastpass, stepm, weightopt,model,imx,jmin,jmax,jmean,optionfile,optionfilehtm,rfileres,optionfilegnuplot,version,popforecast,estepm,jprev1,mprev1,anprev1,jprev2,mprev2,anprev2);\r
 \r
   \r
   /*--------------- Prevalence limit --------------*/\r