--- imach/src/imach.c	2015/11/17 22:12:03	1.209
+++ imach/src/imach.c	2015/11/18 17:41:20	1.210
@@ -1,6 +1,9 @@
-/* $Id: imach.c,v 1.209 2015/11/17 22:12:03 brouard Exp $
+/* $Id: imach.c,v 1.210 2015/11/18 17:41:20 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.210  2015/11/18 17:41:20  brouard
+  Summary: Start working on projected prevalences
+
   Revision 1.209  2015/11/17 22:12:03  brouard
   Summary: Adding ftolpl parameter
   Author: N Brouard
@@ -770,12 +773,12 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.209 2015/11/17 22:12:03 brouard Exp $ */
+/* $Id: imach.c,v 1.210 2015/11/18 17:41:20 brouard Exp $ */
 /* $State: Exp $ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
 char copyright[]="October 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
-char fullversion[]="$Revision: 1.209 $ $Date: 2015/11/17 22:12:03 $"; 
+char fullversion[]="$Revision: 1.210 $ $Date: 2015/11/18 17:41:20 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -3221,7 +3224,7 @@ void  freqsummary(char fileres[], int ia
       k2cpt=0;
       for (i=1; i<=imx; i++) {
 	bool=1;
-	if  (cptcovn>0) { /* Filter is here: Must be looked at for model=V1+V2+V3+V4 */
+	if (cptcovn>0) { /* Filter is here: Must be looked at for model=V1+V2+V3+V4 */
 	  for (z1=1; z1<=cptcoveff; z1++)       
             if (covar[Tvaraff[z1]][i]!= nbcode[Tvaraff[z1]][codtabm(j1,z1)]){
                 /* Tests if the value of each of the covariates of i is equal to filter j1 */
@@ -3231,7 +3234,7 @@ void  freqsummary(char fileres[], int ia
                 j1,z1,nbcode[Tvaraff[z1]][codtabm(j1,z1)],j1);*/
               /* For j1=7 in V1+V2+V3+V4 = 0 1 1 0 and codtabm(7,3)=1 and nbcde[3][?]=1*/
             } 
-	}
+	} /* cptcovn > 0 */
  
 	if (bool==1){
 	  for(m=firstpass; m<=lastpass; m++){
@@ -3245,14 +3248,15 @@ void  freqsummary(char fileres[], int ia
 		freq[s[m][i]][s[m+1][i]][iagemax+3] += weight[i];
 	      }
 	      
-	      if ((agev[m][i]>1) && (agev[m][i]< (iagemax+3))) {
+	      if ((agev[m][i]>1) && (agev[m][i]< (iagemax+3)) && (anint[m][i]!=9999) && (mint[m][i]!=99)) {
 		dateintsum=dateintsum+k2;
 		k2cpt++;
+		/* printf("i=%ld dateintmean = %lf dateintsum=%lf k2cpt=%lf k2=%lf\n",i, dateintsum/k2cpt, dateintsum,k2cpt, k2); */
 	      }
 	      /*}*/
-	  }
-	}
-      } /* end i */
+	  } /* end m */
+	} /* end bool */
+      } /* end i = 1 to imx */
        
       /*      fprintf(ficresp, "#Count between %.lf/%.lf/%.lf and %.lf/%.lf/%.lf\n",jprev1, mprev1,anprev1,jprev2, mprev2,anprev2);*/
       pstamp(ficresp);
@@ -3338,9 +3342,9 @@ void  freqsummary(char fileres[], int ia
 	if(first==1)
 	  printf("Others in log...\n");
 	fprintf(ficlog,"\n");
-      }
+      } /* end loop i */
       /*}*/
-  }
+  } /* end j1 */
   dateintmean=dateintsum/k2cpt; 
  
   fclose(ficresp);
@@ -4973,6 +4977,11 @@ void printinggnuplot(char fileresu[], ch
     /*#endif */
   m=pow(2,cptcoveff);
 
+  /* Projected Prevalences */
+/* plot "NAGI0w_V1V2_monthlyb2b-proj/F_NAGI0w_V1V2_monthlyb2b-proj.txt" u 6:((($1 == 1) && ($2==0) && ($3==2) &&($4==0))? $7/(1-$13):1/0) t 'p11' w line */
+/* replot ""  u 6:((($1 == 1) && ($2==0) && ($3==2) &&($4==0))? $8/(1-$14):1/0) t 'p21' w line */
+/* replot ""  u 6:((($1 == 1) && ($2==0) && ($3==2) &&($4==0)&&($9!=0))? $9/(1-$15):1/0) t 'p.1' w line */
+
   /* Contribution to likelihood */
   /* Plot the probability implied in the likelihood */
     fprintf(ficgp,"\n# Contributions to the Likelihood, mle >=1. For mle=4 no interpolation, pure matrix products.\n#\n");