--- imach/src/imach.c	2002/02/20 17:05:44	1.14
+++ imach/src/imach.c	2002/02/20 17:08:52	1.15
@@ -73,7 +73,7 @@ int npar=NPARMAX;
 int nlstate=2; /* Number of live states */
 int ndeath=1; /* Number of dead states */
 int ncovmodel, ncov;     /* Total number of covariables including constant a12*1 +b12*x ncovmodel=2 */
-int popbased=0, fprev,lprev;
+int popbased=0;
 
 int *wav; /* Number of waves for this individuual 0 is possible */
 int maxwav; /* Maxim number of waves */
@@ -1150,7 +1150,7 @@ 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)
+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)
 {  /* Some frequencies */
  
   int i, m, jk, k1, i1, j1, bool, z1,z2,j;
@@ -1192,7 +1192,7 @@ void  freqsummary(char fileres[], int ag
 	       bool=0;
 	 }
 	  if (bool==1) {
-	   for(m=fprev; m<=lprev; m++){
+	   for(m=fprev1; m<=lprev1; m++){
 	     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];
@@ -1265,6 +1265,83 @@ void  freqsummary(char fileres[], int ag
 
 }  /* End of Freq */
 
+/************ Prevalence ********************/
+void prevalence(int agemin, int agemax, int **s, double **agev, int nlstate, int imx, int *Tvar, int **nbcode, int *ncodemax, int fprev1,int lprev1)
+{  /* Some frequencies */
+ 
+  int i, m, jk, k1, i1, j1, bool, z1,z2,j;
+  double ***freq; /* Frequencies */
+  double *pp;
+  double pos;
+
+  pp=vector(1,nlstate);
+  probs= ma3x(1,130 ,1,8, 1,8);
+  
+  freq=ma3x(-1,nlstate+ndeath,-1,nlstate+ndeath,agemin,agemax+3);
+  j1=0;
+  
+  j=cptcoveff;
+  if (cptcovn<1) {j=1;ncodemax[1]=1;}
+  
+ for(k1=1; k1<=j;k1++){
+    for(i1=1; i1<=ncodemax[k1];i1++){
+      j1++;
+ 
+      for (i=-1; i<=nlstate+ndeath; i++)  
+	for (jk=-1; jk<=nlstate+ndeath; jk++)  
+	  for(m=agemin; m <= agemax+3; m++)
+	  freq[i][jk][m]=0;
+      
+      for (i=1; i<=imx; i++) {
+	bool=1;
+	if  (cptcovn>0) {
+	  for (z1=1; z1<=cptcoveff; z1++) 
+	    if (covar[Tvaraff[z1]][i]!= nbcode[Tvaraff[z1]][codtab[j1][z1]]) 
+	      bool=0;
+	      }
+	if (bool==1) {
+	  for(m=fprev1; m<=lprev1; m++){
+	    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];
+	  }
+	}
+      }
+       for(i=(int)agemin; i <= (int)agemax+3; i++){ 
+	for(jk=1; jk <=nlstate ; jk++){
+	  for(m=-1, pp[jk]=0; m <=nlstate+ndeath ; m++)
+	    pp[jk] += freq[jk][m][i]; 
+	}
+	for(jk=1; jk <=nlstate ; jk++){
+	  for(m=-1, pos=0; m <=0 ; m++)
+	    pos += freq[jk][m][i];
+	}
+	
+	 for(jk=1; jk <=nlstate ; jk++){
+	   for(m=0, pp[jk]=0; m <=nlstate+ndeath; m++)
+	     pp[jk] += freq[jk][m][i];
+	 }
+	 
+	 for(jk=1,pos=0; jk <=nlstate ; jk++) pos += pp[jk];
+
+	 for(jk=1; jk <=nlstate ; jk++){	   
+	   if( i <= (int) agemax){
+	     if(pos>=1.e-5){
+	       probs[i][jk][j1]= pp[jk]/pos;
+	     }
+	   }
+	 }
+	 
+	 }
+    }
+  }
+  
+  
+  free_ma3x(freq,-1,nlstate+ndeath,-1,nlstate+ndeath,(int) agemin,(int) agemax+3);
+  free_vector(pp,1,nlstate);
+  
+}  /* End of Freq */
 /************* Waves Concatenation ***************/
 
 void  concatwav(int wav[], int **dh, int **mw, int **s, double *agedc, double **agev, int  firstpass, int lastpass, int imx, int nlstate, int stepm)
@@ -1790,7 +1867,7 @@ int main()
   int ju,jl, mi;
   int i1,j1, k1,k2,k3,jk,aa,bb, stepsize, ij;
   int jnais,jdc,jint4,jint1,jint2,jint3,**outcome,**adl,*tab; 
-  int mobilav=0, fprevfore=1, lprevfore=1;
+  int mobilav=0, fprev, lprev ,fprevfore=1, lprevfore=1,nforecast;
   int hstepm, nhstepm;
 
   double bage, fage, age, agelim, agebase;
@@ -1886,7 +1963,7 @@ while((c=getc(ficpar))=='#' && c!= EOF){
   }
   ungetc(c,ficpar);
   
-  fscanf(ficpar,"fprevalence=%d lprevalence=%d mob_average=%d\n",&fprevfore,&lprevfore,&mobilav);
+  fscanf(ficpar,"fprevalence=%d lprevalence=%d nforecast=%d mob_average=%d\n",&fprevfore,&lprevfore,&nforecast,&mobilav);
  
   covar=matrix(0,NCOVMAX,1,n); 
   cptcovn=0; 
@@ -2241,7 +2318,7 @@ printf("Total number of individuals= %d,
     
    /* 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);
+  freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax, fprev, lprev);
 
     pmmij= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
     oldms= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */
@@ -2505,17 +2582,12 @@ ij=1;
   fclose(ficgp);
    
 chdir(path);
-    free_matrix(agev,1,maxwav,1,imx);
+   
     free_ivector(wav,1,imx);
     free_imatrix(dh,1,lastpass-firstpass+1,1,imx);
-    free_imatrix(mw,1,lastpass-firstpass+1,1,imx);
-    
-    free_imatrix(s,1,maxwav+1,1,n);
-    
-    
+    free_imatrix(mw,1,lastpass-firstpass+1,1,imx);   
     free_ivector(num,1,n);
     free_vector(agedc,1,n);
-    free_vector(weight,1,n);
     /*free_matrix(covar,1,NCOVMAX,1,n);*/
     fclose(ficparo);
     fclose(ficres);
@@ -2709,12 +2781,10 @@ fclose(fichtm);
   }
   printf("Computing forecasting: result on file '%s' \n", fileresf);
 
-  /* Mobile average */
+  prevalence(agemin, agemax, s, agev, nlstate, imx,Tvar,nbcode, ncodemax, fprevfore, lprevfore);
 
-  /* for (agedeb=bage; agedeb<=fage; agedeb++)
-    for (i=1; i<=nlstate;i++)
-      for (cptcod=1;cptcod<=ncodemax[cptcoveff];cptcod++)
-      printf("%f %d i=%d j1=%d\n", probs[(int)agedeb][i][cptcod],(int) agedeb,i,cptcod);*/
+ free_matrix(agev,1,maxwav,1,imx);
+  /* Mobile average */
 
   if (cptcoveff==0) ncodemax[cptcoveff]=1;
 
@@ -2738,12 +2808,12 @@ fclose(fichtm);
   }
 
   stepsize=(int) (stepm+YEARM-1)/YEARM;
-  if (stepm<=24) stepsize=2;
+  if (stepm<=12) stepsize=1;
 
   agelim=AGESUP;
   hstepm=stepsize*YEARM; /* Every year of age */
-  hstepm=hstepm/stepm; /* Typically 2 years, = 2/6 months = 4 */ 
-  hstepm=12;
+  hstepm=hstepm/stepm; /* Typically 2 years, = 2 years/6 months = 4 */ 
+
    k=0;
   for(cptcov=1;cptcov<=i1;cptcov++){
     for(cptcod=1;cptcod<=ncodemax[cptcoveff];cptcod++){
@@ -2752,9 +2822,7 @@ fclose(fichtm);
       for(j=1;j<=cptcoveff;j++) {
 	fprintf(ficresf,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]);
       }
-      
       fprintf(ficresf,"******\n");
-
       fprintf(ficresf,"# StartingAge FinalAge Horizon(in years)");
       for(j=1; j<=nlstate+ndeath;j++) fprintf(ficresf," P.%d",j);
 
@@ -2762,21 +2830,20 @@ fclose(fichtm);
 	fprintf(ficresf,"\n%d %.f %.f 0 ",k,agedeb, agedeb);
        if (mobilav==1) {
 	for(j=1; j<=nlstate;j++) 
-	  fprintf(ficresf,"%.5f ",mobaverage[(int)agedeb][j][cptcod]);
+	  fprintf(ficresf," %.5f ",mobaverage[(int)agedeb][j][cptcod]);
 	}
 	else {
 	  for(j=1; j<=nlstate;j++) 
-	  fprintf(ficresf,"%.5f ",probs[(int)agedeb][j][cptcod]);
-	}
-       
-      for(j=1; j<=ndeath;j++) fprintf(ficresf,"0.");
+	  fprintf(ficresf," %.5f ",probs[(int)agedeb][j][cptcod]);
+	}  
+      for(j=1; j<=ndeath;j++) fprintf(ficresf," 0.00000");
       }
-      for (cpt=1; cpt<=NCOVMAX;cpt++)   
+      for (cpt=1; cpt<=nforecast;cpt++)   
       for (agedeb=fage; agedeb>=bage; agedeb--){ /* If stepm=6 months */
 	
-	nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); /* Typically 20 years = 20*12/6=40 */ 
-	nhstepm = nhstepm/hstepm; /* Typically 40/4=10 */
-	/*printf("stepm=%d hstepm=%d nhstepm=%d \n",stepm,hstepm,nhstepm);*/
+	nhstepm=(int) rint((agelim-agedeb)*YEARM/stepm); 
+	nhstepm = nhstepm/hstepm; 
+	/*printf("agedeb=%.lf stepm=%d hstepm=%d nhstepm=%d \n",agedeb,stepm,hstepm,nhstepm);*/
 
 	p3mat=ma3x(1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
 	oldm=oldms;savm=savms;
@@ -2784,8 +2851,9 @@ fclose(fichtm);
 		
 	for (h=0; h<=nhstepm; h++){
 	
-	  if (h*hstepm/YEARM*stepm==cpt)
- fprintf(ficresf,"\n%d %.f %.f %.f",k,agedeb, agedeb+ h*hstepm/YEARM*stepm, h*hstepm/YEARM*stepm);
+	 if (h*hstepm/YEARM*stepm==cpt)
+	    fprintf(ficresf,"\n%d %.f %.f %.f",k,agedeb, agedeb+ h*hstepm/YEARM*stepm, h*hstepm/YEARM*stepm);
+	 
 	  
 	  for(j=1; j<=nlstate+ndeath;j++) {
 	    kk1=0.;
@@ -2794,7 +2862,7 @@ fclose(fichtm);
 	      kk1=kk1+p3mat[i][j][h]*mobaverage[(int)agedeb][i][cptcod];
 	      else kk1=kk1+p3mat[i][j][h]*probs[(int)agedeb][i][cptcod];
 	    }    
-	    if (h*hstepm/YEARM*stepm==cpt) fprintf(ficresf," %.5f ", kk1);
+	  if (h*hstepm/YEARM*stepm==cpt) fprintf(ficresf," %.5f ", kk1);
 	  }
 	}
 	free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm);
@@ -2802,6 +2870,8 @@ fclose(fichtm);
     }
   }
   if (mobilav==1) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
+  free_imatrix(s,1,maxwav+1,1,n);
+  free_vector(weight,1,n);
   fclose(ficresf);
   /*---------- Health expectancies and variances ------------*/