From 649e42e2a53f4aeb4fdba8a1eeeb19b1e8ed7823 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Agn=C3=A8s=20Li=C3=A8vre?= <agnes.lievre@education.gouv.fr>
Date: Wed, 9 May 2001 14:25:42 +0000
Subject: [PATCH] Changes in calculation spaces between two waves

---
 src/data1.txt | 2 +-
 src/imach.c   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/data1.txt b/src/data1.txt
index 6c02f61..6e181e8 100644
--- a/src/data1.txt
+++ b/src/data1.txt
@@ -6014,7 +6014,7 @@
  6014 1 1 1  3/1903 99/9999  7/1984  1  7/1986  2  8/1988  2  6/1990  2 
  6015 1 1 1  2/1903  8/1990  6/1984  1  6/1986  1  7/1988  2  9/1990  3 
  6016 1 1 1  3/1903 99/9999  7/1984  1  6/1986  1  6/1988  1  7/1990  1 
- 6017 1 1 1  3/1903  5/1986  7/1984  1  7/1986  1  5/1988  3  7/1990  3 
+ 6017 1 1 1  3/1903  8/1986  7/1984  1  7/1986  1  5/1988  3  7/1990  3 
  6018 1 1 1  3/1903 99/9999  7/1984  1  7/1986  1  7/1988  1  8/1990  2 
  6019 1 1 1  2/1903 99/9999  6/1984  1  7/1986  1  7/1988  1  7/1990  1 
  6020 1 1 1  2/1903 11/1989  6/1984  1  7/1986  1  7/1988  1  7/1990  3 
diff --git a/src/imach.c b/src/imach.c
index 51fec42..b44f803 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1304,17 +1304,18 @@ jmean=0.;
 	dh[mi][i]=1;
       else{
 	if (s[mw[mi+1][i]][i] > nlstate) {
+	  if (agedc[i] < 2*AGESUP) {
 	  j= rint(agedc[i]*12-agev[mw[mi][i]][i]*12); 
-	  /*if ((j<0) || (j>28)) printf("j=%d num=%d ",j,i);*/
 	  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;
 	  sum=sum+j;
+	  if (j<0) printf("j=%d num=%d ",j,i); 
+	  }
 	}
 	else{
 	  j= rint( (agev[mw[mi+1][i]][i]*12 - agev[mw[mi][i]][i]*12));
-	  /*if ((j<0) || (j>28)) printf("j=%d num=%d ",j,i);*/
 	  k=k+1;
 	  if (j >= jmax) jmax=j;
 	  else if (j <= jmin)jmin=j;
@@ -1676,7 +1677,7 @@ int main()
   double ***eij, ***vareij;
   double **varpl; /* Variances of prevalence limits by age */
   double *epj, vepp;
-  char version[80]="Imach version 62c, May 1999, INED-EUROREVES ";
+  char version[80]="Imach version 64b, May 2001, INED-EUROREVES ";
   char *alph[]={"a","a","b","c","d","e"}, str[4];
 
   char z[1]="c", occ;
@@ -2680,7 +2681,7 @@ strcpy(fileresvpl,"vpl");
     if (z[0] == 'c') system("./imach");
     else if (z[0] == 'e') {
       chdir(path);
-      system("index.htm");
+      system(optionfilehtm);
     }
     else if (z[0] == 'q') exit(0);
   }
-- 
2.43.0