From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Thu, 17 May 2001 16:07:14 +0000 (+0000)
Subject: Updated to Windows2000: changes in the path name to execute wgnuplot.
X-Git-Tag: Version-0-8a~40
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=b465b4ff61b06d7bc4eb351e1a648e0e922c812c;p=.git

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

diff --git a/src/Makefile b/src/Makefile
index 42461f2..cb1fbe7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,8 +3,11 @@ CC= gcc
 #LFLAGS= -v -g
 #CFLAGS= -g 
 
-LFLAGS= -O2 -g -mno-cygwin
-CFLAGS= -O2 -g
+#LFLAGS= -O2 -g -mno-cygwin
+#CFLAGS= -O2 -g
+
+LFLAGS= -O2 -mno-cygwin
+CFLAGS= -O2
 
 PARAM=mypar1
 
diff --git a/src/imach.c b/src/imach.c
index b44f803..c6049eb 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -8,7 +8,7 @@
   Health expectancies are computed from the transistions observed between 
   waves and are computed for each degree of severity of disability (number
   of life states). More degrees you consider, more time is necessary to
-  reach the Maximum Likelihood of the parameters involved in the model.
+  reach the Maximum Likelihood of the parameters involved in the model. 
   The simplest model is the multinomial logistic model where pij is
   the probabibility to be observed in state j at the second wave conditional
   to be observed in state i at the first wave. Therefore the model is:
@@ -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;
      double sum=0., jmean=0.;*/
 
-int j, k=0,jk, ju, jl;
-     double sum=0.;
-jmin=1e+5;
- jmax=-1;
-jmean=0.;
+  int j, k=0,jk, ju, jl;
+  double sum=0.;
+  jmin=1e+5;
+  jmax=-1;
+  jmean=0.;
   for(i=1; i<=imx; i++){
     mi=0;
     m=firstpass;
@@ -1309,7 +1309,7 @@ jmean=0.;
 	  if(j==0) j=1;  /* Survives at least one month after exam */
 	  k=k+1;
 	  if (j >= jmax) jmax=j;
-	  else if (j <= jmin)jmin=j;
+	  if (j <= jmin) jmin=j;
 	  sum=sum+j;
 	  if (j<0) printf("j=%d num=%d ",j,i); 
 	  }
@@ -2671,7 +2671,9 @@ strcpy(fileresvpl,"vpl");
  chdir(pathcd);
 #endif 
  /*system("wgnuplot graph.plt");*/
- system("../gp37mgw/wgnuplot graph.plt");
+ /*system("../gp37mgw/wgnuplot graph.plt");*/
+ /*system("cd ../gp37mgw");*/
+ system("..\\gp37mgw\\wgnuplot graph.plt");
 
 #ifdef windows
   while (z[0] != 'q') {
diff --git a/src/imach.exe b/src/imach.exe
index f84f539..67cff6b 100644
Binary files a/src/imach.exe and b/src/imach.exe differ