Change gif images to png format because of gif copyright.

Change wgnuplot to gnuplot
Correct a small bug

diff --git a/src/imach.c b/src/imach.c
index 0b94cf682b0dcf16b8a93bf4c7eec8a44ed75231..e00b7e65aa3112c88f90d0e6c186901b9f9b9a5e 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -56,7 +56,7 @@
 #include <unistd.h>\r
 \r
 #define MAXLINE 256\r
-#define GNUPLOTPROGRAM "wgnuplot"\r
+#define GNUPLOTPROGRAM "gnuplot"\r
 /*#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"*/\r
 #define FILENAMELENGTH 80\r
 /*#define DEBUG*/\r
@@ -1330,10 +1330,10 @@ void prevalence(int agemin, float agemax, int **s, double **agev, int nlstate, i
   j=cptcoveff;\r
   if (cptcovn<1) {j=1;ncodemax[1]=1;}\r
   \r
- for(k1=1; k1<=j;k1++){\r
+  for(k1=1; k1<=j;k1++){\r
     for(i1=1; i1<=ncodemax[k1];i1++){\r
       j1++;\r
- \r
+      \r
       for (i=-1; i<=nlstate+ndeath; i++)  \r
        for (jk=-1; jk<=nlstate+ndeath; jk++)  \r
          for(m=agemin; m <= agemax+3; m++)\r
@@ -1352,41 +1352,43 @@ void prevalence(int agemin, float agemax, int **s, double **agev, int nlstate, i
            if ((k2>=dateprev1) && (k2<=dateprev2)) {\r
              if(agev[m][i]==0) agev[m][i]=agemax+1;\r
              if(agev[m][i]==1) agev[m][i]=agemax+2;\r
-             if (m<lastpass) \r
-               if (calagedate>0) freq[s[m][i]][s[m+1][i]][(int)(agev[m][i]+1-((int)calagedate %12)/12.)] += weight[i];\r
-             else\r
-              freq[s[m][i]][s[m+1][i]][(int)agev[m][i]] += weight[i];\r
-              freq[s[m][i]][s[m+1][i]][(int)(agemax+3)] += weight[i]; \r
+             if (m<lastpass) {\r
+               if (calagedate>0) \r
+                 freq[s[m][i]][s[m+1][i]][(int)(agev[m][i]+1-((int)calagedate %12)/12.)] += weight[i];\r
+               else\r
+                 freq[s[m][i]][s[m+1][i]][(int)agev[m][i]] += weight[i];\r
+               freq[s[m][i]][s[m+1][i]][(int)(agemax+3)] += weight[i]; \r
+             }\r
            }\r
          }\r
        }\r
       }\r
-       for(i=(int)agemin; i <= (int)agemax+3; i++){ \r
-         for(jk=1; jk <=nlstate ; jk++){\r
-           for(m=-1, pp[jk]=0; m <=nlstate+ndeath ; m++)\r
-             pp[jk] += freq[jk][m][i]; \r
-         }\r
-         for(jk=1; jk <=nlstate ; jk++){\r
-           for(m=-1, pos=0; m <=0 ; m++)\r
+      for(i=(int)agemin; i <= (int)agemax+3; i++){ \r
+       for(jk=1; jk <=nlstate ; jk++){\r
+         for(m=-1, pp[jk]=0; m <=nlstate+ndeath ; m++)\r
+           pp[jk] += freq[jk][m][i]; \r
+       }\r
+       for(jk=1; jk <=nlstate ; jk++){\r
+         for(m=-1, pos=0; m <=0 ; m++)\r
            pos += freq[jk][m][i];\r
        }\r
        \r
-        for(jk=1; jk <=nlstate ; jk++){\r
-          for(m=0, pp[jk]=0; m <=nlstate+ndeath; m++)\r
-            pp[jk] += freq[jk][m][i];\r
-        }\r
-        \r
-        for(jk=1,pos=0; jk <=nlstate ; jk++) pos += pp[jk];\r
-\r
-        for(jk=1; jk <=nlstate ; jk++){           \r
-          if( i <= (int) agemax){\r
-            if(pos>=1.e-5){\r
-              probs[i][jk][j1]= pp[jk]/pos;\r
-            }\r
-          }\r
-        }\r
-        \r
+       for(jk=1; jk <=nlstate ; jk++){\r
+         for(m=0, pp[jk]=0; m <=nlstate+ndeath; m++)\r
+           pp[jk] += freq[jk][m][i];\r
+       }\r
+       \r
+       for(jk=1,pos=0; jk <=nlstate ; jk++) pos += pp[jk];\r
+       \r
+       for(jk=1; jk <=nlstate ; jk++){    \r
+         if( i <= (int) agemax){\r
+           if(pos>=1.e-5){\r
+             probs[i][jk][j1]= pp[jk]/pos;\r
+           }\r
+         }\r
        }\r
+       \r
+      }\r
     }\r
   }\r
 \r
@@ -1663,6 +1665,7 @@ void evsij(char fileres[], double ***eij, double x[], int nlstate, int stepm, in
       for(j=1;j<=nlstate*2;j++)\r
        varhe[i][j][(int)age] =0.;\r
 \r
+     printf("%d||",(int)age);fflush(stdout);\r
     for(h=0;h<=nhstepm-1;h++){\r
       for(k=0;k<=nhstepm-1;k++){\r
        matprod2(dnewm,trgradg[h],1,nlstate*2,1,npar,1,npar,matcov);\r
@@ -2114,24 +2117,24 @@ fprintf(fichtm," <li>Graphs</li><p>");
           fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]);\r
         fprintf(fichtm," ************\n<hr size=\"2\" color=\"#EC5E5E\">");\r
        }\r
-       fprintf(fichtm,"<br>- Probabilities: pe%s%d.gif<br>\r
-<img src=\"pe%s%d.gif\">",strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);     \r
+       fprintf(fichtm,"<br>- Probabilities: pe%s%d.png<br>\r
+<img src=\"pe%s%d.png\">",strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);     \r
        for(cpt=1; cpt<nlstate;cpt++){\r
-        fprintf(fichtm,"<br>- Prevalence of disability : p%s%d%d.gif<br>\r
-<img src=\"p%s%d%d.gif\">",strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);\r
+        fprintf(fichtm,"<br>- Prevalence of disability : p%s%d%d.png<br>\r
+<img src=\"p%s%d%d.png\">",strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);\r
        }\r
     for(cpt=1; cpt<=nlstate;cpt++) {\r
        fprintf(fichtm,"<br>- Observed and stationary prevalence (with confident\r
-interval) in state (%d): v%s%d%d.gif <br>\r
-<img src=\"v%s%d%d.gif\">",cpt,strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);  \r
+interval) in state (%d): v%s%d%d.png <br>\r
+<img src=\"v%s%d%d.png\">",cpt,strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);  \r
      }\r
      for(cpt=1; cpt<=nlstate;cpt++) {\r
-        fprintf(fichtm,"\n<br>- Health life expectancies by age and initial health state (%d): exp%s%d%d.gif <br>\r
-<img src=\"exp%s%d%d.gif\">",cpt,strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);\r
+        fprintf(fichtm,"\n<br>- Health life expectancies by age and initial health state (%d): exp%s%d%d.png <br>\r
+<img src=\"exp%s%d%d.png\">",cpt,strtok(optionfile, "."),cpt,jj1,strtok(optionfile, "."),cpt,jj1);\r
      }\r
      fprintf(fichtm,"\n<br>- Total life expectancy by age and\r
-health expectancies in states (1) and (2): e%s%d.gif<br>\r
-<img src=\"e%s%d.gif\">",strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);\r
+health expectancies in states (1) and (2): e%s%d.png<br>\r
+<img src=\"e%s%d.png\">",strtok(optionfile, "."),jj1,strtok(optionfile, "."),jj1);\r
 fprintf(fichtm,"\n</body>");\r
    }\r
    }\r
@@ -2159,9 +2162,11 @@ m=pow(2,cptcoveff);
    for (k1=1; k1<= m ; k1 ++) {\r
 \r
 #ifdef windows\r
-    fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter gif small size 400,300\nplot [%.f:%.f] \"vpl%s\" every :::%d::%d u 1:2 \"\%%lf",ageminpar,fage,fileres,k1-1,k1-1);\r
+     fprintf(ficgp,"\nset out \"v%s%d%d.png\" \n\n",strtok(optionfile, "."),cpt,k1);\r
+     fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter png small\nset size 0.65,0.65\nplot [%.f:%.f] \"vpl%s\" every :::%d::%d u 1:2 \"\%%lf",ageminpar,fage,fileres,k1-1,k1-1);\r
 #endif\r
 #ifdef unix\r
+fprintf(ficgp,"\nset out \"v%s%d%d.png\" \n\n",strtok(optionfile, "."),cpt,k1);\r
 fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nplot [%.f:%.f] \"vpl%s\" u 1:2 \"\%%lf",ageminpar,fage,fileres);\r
 #endif\r
 \r
@@ -2181,15 +2186,15 @@ for (i=1; i<= nlstate ; i ++) {
 }  \r
      fprintf(ficgp,"\" t\"\" w l 1,\"p%s\" every :::%d::%d u 1:($%d) t\"Observed prevalence \" w l 2",fileres,k1-1,k1-1,2+4*(cpt-1));\r
 #ifdef unix\r
-fprintf(ficgp,"\nset ter gif small size 400,300");\r
+fprintf(ficgp,"\nset ter png small\nset size 0.65,0.65\n");\r
 #endif\r
-fprintf(ficgp,"\nset out \"v%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),cpt,k1);\r
    }\r
   }\r
   /*2 eme*/\r
 \r
   for (k1=1; k1<= m ; k1 ++) { \r
-    fprintf(ficgp,"set ylabel \"Years\" \nset ter gif small size 400,300\nplot [%.f:%.f] ",ageminpar,fage);\r
+    fprintf(ficgp,"\nset out \"e%s%d.png\" \n\n",strtok(optionfile, "."),k1);\r
+    fprintf(ficgp,"set ylabel \"Years\" \nset ter png small\nset size 0.65,0.65\nplot [%.f:%.f] ",ageminpar,fage);\r
     \r
     for (i=1; i<= nlstate+1 ; i ++) {\r
       k=2*i;\r
@@ -2214,7 +2219,6 @@ fprintf(ficgp,"\nset out \"v%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),c
       if (i== (nlstate+1)) fprintf(ficgp,"\" t\"\" w l 0");\r
       else fprintf(ficgp,"\" t\"\" w l 0,");\r
     }\r
-    fprintf(ficgp,"\nset out \"e%s%d.gif\" \nreplot\n\n",strtok(optionfile, "."),k1);\r
   }\r
  \r
   /*3eme*/\r
@@ -2222,7 +2226,8 @@ fprintf(ficgp,"\nset out \"v%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),c
   for (k1=1; k1<= m ; k1 ++) { \r
     for (cpt=1; cpt<= nlstate ; cpt ++) {\r
       k=2+nlstate*(2*cpt-2);\r
-      fprintf(ficgp,"set ter gif small size 400,300\nplot [%.f:%.f] \"e%s\" every :::%d::%d u 1:%d t \"e%d1\" w l",ageminpar,fage,fileres,k1-1,k1-1,k,cpt);\r
+      fprintf(ficgp,"\nset out \"exp%s%d%d.png\" \n\n",strtok(optionfile, "."),cpt,k1);\r
+      fprintf(ficgp,"set ter png small\nset size 0.65,0.65\nplot [%.f:%.f] \"e%s\" every :::%d::%d u 1:%d t \"e%d1\" w l",ageminpar,fage,fileres,k1-1,k1-1,k,cpt);\r
       /*fprintf(ficgp,",\"e%s\" every :::%d::%d u 1:($%d-2*$%d) \"\%%lf ",fileres,k1-1,k1-1,k,k+1);\r
  for (i=1; i<= nlstate*2 ; i ++) fprintf(ficgp,"\%%lf (\%%lf) ");\r
 fprintf(ficgp,"\" t \"e%d1\" w l",cpt);\r
@@ -2235,15 +2240,15 @@ fprintf(ficgp,"\" t \"e%d1\" w l",cpt);
        fprintf(ficgp," ,\"e%s\" every :::%d::%d u 1:%d t \"e%d%d\" w l",fileres,k1-1,k1-1,k+2*i,cpt,i+1);\r
 \r
       } \r
-      fprintf(ficgp,"\nset out \"exp%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),cpt,k1);\r
-    }\r
     }\r
+  }\r
  \r
   /* CV preval stat */\r
     for (k1=1; k1<= m ; k1 ++) { \r
     for (cpt=1; cpt<nlstate ; cpt ++) {\r
       k=3;\r
-      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",ageminpar,agemaxpar,fileres,k1,k+cpt+1,k+1);\r
+      fprintf(ficgp,"set out \"p%s%d%d.png\" \n\n",strtok(optionfile, "."),cpt,k1);\r
+      fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter png small\nset size 0.65,0.65\nplot [%.f:%.f] \"pij%s\" u ($1==%d ? ($3):1/0):($%d/($%d",ageminpar,agemaxpar,fileres,k1,k+cpt+1,k+1);\r
 \r
       for (i=1; i< nlstate ; i ++)\r
        fprintf(ficgp,"+$%d",k+i+1);\r
@@ -2256,7 +2261,6 @@ fprintf(ficgp,"\" t \"e%d1\" w l",cpt);
        fprintf(ficgp,"+$%d",l+i+1);\r
       }\r
       fprintf(ficgp,")) t\"prev(%d,%d)\" w l\n",cpt+1,cpt+1);   \r
-      fprintf(ficgp,"set out \"p%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),cpt,k1);\r
     } \r
   }  \r
   \r
@@ -2272,50 +2276,50 @@ fprintf(ficgp,"\" t \"e%d1\" w l",cpt);
        }\r
       }\r
     }\r
-    }\r
+   }\r
 \r
-    for(jk=1; jk <=m; jk++) {\r
-  fprintf(ficgp,"\nset ter gif small size 400,300\nset log y\nplot  [%.f:%.f] ",ageminpar,agemaxpar);\r
-   i=1;\r
-   for(k2=1; k2<=nlstate; k2++) {\r
-     k3=i;\r
-     for(k=1; k<=(nlstate+ndeath); k++) {\r
-       if (k != k2){\r
-       fprintf(ficgp," exp(p%d+p%d*x",i,i+1);\r
-ij=1;\r
-       for(j=3; j <=ncovmodel; j++) {\r
-         if(((j-2)==Tage[ij]) &&(ij <=cptcovage)) {\r
-           fprintf(ficgp,"+p%d*%d*x",i+j-1,nbcode[Tvar[j-2]][codtab[jk][Tvar[j-2]]]);\r
-           ij++;\r
-         }\r
-         else\r
-         fprintf(ficgp,"+p%d*%d",i+j-1,nbcode[Tvar[j-2]][codtab[jk][j-2]]);\r
-       }\r
-         fprintf(ficgp,")/(1");\r
-       \r
-       for(k1=1; k1 <=nlstate; k1++){   \r
-         fprintf(ficgp,"+exp(p%d+p%d*x",k3+(k1-1)*ncovmodel,k3+(k1-1)*ncovmodel+1);\r
-ij=1;\r
-         for(j=3; j <=ncovmodel; j++){\r
-         if(((j-2)==Tage[ij]) &&(ij <=cptcovage)) {\r
-           fprintf(ficgp,"+p%d*%d*x",k3+(k1-1)*ncovmodel+1+j-2,nbcode[Tvar[j-2]][codtab[jk][Tvar[j-2]]]);\r
-           ij++;\r
-         }\r
-         else\r
-           fprintf(ficgp,"+p%d*%d",k3+(k1-1)*ncovmodel+1+j-2,nbcode[Tvar[j-2]][codtab[jk][j-2]]);\r
-         }\r
-         fprintf(ficgp,")");\r
-       }\r
-       fprintf(ficgp,") t \"p%d%d\" ", k2,k);\r
-       if ((k+k2)!= (nlstate*2+ndeath)) fprintf(ficgp,",");\r
-       i=i+ncovmodel;\r
+   for(jk=1; jk <=m; jk++) {\r
+     fprintf(ficgp,"\nset out \"pe%s%d.png\" \n\n",strtok(optionfile, "."),jk); \r
+     fprintf(ficgp,"\nset ter png small\nset size 0.65,0.65\nset log y\nplot  [%.f:%.f] ",ageminpar,agemaxpar);\r
+     i=1;\r
+     for(k2=1; k2<=nlstate; k2++) {\r
+       k3=i;\r
+       for(k=1; k<=(nlstate+ndeath); k++) {\r
+        if (k != k2){\r
+          fprintf(ficgp," exp(p%d+p%d*x",i,i+1);\r
+          ij=1;\r
+          for(j=3; j <=ncovmodel; j++) {\r
+            if(((j-2)==Tage[ij]) &&(ij <=cptcovage)) {\r
+              fprintf(ficgp,"+p%d*%d*x",i+j-1,nbcode[Tvar[j-2]][codtab[jk][Tvar[j-2]]]);\r
+              ij++;\r
+            }\r
+            else\r
+              fprintf(ficgp,"+p%d*%d",i+j-1,nbcode[Tvar[j-2]][codtab[jk][j-2]]);\r
+          }\r
+          fprintf(ficgp,")/(1");\r
+          \r
+          for(k1=1; k1 <=nlstate; k1++){   \r
+            fprintf(ficgp,"+exp(p%d+p%d*x",k3+(k1-1)*ncovmodel,k3+(k1-1)*ncovmodel+1);\r
+            ij=1;\r
+            for(j=3; j <=ncovmodel; j++){\r
+              if(((j-2)==Tage[ij]) &&(ij <=cptcovage)) {\r
+                fprintf(ficgp,"+p%d*%d*x",k3+(k1-1)*ncovmodel+1+j-2,nbcode[Tvar[j-2]][codtab[jk][Tvar[j-2]]]);\r
+                ij++;\r
+              }\r
+              else\r
+                fprintf(ficgp,"+p%d*%d",k3+(k1-1)*ncovmodel+1+j-2,nbcode[Tvar[j-2]][codtab[jk][j-2]]);\r
+            }\r
+            fprintf(ficgp,")");\r
+          }\r
+          fprintf(ficgp,") t \"p%d%d\" ", k2,k);\r
+          if ((k+k2)!= (nlstate*2+ndeath)) fprintf(ficgp,",");\r
+          i=i+ncovmodel;\r
+        }\r
        }\r
      }\r
    }\r
-   fprintf(ficgp,"\nset out \"pe%s%d.gif\" \nreplot\n\n",strtok(optionfile, "."),jk); \r
-   }\r
    \r
-  fclose(ficgp);\r
+   fclose(ficgp);\r
 }  /* end gnuplot */\r
 \r
 \r
@@ -2651,7 +2655,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.8a, May 2002, INED-EUROREVES ";\r
+  char version[80]="Imach version 0.8d, May 2002, INED-EUROREVES ";\r
   char *alph[]={"a","a","b","c","d","e"}, str[4];\r
 \r
 \r