[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.112 and 1.113

version 1.112, 2006/01/30 09:55:26 version 1.113, 2006/02/24 14:20:24
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.113  2006/02/24 14:20:24  brouard
     (Module): Memory leaks checks with valgrind and:
     datafile was not closed, some imatrix were not freed and on matrix
     allocation too.
   
   Revision 1.112  2006/01/30 09:55:26  brouard    Revision 1.112  2006/01/30 09:55:26  brouard
   (Module): Back to gnuplot.exe instead of wgnuplot.exe    (Module): Back to gnuplot.exe instead of wgnuplot.exe
   
Line 3234  To be simple, these graphs help to under Line 3239  To be simple, these graphs help to under
   }    }
   free_ma3x(varpij,1,nlstate,1,nlstate+ndeath,(int) bage, (int)fage);    free_ma3x(varpij,1,nlstate,1,nlstate+ndeath,(int) bage, (int)fage);
   free_matrix(mu,1,(nlstate+ndeath)*(nlstate+ndeath),(int) bage, (int)fage);    free_matrix(mu,1,(nlstate+ndeath)*(nlstate+ndeath),(int) bage, (int)fage);
     free_matrix(doldm,1,(nlstate)*(nlstate+ndeath),1,(nlstate)*(nlstate+ndeath));
     free_matrix(dnewm,1,(nlstate)*(nlstate+ndeath),1,npar);
   free_vector(xp,1,npar);    free_vector(xp,1,npar);
   fclose(ficresprob);    fclose(ficresprob);
   fclose(ficresprobcov);    fclose(ficresprobcov);
Line 4628  int main(int argc, char *argv[]) Line 4635  int main(int argc, char *argv[])
           
     i=i+1;      i=i+1;
   } /* End loop reading  data */    } /* End loop reading  data */
     fclose(fic);
   /* printf("ii=%d", ij);    /* printf("ii=%d", ij);
      scanf("%d",i);*/       scanf("%d",i);*/
   imx=i-1; /* Number of individuals */    imx=i-1; /* Number of individuals */
Line 4725  int main(int argc, char *argv[]) Line 4733  int main(int argc, char *argv[])
   printf("cptcovprod=%d ", cptcovprod);    printf("cptcovprod=%d ", cptcovprod);
   fprintf(ficlog,"cptcovprod=%d ", cptcovprod);    fprintf(ficlog,"cptcovprod=%d ", cptcovprod);
   
   scanf("%d ",i);    scanf("%d ",i);*/
   fclose(fic);*/  
   
     /*  if(mle==1){*/      /*  if(mle==1){*/
   if (weightopt != 1) { /* Maximisation without weights*/    if (weightopt != 1) { /* Maximisation without weights*/
Line 5610  Interval (in months) between two waves: Line 5617  Interval (in months) between two waves:
     free_ma3x(probs,1,AGESUP,1,NCOVMAX, 1,NCOVMAX);      free_ma3x(probs,1,AGESUP,1,NCOVMAX, 1,NCOVMAX);
   
   }  /* mle==-3 arrives here for freeing */    }  /* mle==-3 arrives here for freeing */
     free_matrix(prlim,1,nlstate,1,nlstate);
     free_matrix(pmmij,1,nlstate+ndeath,1,nlstate+ndeath);      free_matrix(pmmij,1,nlstate+ndeath,1,nlstate+ndeath);
     free_matrix(oldms, 1,nlstate+ndeath,1,nlstate+ndeath);      free_matrix(oldms, 1,nlstate+ndeath,1,nlstate+ndeath);
     free_matrix(newms, 1,nlstate+ndeath,1,nlstate+ndeath);      free_matrix(newms, 1,nlstate+ndeath,1,nlstate+ndeath);
     free_matrix(savms, 1,nlstate+ndeath,1,nlstate+ndeath);      free_matrix(savms, 1,nlstate+ndeath,1,nlstate+ndeath);
     
     free_matrix(covar,0,NCOVMAX,1,n);      free_matrix(covar,0,NCOVMAX,1,n);
     free_matrix(matcov,1,npar,1,npar);      free_matrix(matcov,1,npar,1,npar);
     /*free_vector(delti,1,npar);*/      /*free_vector(delti,1,npar);*/
Line 5629  Interval (in months) between two waves: Line 5636  Interval (in months) between two waves:
     free_ivector(Tage,1,15);      free_ivector(Tage,1,15);
     free_ivector(Tcode,1,100);      free_ivector(Tcode,1,100);
   
       free_imatrix(nbcode,0,NCOVMAX,0,NCOVMAX);
       free_imatrix(codtab,1,100,1,10);
   fflush(fichtm);    fflush(fichtm);
   fflush(ficgp);    fflush(ficgp);
       
Removed from v.1.112  
changed lines
  Added in v.1.113

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>