Changes in calculation spaces between two waves

diff --git a/src/data1.txt b/src/data1.txt
index 6c02f61442b63bfc9973301404c59c8fd28c7a56..6e181e8cf6e2a39eae23f50d2f6b76b924c44d15 100644 (file)
--- 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 51fec423647832a86f0685005eac887620602983..b44f803b3e8d9eccd5d9ab6326dc5a441da71538 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1304,17 +1304,18 @@ jmean=0.;
        dh[mi][i]=1;\r
       else{\r
        if (s[mw[mi+1][i]][i] > nlstate) {\r
+         if (agedc[i] < 2*AGESUP) {\r
          j= rint(agedc[i]*12-agev[mw[mi][i]][i]*12); \r
-         /*if ((j<0) || (j>28)) printf("j=%d num=%d ",j,i);*/\r
          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
          sum=sum+j;\r
+         if (j<0) printf("j=%d num=%d ",j,i); \r
+         }\r
        }\r
        else{\r
          j= rint( (agev[mw[mi+1][i]][i]*12 - agev[mw[mi][i]][i]*12));\r
-         /*if ((j<0) || (j>28)) printf("j=%d num=%d ",j,i);*/\r
          k=k+1;\r
          if (j >= jmax) jmax=j;\r
          else if (j <= jmin)jmin=j;\r
@@ -1676,7 +1677,7 @@ int main()
   double ***eij, ***vareij;\r
   double **varpl; /* Variances of prevalence limits by age */\r
   double *epj, vepp;\r
-  char version[80]="Imach version 62c, May 1999, INED-EUROREVES ";\r
+  char version[80]="Imach version 64b, May 2001, INED-EUROREVES ";\r
   char *alph[]={"a","a","b","c","d","e"}, str[4];\r
 \r
   char z[1]="c", occ;\r
@@ -2680,7 +2681,7 @@ strcpy(fileresvpl,"vpl");
     if (z[0] == 'c') system("./imach");\r
     else if (z[0] == 'e') {\r
       chdir(path);\r
-      system("index.htm");\r
+      system(optionfilehtm);\r
     }\r
     else if (z[0] == 'q') exit(0);\r
   }\r