--- imach/src/imach.c	2002/02/20 17:12:32	1.16
+++ imach/src/imach.c	2002/02/20 17:15:02	1.17
@@ -1150,10 +1150,10 @@ void lubksb(double **a, int n, int *indx
 } 
 
 /************ Frequencies ********************/
-void  freqsummary(char fileres[], int agemin, int agemax, int **s, double **agev, int nlstate, int imx, int *Tvar, int **nbcode, int *ncodemax, int fprev1,int lprev1)
+void  freqsummary(char fileres[], int agemin, int agemax, int **s, double **agev, int nlstate, int imx, int *Tvar, int **nbcode, int *ncodemax, int fprev1,int lprev1,double **mint,double **anint)
 {  /* Some frequencies */
  
-  int i, m, jk, k1, i1, j1, bool, z1,z2,j;
+  int i, m, jk, k1, k2,i1, j1, bool, z1,z2,j;
   double ***freq; /* Frequencies */
   double *pp;
   double pos;
@@ -1161,7 +1161,7 @@ void  freqsummary(char fileres[], int ag
   char fileresp[FILENAMELENGTH];
 
   pp=vector(1,nlstate);
- probs= ma3x(1,130 ,1,8, 1,8);
+  probs= ma3x(1,130 ,1,8, 1,8);
   strcpy(fileresp,"p");
   strcat(fileresp,fileres);
   if((ficresp=fopen(fileresp,"w"))==NULL) {
@@ -1192,13 +1192,16 @@ void  freqsummary(char fileres[], int ag
 	       bool=0;
 	 }
 	  if (bool==1) {
-	   for(m=fprev1; m<=lprev1; m++){
+	    for(m=fprev1; m<=lprev1; m++){
+	     k2=anint[m][i]+(mint[m][i]/12.);
+	     if ((k2>=1984) && (k2<=1988.5)) {
 	     if(agev[m][i]==0) agev[m][i]=agemax+1;
 	     if(agev[m][i]==1) agev[m][i]=agemax+2;
 	     freq[s[m][i]][s[m+1][i]][(int)agev[m][i]] += weight[i];
 	     freq[s[m][i]][s[m+1][i]][(int) agemax+3] += weight[i];
-	   }
-	 }
+	     }
+	    }
+	  }
        }
         if  (cptcovn>0) {
 	 fprintf(ficresp, "\n#********** Variable "); 
@@ -2290,8 +2293,8 @@ printf("Total number of individuals= %d,
     free_imatrix(outcome,1,maxwav+1,1,n);
     free_vector(moisnais,1,n);
     free_vector(annais,1,n);
-    free_matrix(mint,1,maxwav,1,n);
-    free_matrix(anint,1,maxwav,1,n);
+    /* free_matrix(mint,1,maxwav,1,n);
+       free_matrix(anint,1,maxwav,1,n);*/
     free_vector(moisdc,1,n);
     free_vector(andc,1,n);
 
@@ -2323,21 +2326,15 @@ printf("Total number of individuals= %d,
        }
      }
    } 
-
-
-   /*for(i=1; i <=m ;i++){ 
-     for(k=1; k <=cptcovn; k++){
-       printf("i=%d k=%d %d %d",i,k,codtab[i][k], cptcoveff);
-     }
-     printf("\n");
-   }
-   scanf("%d",i);*/
     
    /* Calculates basic frequencies. Computes observed prevalence at single age
        and prints on file fileres'p'. */
-  freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax, fprev, lprev);
-
-    pmmij= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
+  freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax, fprev, lprev,mint,anint);
+  
+  free_matrix(mint,1,maxwav,1,n);
+  free_matrix(anint,1,maxwav,1,n);
+  
+  pmmij= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
     oldms= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
     newms= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
     savms= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */