Summary: Computing mean and stdeviation of fixed quantitative variables

diff --git a/src/imach.c b/src/imach.c
index f343fa44a6b9199271d4c178805714f4a4fc4deb..b8b768fd3b33e124b68ace1637ba6f1e2a5809d2 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.283  2018/04/19 14:49:16  brouard
+  Summary: Some minor bugs fixed
+
   Revision 1.282  2018/02/27 22:50:02  brouard
   *** empty log message ***
 
@@ -4368,7 +4371,7 @@ void  freqsummary(char fileres[], double p[], double pstart[], int iagemin, int
   double ***freq; /* Frequencies */
   double *x, *y, a=0.,b=0.,r=1., sa=0., sb=0.; /* for regression, y=b+m*x and r is the correlation coefficient */
   int no=0, linreg(int ifi, int ila, int *no, const double x[], const double y[], double* a, double* b, double* r, double* sa, double * sb);
-  double *meanq, *idq;
+  double *meanq, *stdq, *idq;
   double **meanqt;
   double *pp, **prop, *posprop, *pospropt;
   double pos=0., posproptt=0., pospropta=0., k2, dateintsum=0,k2cpt=0;
@@ -4381,6 +4384,7 @@ void  freqsummary(char fileres[], double p[], double pstart[], int iagemin, int
   pospropt=vector(1,nlstate); /* Counting the number of transition starting from a live state */ 
   /* prop=matrix(1,nlstate,iagemin,iagemax+3); */
   meanq=vector(1,nqfveff); /* Number of Quantitative Fixed Variables Effective */
+  stdq=vector(1,nqfveff); /* Number of Quantitative Fixed Variables Effective */
   idq=vector(1,nqfveff); /* Number of Quantitative Fixed Variables Effective */
   meanqt=matrix(1,lastpass,1,nqtveff);
   strcpy(fileresp,"P_");
@@ -4491,8 +4495,9 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
        pospropt[i]=0;
       }
       for (z1=1; z1<= nqfveff; z1++) { /* zeroing for each combination j1 as well as for the total */
-        idq[z1]+=0.;
-        meanq[z1]+=0.;
+        idq[z1]=0.;
+        meanq[z1]=0.;
+        stdq[z1]=0.;
       }
       /* for (z1=1; z1<= nqtveff; z1++) { */
       /*   for(m=1;m<=lastpass;m++){ */
@@ -4508,9 +4513,6 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
        if(j !=0){
          if(anyvaryingduminmodel==0){ /* If All fixed covariates */
            if (cptcoveff >0) { /* Filter is here: Must be looked at for model=V1+V2+V3+V4 */
-             /* for (z1=1; z1<= nqfveff; z1++) { */
-             /*   meanq[z1]+=coqvar[Tvar[z1]][iind];  /\* Computes mean of quantitative with selected filter *\/ */
-             /* } */
              for (z1=1; z1<=cptcoveff; z1++) { /* loops on covariates in the model */
                /* if(Tvaraff[z1] ==-20){ */
                /*       /\* sumnew+=cotvar[mw[mi][iind]][z1][iind]; *\/ */
@@ -4531,7 +4533,7 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
        }/* end j==0 */
        if (bool==1){ /* We selected an individual iind satisfying combination j1 (V4=1 V3=0) or all fixed covariates */
          /* for(m=firstpass; m<=lastpass; m++){ */
-         for(mi=1; mi<wav[iind];mi++){ /* For that wave */
+         for(mi=1; mi<wav[iind];mi++){ /* For each wave */
            m=mw[mi][iind];
            if(j!=0){
              if(anyvaryingduminmodel==1){ /* Some are varying covariates */
@@ -4551,7 +4553,7 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
              }/* Some are varying covariates, we tried to speed up if all fixed covariates in the model, avoiding waves loop  */
            } /* end j==0 */
            /* bool =0 we keep that guy which corresponds to the combination of dummy values */
-           if(bool==1){
+           if(bool==1){ /*Selected */
              /* dh[m][iind] or dh[mw[mi][iind]][iind] is the delay between two effective (mi) waves m=mw[mi][iind]
                 and mw[mi+1][iind]. dh depends on stepm. */
              agebegin=agev[m][iind]; /* Age at beginning of wave before transition*/
@@ -4569,16 +4571,16 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
                  if(s[m][iind]==-1)
                    printf(" num=%ld m=%d, iind=%d s1=%d s2=%d agev at m=%d agebegin=%.2f ageend=%.2f, agemed=%d\n", num[iind], m, iind,s[m][iind],s[m+1][iind], (int)agev[m][iind],agebegin, ageend, (int)((agebegin+ageend)/2.));
                  freq[s[m][iind]][s[m+1][iind]][(int)agev[m][iind]] += weight[iind]; /* At age of beginning of transition, where status is known */
+                 for (z1=1; z1<= nqfveff; z1++) { /* Quantitative variables, calculating mean */
+                   idq[z1]=idq[z1]+weight[iind];
+                   meanq[z1]+=covar[ncovcol+z1][iind]*weight[iind];  /* Computes mean of quantitative with selected filter */
+                   stdq[z1]+=covar[ncovcol+z1][iind]*covar[ncovcol+z1][iind]*weight[iind]*weight[iind]; /* *weight[iind];*/  /* Computes mean of quantitative with selected filter */
+                 }
                  /* if((int)agev[m][iind] == 55) */
                  /*   printf("j=%d, j1=%d Age %d, iind=%d, num=%09ld m=%d\n",j,j1,(int)agev[m][iind],iind, num[iind],m); */
                  /* freq[s[m][iind]][s[m+1][iind]][(int)((agebegin+ageend)/2.)] += weight[iind]; */
                  freq[s[m][iind]][s[m+1][iind]][iagemax+3] += weight[iind]; /* Total is in iagemax+3 *//* At age of beginning of transition, where status is known */
                }
-               for (z1=1; z1<= nqfveff; z1++) {
-                 idq[z1]++;
-                 meanq[z1]+=covar[ncovcol+z1][iind]; /* *weight[iind];*/  /* Computes mean of quantitative with selected filter */
-                 /* meanq[z1]+=coqvar[Tvar[z1]][iind];  /\* Computes mean of quantitative with selected filter *\/ */
-               }
              } /* end if between passes */  
              if ((agev[m][iind]>1) && (agev[m][iind]< (iagemax+3)) && (anint[m][iind]!=9999) && (mint[m][iind]!=99) && (j==0)) {
                dateintsum=dateintsum+k2; /* on all covariates ?*/
@@ -4589,6 +4591,11 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
              bool=1;
            }/* end bool 2 */
          } /* end m */
+         /* for (z1=1; z1<= nqfveff; z1++) { /\* Quantitative variables, calculating mean *\/ */
+         /*   idq[z1]=idq[z1]+weight[iind]; */
+         /*   meanq[z1]+=covar[ncovcol+z1][iind]*weight[iind];  /\* Computes mean of quantitative with selected filter *\/ */
+         /*   stdq[z1]+=covar[ncovcol+z1][iind]*covar[ncovcol+z1][iind]*weight[iind]*weight[iind]; /\* *weight[iind];*\/  /\* Computes mean of quantitative with selected filter *\/ */
+         /* } */
        } /* end bool */
       } /* end iind = 1 to imx */
       /* prop[s][age] is feeded for any initial and valid live state as well as
@@ -4626,18 +4633,26 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
        fprintf(ficresphtmfr, "**********</h3>\n");
        fprintf(ficlog, "**********\n");
       }
-           /*
-             Printing means of quantitative variables if any
-           */
-           for (z1=1; z1<= nqfveff; z1++) {
-             fprintf(ficresphtmfr,"V quantitative id %d, number of idividuals= %f, sum=%f", z1, idq[z1], meanq[z1]);
-             fprintf(ficresphtmfr,", mean=%f<p>\n",meanq[z1]/idq[z1]);
-           }
-           /* for (z1=1; z1<= nqtveff; z1++) { */
-           /*  for(m=1;m<=lastpass;m++){ */
-           /*    fprintf(ficresphtmfr,"V quantitative id %d, pass id=%d, mean=%f<p>\n", z1, m, meanqt[m][z1]); */
-           /*   } */
-           /* } */
+      /*
+       Printing means of quantitative variables if any
+      */
+      for (z1=1; z1<= nqfveff; z1++) {
+       fprintf(ficlog,"Mean of quantitative variable V%d on %.0f individuals sum=%f", ncovcol+z1, idq[z1], meanq[z1]);
+       fprintf(ficlog,", mean=%.3g\n",meanq[z1]/idq[z1]);
+       if(weightopt==1){
+         printf(" Weighted mean and standard deviation of");
+         fprintf(ficlog," Weighted mean and standard deviation of");
+         fprintf(ficresphtmfr," Weighted mean and standard deviation of");
+       }
+       printf(" quantitative variable V%d on %.0f representatives of the population : %6.3g (%6.3g)\n", ncovcol+z1, idq[z1],meanq[z1]/idq[z1], sqrt((stdq[z1]-meanq[z1]*meanq[z1]/idq[z1])/idq[z1]));
+       fprintf(ficlog," quantitative variable V%d on %.0f representatives of the population : %6.3g (%6.3g)\n", ncovcol+z1, idq[z1],meanq[z1]/idq[z1], sqrt((stdq[z1]-meanq[z1]*meanq[z1]/idq[z1])/idq[z1]));
+       fprintf(ficresphtmfr," quantitative variable V%d on %.0f representatives of the population : %6.3g (%6.3g)<p>\n", ncovcol+z1, idq[z1],meanq[z1]/idq[z1], sqrt((stdq[z1]-meanq[z1]*meanq[z1]/idq[z1])/idq[z1]));
+      }
+      /* for (z1=1; z1<= nqtveff; z1++) { */
+      /*       for(m=1;m<=lastpass;m++){ */
+      /*         fprintf(ficresphtmfr,"V quantitative id %d, pass id=%d, mean=%f<p>\n", z1, m, meanqt[m][z1]); */
+      /*   } */
+      /* } */
 
       fprintf(ficresphtm,"<table style=\"text-align:center; border: 1px solid\">");
       if((cptcoveff==0 && nj==1)|| nj==2 ) /* no covariate and first pass */
@@ -4873,7 +4888,7 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
            fprintf(ficlog,"\n");
          }
        }
-      }
+      } /* end of state i */
       printf("#Freqsummary\n");
       fprintf(ficlog,"\n");
       for(s1=-1; s1 <=nlstate+ndeath; s1++){
@@ -4921,6 +4936,7 @@ Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=1+age
   fclose(ficresphtmfr);
   free_vector(idq,1,nqfveff);
   free_vector(meanq,1,nqfveff);
+  free_vector(stdq,1,nqfveff);
   free_matrix(meanqt,1,lastpass,1,nqtveff);
   free_vector(x, iagemin-AGEMARGE, iagemax+4+AGEMARGE);
   free_vector(y, iagemin-AGEMARGE, iagemax+4+AGEMARGE);