Diff for /imach/src/imach.c between versions 1.129 and 1.130

version 1.129, 2007/08/31 13:49:27 version 1.130, 2009/05/26 06:44:34
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.130  2009/05/26 06:44:34  brouard
     (Module): Max Covariate is now set to 20 instead of 8. A
     lot of cleaning with variables initialized to 0. Trying to make
     V2+V3*age+V1+V4 strb=V3*age+V1+V4 working better.
   
   Revision 1.129  2007/08/31 13:49:27  lievre    Revision 1.129  2007/08/31 13:49:27  lievre
   Modification of the way of exiting when the covariate is not binary in order to see on the window the error message before exiting    Modification of the way of exiting when the covariate is not binary in order to see on the window the error message before exiting
   
Line 373  extern int errno; Line 378  extern int errno;
 #define NINTERVMAX 8  #define NINTERVMAX 8
 #define NLSTATEMAX 8 /* Maximum number of live states (for func) */  #define NLSTATEMAX 8 /* Maximum number of live states (for func) */
 #define NDEATHMAX 8 /* Maximum number of dead states (for func) */  #define NDEATHMAX 8 /* Maximum number of dead states (for func) */
 #define NCOVMAX 8 /* Maximum number of covariates */  #define NCOVMAX 20 /* Maximum number of covariates */
 #define MAXN 20000  #define MAXN 20000
 #define YEARM 12. /* Number of months per year */  #define YEARM 12. /* Number of months per year */
 #define AGESUP 130  #define AGESUP 130
Line 396  char version[]="Imach version 0.98i, Jun Line 401  char version[]="Imach version 0.98i, Jun
 char fullversion[]="$Revision$ $Date$";   char fullversion[]="$Revision$ $Date$"; 
 char strstart[80];  char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];  char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */  int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
 int nvar;  int nvar=0;
 int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;  int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov=0; /* Number of covariates, of covariates with '*age' */
 int npar=NPARMAX;  int npar=NPARMAX;
 int nlstate=2; /* Number of live states */  int nlstate=2; /* Number of live states */
 int ndeath=1; /* Number of dead states */  int ndeath=1; /* Number of dead states */
 int ncovmodel, ncovcol;     /* Total number of covariables including constant a12*1 +b12*x ncovmodel=2 */  int ncovmodel=0, ncovcol=0;     /* Total number of covariables including constant a12*1 +b12*x ncovmodel=2 */
 int popbased=0;  int popbased=0;
   
 int *wav; /* Number of waves for this individuual 0 is possible */  int *wav; /* Number of waves for this individuual 0 is possible */
 int maxwav; /* Maxim number of waves */  int maxwav=0; /* Maxim number of waves */
 int jmin, jmax; /* min, max spacing between 2 waves */  int jmin=0, jmax=0; /* min, max spacing between 2 waves */
 int ijmin, ijmax; /* Individuals having jmin and jmax */   int ijmin=0, ijmax=0; /* Individuals having jmin and jmax */ 
 int gipmx, gsw; /* Global variables on the number of contributions   int gipmx=0, gsw=0; /* Global variables on the number of contributions 
                    to the likelihood and the sum of weights (done by funcone)*/                     to the likelihood and the sum of weights (done by funcone)*/
 int mle, weightopt;  int mle=1, weightopt=0;
 int **mw; /* mw[mi][i] is number of the mi wave for this individual */  int **mw; /* mw[mi][i] is number of the mi wave for this individual */
 int **dh; /* dh[mi][i] is number of steps between mi,mi+1 for this individual */  int **dh; /* dh[mi][i] is number of steps between mi,mi+1 for this individual */
 int **bh; /* bh[mi][i] is the bias (+ or -) for this individual if the delay between  int **bh; /* bh[mi][i] is the bias (+ or -) for this individual if the delay between
            * wave mi and wave mi+1 is not an exact multiple of stepm. */             * wave mi and wave mi+1 is not an exact multiple of stepm. */
 double jmean; /* Mean space between 2 waves */  double jmean=1; /* Mean space between 2 waves */
 double **oldm, **newm, **savm; /* Working pointers to matrices */  double **oldm, **newm, **savm; /* Working pointers to matrices */
 double **oldms, **newms, **savms; /* Fixed working pointers to matrices */  double **oldms, **newms, **savms; /* Fixed working pointers to matrices */
 FILE *fic,*ficpar, *ficparo,*ficres, *ficresp, *ficrespl, *ficrespij, *ficrest,*ficresf,*ficrespop;  FILE *fic,*ficpar, *ficparo,*ficres, *ficresp, *ficrespl, *ficrespij, *ficrest,*ficresf,*ficrespop;
 FILE *ficlog, *ficrespow;  FILE *ficlog, *ficrespow;
 int globpr; /* Global variable for printing or not */  int globpr=0; /* Global variable for printing or not */
 double fretone; /* Only one call to likelihood */  double fretone; /* Only one call to likelihood */
 long ipmx; /* Number of contributions */  long ipmx=0; /* Number of contributions */
 double sw; /* Sum of weights */  double sw; /* Sum of weights */
 char filerespow[FILENAMELENGTH];  char filerespow[FILENAMELENGTH];
 char fileresilk[FILENAMELENGTH]; /* File of individual contributions to the likelihood */  char fileresilk[FILENAMELENGTH]; /* File of individual contributions to the likelihood */
Line 2044  void pstamp(FILE *fichier) Line 2049  void pstamp(FILE *fichier)
 void  freqsummary(char fileres[], int iagemin, int iagemax, int **s, double **agev, int nlstate, int imx, int *Tvaraff, int **nbcode, int *ncodemax,double **mint,double **anint, char strstart[])  void  freqsummary(char fileres[], int iagemin, int iagemax, int **s, double **agev, int nlstate, int imx, int *Tvaraff, int **nbcode, int *ncodemax,double **mint,double **anint, char strstart[])
 {  /* Some frequencies */  {  /* Some frequencies */
       
   int i, m, jk, k1,i1, j1, bool, z1,z2,j;    int i, m, jk, k1,i1, j1, bool, z1,j;
   int first;    int first;
   double ***freq; /* Frequencies */    double ***freq; /* Frequencies */
   double *pp, **prop;    double *pp, **prop;
Line 2213  void prevalence(double ***probs, double Line 2218  void prevalence(double ***probs, double
      We still use firstpass and lastpass as another selection.       We still use firstpass and lastpass as another selection.
   */    */
     
   int i, m, jk, k1, i1, j1, bool, z1,z2,j;    int i, m, jk, k1, i1, j1, bool, z1,j;
   double ***freq; /* Frequencies */    double ***freq; /* Frequencies */
   double *pp, **prop;    double *pp, **prop;
   double pos,posprop;     double pos,posprop; 
Line 2430  void  concatwav(int wav[], int **dh, int Line 2435  void  concatwav(int wav[], int **dh, int
 void tricode(int *Tvar, int **nbcode, int imx)  void tricode(int *Tvar, int **nbcode, int imx)
 {  {
       
   int Ndum[20],ij=1, k, j, i, maxncov=19;    /*      Tvar[i]=atoi(stre); /* find 'n' in Vn and stores in Tvar. If model=V2+V1 Tvar[1]=2 and Tvar[2]=1 */
   
     int Ndum[20],ij=1, k=0, j=0, i=0, maxncov=19;
   int cptcode=0;    int cptcode=0;
   cptcoveff=0;     cptcoveff=0; 
     
Line 3647  true period expectancies (those weighted Line 3654  true period expectancies (those weighted
 void printinggnuplot(char fileres[], char optionfilefiname[], double ageminpar, double agemaxpar, double fage , char pathc[], double p[]){  void printinggnuplot(char fileres[], char optionfilefiname[], double ageminpar, double agemaxpar, double fage , char pathc[], double p[]){
   
   char dirfileres[132],optfileres[132];    char dirfileres[132],optfileres[132];
   int m,cpt,k1,i,k,j,jk,k2,k3,ij,l;    int m0,cpt=0,k1=0,i=0,k=0,j=0,jk=0,k2=0,k3=0,ij=0,l=0;
   int ng;    int ng=0;
 /*   if((ficgp=fopen(optionfilegnuplot,"a"))==NULL) { */  /*   if((ficgp=fopen(optionfilegnuplot,"a"))==NULL) { */
 /*     printf("Problem with file %s",optionfilegnuplot); */  /*     printf("Problem with file %s",optionfilegnuplot); */
 /*     fprintf(ficlog,"Problem with file %s",optionfilegnuplot); */  /*     fprintf(ficlog,"Problem with file %s",optionfilegnuplot); */
Line 4966  run imach with mle=-1 to get a correct t Line 4973  run imach with mle=-1 to get a correct t
     j=0, j1=0, k1=1, k2=1;      j=0, j1=0, k1=1, k2=1;
     j=nbocc(model,'+'); /* j=Number of '+' */      j=nbocc(model,'+'); /* j=Number of '+' */
     j1=nbocc(model,'*'); /* j1=Number of '*' */      j1=nbocc(model,'*'); /* j1=Number of '*' */
     cptcovn=j+1;       cptcovn=j+1; /* Number of covariates V1+V2+V3 =>2+1=3 */
     cptcovprod=j1; /*Number of products */      cptcovprod=j1; /*Number of products  V1*V2 =1 */
           
     strcpy(modelsav,model);       strcpy(modelsav,model); 
     if ((strcmp(model,"age")==0) || (strcmp(model,"age*age")==0)){      if ((strcmp(model,"age")==0) || (strcmp(model,"age*age")==0)){
Line 4977  run imach with mle=-1 to get a correct t Line 4984  run imach with mle=-1 to get a correct t
     }      }
           
     /* This loop fills the array Tvar from the string 'model'.*/      /* This loop fills the array Tvar from the string 'model'.*/
       /* j is the number of + signs in the model V1+V2+V3 j=2 i=3 to 1 */
     for(i=(j+1); i>=1;i--){      for(i=(j+1); i>=1;i--){
       cutv(stra,strb,modelsav,'+'); /* keeps in strb after the last + */         cutv(stra,strb,modelsav,'+'); /* keeps in strb after the first '+' 
                                        modelsav=V2+V3*age+V1+V4 strb=V3*age+V1+V4 
                                        stra=V2
                                       */ 
       if (nbocc(modelsav,'+')==0) strcpy(strb,modelsav); /* and analyzes it */        if (nbocc(modelsav,'+')==0) strcpy(strb,modelsav); /* and analyzes it */
       /*      printf("i=%d a=%s b=%s sav=%s\n",i, stra,strb,modelsav);*/        /*      printf("i=%d a=%s b=%s sav=%s\n",i, stra,strb,modelsav);*/
       /*scanf("%d",i);*/        /*scanf("%d",i);*/
       if (strchr(strb,'*')) {  /* Model includes a product */        if (strchr(strb,'*')) {  /* Model includes a product V1+V3*age+V2 strb=V3*age*/
         cutv(strd,strc,strb,'*'); /* strd*strc  Vm*Vn (if not *age)*/          cutv(strd,strc,strb,'*'); /* strd*strc  Vm*Vn: V3*age strc=age strd=V3 ; V3*V2 strc=V2, strd=V3 */
         if (strcmp(strc,"age")==0) { /* Vn*age */          if (strcmp(strc,"age")==0) { /* Vn*age */
           cptcovprod--;            cptcovprod--;
           cutv(strb,stre,strd,'V');            cutv(strb,stre,strd,'V');
           Tvar[i]=atoi(stre); /* computes n in Vn and stores in Tvar*/            Tvar[i]=atoi(stre);  /* V1+V3*age+V2 Tvar[2]=3 */
           cptcovage++;            cptcovage++; /* Sum the number of covariates including ages as a product */
             Tage[cptcovage]=i;            Tage[cptcovage]=i;  /* Tage[1] =2 */
             /*printf("stre=%s ", stre);*/            /*printf("stre=%s ", stre);*/
         }          }
         else if (strcmp(strd,"age")==0) { /* or age*Vn */          else if (strcmp(strd,"age")==0) { /* or age*Vn */
           cptcovprod--;            cptcovprod--;
Line 5000  run imach with mle=-1 to get a correct t Line 5010  run imach with mle=-1 to get a correct t
           cptcovage++;            cptcovage++;
           Tage[cptcovage]=i;            Tage[cptcovage]=i;
         }          }
         else {  /* Age is not in the model */          else {  /* Age is not in the model V1+V3*V2+V2  strb=V3*V2*/
           cutv(strb,stre,strc,'V'); /* strc= Vn, stre is n*/            cutv(strb,stre,strc,'V'); /* strc= Vn, stre is n; strb=V3*V2 stre=3 strc=*/
           Tvar[i]=ncovcol+k1;            Tvar[i]=ncovcol+k1;  /* find 'n' in Vn and stores in Tvar. 
                                     If already ncovcol=2 and model=V2*V1 Tvar[1]=2+1 and Tvar[2]=2+2 etc */
           cutv(strb,strc,strd,'V'); /* strd was Vm, strc is m */            cutv(strb,strc,strd,'V'); /* strd was Vm, strc is m */
           Tprod[k1]=i;            Tprod[k1]=i;  /* Tprod[1]  */
           Tvard[k1][1]=atoi(strc); /* m*/            Tvard[k1][1]=atoi(strc); /* m*/
           Tvard[k1][2]=atoi(stre); /* n */            Tvard[k1][2]=atoi(stre); /* n */
           Tvar[cptcovn+k2]=Tvard[k1][1];            Tvar[cptcovn+k2]=Tvard[k1][1];
Line 5021  run imach with mle=-1 to get a correct t Line 5032  run imach with mle=-1 to get a correct t
       cutv(strd,strc,strb,'V');        cutv(strd,strc,strb,'V');
       Tvar[i]=atoi(strc);        Tvar[i]=atoi(strc);
       }        }
       strcpy(modelsav,stra);          strcpy(modelsav,stra);  /* modelsav=V2+V3*age+V1+V4 strb=V3*age+V1+V4 */ 
       /*printf("a=%s b=%s sav=%s\n", stra,strb,modelsav);        /*printf("a=%s b=%s sav=%s\n", stra,strb,modelsav);
         scanf("%d",i);*/          scanf("%d",i);*/
     } /* end of loop + */      } /* end of loop + */
Line 5167  run imach with mle=-1 to get a correct t Line 5178  run imach with mle=-1 to get a correct t
         for(cpt=1; cpt <=(m/pow(2,cptcoveff+1-k)); cpt++){          for(cpt=1; cpt <=(m/pow(2,cptcoveff+1-k)); cpt++){
           h++;            h++;
           if (h>m) h=1;codtab[h][k]=j;codtab[h][Tvar[k]]=j;            if (h>m) h=1;codtab[h][k]=j;codtab[h][Tvar[k]]=j;
           /*  printf("h=%d k=%d j=%d codtab[h][k]=%d tvar[k]=%d \n",h, k,j,codtab[h][k],Tvar[k]);*/            printf("h=%d k=%d j=%d codtab[h][k]=%d Tvar[k]=%d codtab[h][Tvar[k]]=%d \n",h, k,j,codtab[h][k],Tvar[k],codtab[h][Tvar[k]]);
         }           } 
       }        }
     }      }

Removed from v.1.129  
changed lines
  Added in v.1.130


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