Updated to Windows2000: changes in the path name to execute wgnuplot.

diff --git a/src/Makefile b/src/Makefile
index 42461f206e8ab627708ce4b0cefda65a5f6b565d..cb1fbe7a07a17a3e87628cb9b50388296c7610f8 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,8 +3,11 @@ CC= gcc
 #LFLAGS= -v -g\r
 #CFLAGS= -g \r
 \r
-LFLAGS= -O2 -g -mno-cygwin\r
-CFLAGS= -O2 -g\r
+#LFLAGS= -O2 -g -mno-cygwin\r
+#CFLAGS= -O2 -g\r
+\r
+LFLAGS= -O2 -mno-cygwin\r
+CFLAGS= -O2\r
 \r
 PARAM=mypar1\r
 \r

diff --git a/src/imach.c b/src/imach.c
index b44f803b3e8d9eccd5d9ab6326dc5a441da71538..c6049eb1a37309fe99e640bef7257fbf0300d129 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -8,7 +8,7 @@
   Health expectancies are computed from the transistions observed between \r
   waves and are computed for each degree of severity of disability (number\r
   of life states). More degrees you consider, more time is necessary to\r
-  reach the Maximum Likelihood of the parameters involved in the model.\r
+  reach the Maximum Likelihood of the parameters involved in the model. \r
   The simplest model is the multinomial logistic model where pij is\r
   the probabibility to be observed in state j at the second wave conditional\r
   to be observed in state i at the first wave. Therefore the model is:\r
@@ -1270,11 +1270,11 @@ void  concatwav(int wav[], int **dh, int **mw, int **s, double *agedc, double **
   /* int j, k=0,jk, ju, jl,jmin=1e+5, jmax=-1;\r
      double sum=0., jmean=0.;*/\r
 \r
-int j, k=0,jk, ju, jl;\r
-     double sum=0.;\r
-jmin=1e+5;\r
- jmax=-1;\r
-jmean=0.;\r
+  int j, k=0,jk, ju, jl;\r
+  double sum=0.;\r
+  jmin=1e+5;\r
+  jmax=-1;\r
+  jmean=0.;\r
   for(i=1; i<=imx; i++){\r
     mi=0;\r
     m=firstpass;\r
@@ -1309,7 +1309,7 @@ jmean=0.;
          if(j==0) j=1;  /* Survives at least one month after exam */\r
          k=k+1;\r
          if (j >= jmax) jmax=j;\r
-         else if (j <= jmin)jmin=j;\r
+         if (j <= jmin) jmin=j;\r
          sum=sum+j;\r
          if (j<0) printf("j=%d num=%d ",j,i); \r
          }\r
@@ -2671,7 +2671,9 @@ strcpy(fileresvpl,"vpl");
  chdir(pathcd);\r
 #endif \r
  /*system("wgnuplot graph.plt");*/\r
- system("../gp37mgw/wgnuplot graph.plt");\r
+ /*system("../gp37mgw/wgnuplot graph.plt");*/\r
+ /*system("cd ../gp37mgw");*/\r
+ system("..\\gp37mgw\\wgnuplot graph.plt");\r
 \r
 #ifdef windows\r
   while (z[0] != 'q') {\r

diff --git a/src/imach.exe b/src/imach.exe
index f84f5399bed670e82a46820a57979ed2d2578b43..67cff6b0b05a5859db5f5932adad3e52c448f94c 100644 (file)
Binary files a/src/imach.exe and b/src/imach.exe differ