--- imach096d/src/imach.c 2001/05/02 17:42:45 1.5 +++ imach096d/src/imach.c 2001/05/02 17:47:10 1.6 @@ -54,8 +54,6 @@ #define GLOCK_ERROR_NOPATH -1 /* empty path */ #define GLOCK_ERROR_GETCWD -2 /* cannot get cwd */ - - #define MAXPARM 30 /* Maximum number of parameters for the optimization */ #define NPARMAX 64 /* (nlstate+ndeath-1)*nlstate*ncovmodel */ @@ -71,7 +69,7 @@ int nvar; static int cptcov; -int cptcovn; +int cptcovn, cptcovage=0; int npar=NPARMAX; int nlstate=2; /* Number of live states */ int ndeath=1; /* Number of dead states */ @@ -93,9 +91,6 @@ FILE *ficreseij; FILE *ficresvpl; char fileresvpl[FILENAMELENGTH]; - - - #define NR_END 1 #define FREE_ARG char* #define FTOL 1.0e-10 @@ -129,7 +124,7 @@ int stepm; /* Stepm, step in month: minimum step interpolation*/ int m,nb; -int *num, firstpass=0, lastpass=4,*cod, *ncodemax; +int *num, firstpass=0, lastpass=4,*cod, *ncodemax, *Tage; double **agev,*moisnais, *annais, *moisdc, *andc,**mint, **anint; double **pmmij; @@ -205,7 +200,7 @@ int nbocc(char *s, char occ) void cutv(char *u,char *v, char*t, char occ) { - int i,lg,j,p; + int i,lg,j,p=0; i=0; for(j=0; j<=strlen(t)-1; j++) { if((t[j]!= occ) && (t[j+1]== occ)) p=j+1; @@ -214,8 +209,8 @@ void cutv(char *u,char *v, char*t, char lg=strlen(t); for(j=0; j=(p+1))(v[j-p-1] = t[j]); @@ -652,15 +647,23 @@ double **prevalim(double **prlim, int nl for (j=1;j<=nlstate+ndeath;j++){ oldm[ii][j]=(ii==j ? 1.0 : 0.0); } - /* Even if hstepm = 1, at least one multiplication by the unit matrix */ + + cov[1]=1.; + + /* Even if hstepm = 1, at least one multiplication by the unit matrix */ for(agefin=age-stepm/YEARM; agefin>=age-delaymax; agefin=agefin-stepm/YEARM){ newm=savm; /* Covariates have to be included here again */ - cov[1]=1.; - cov[2]=agefin; - if (cptcovn>0){ - for (k=1; k<=cptcovn;k++) {cov[2+k]=nbcode[Tvar[k]][codtab[ij][k]];/*printf("Tcode[ij]=%d nbcode=%d\n",Tcode[ij],nbcode[k][Tcode[ij]]);*/} - } + cov[2]=agefin; + + for (k=1; k<=cptcovn;k++) { + cov[2+k]=nbcode[Tvar[k]][codtab[ij][k]]; + +/*printf("Tcode[ij]=%d nbcode=%d\n",Tcode[ij],nbcode[k][Tcode[ij]]);*/ + } + for (k=1; k<=cptcovage;k++) + cov[2+Tage[k]]=cov[2+Tage[k]]*cov[2]; + out=matprod2(newm, pmij(pmmij,cov,ncovmodel,x,nlstate),1,nlstate+ndeath,1,nlstate+ndeath,1,nlstate+ndeath, oldm); savm=oldm; @@ -819,7 +822,7 @@ double ***hpxij(double ***po, int nhstep /*************** log-likelihood *************/ double func( double *x) { - int i, ii, j, k, mi, d; + int i, ii, j, k, mi, d, kk; double l, ll[NLSTATEMAX], cov[NCOVMAX]; double **out; double sw; /* Sum of weights */ @@ -831,19 +834,24 @@ double func( double *x) /*for(i=1;i0){ - for (k=1; k<=cptcovn;k++) cov[2+k]=covar[1+k-1][i]; - } + newm=savm; + cov[2]=agev[mw[mi][i]][i]+d*stepm/YEARM; + for (kk=1; kk<=cptcovage;kk++) { + cov[Tage[kk]+2]=covar[Tvar[Tage[kk]]][i]*cov[2]; + /*printf("%d %d",kk,Tage[kk]);*/ + } + /*cov[4]=covar[1][i]*cov[2];scanf("%d", i);*/ + /*cov[3]=pow(cov[2],2)/1000.;*/ + out=matprod2(newm,oldm,1,nlstate+ndeath,1,nlstate+ndeath, 1,nlstate+ndeath,pmij(pmmij,cov,ncovmodel,x,nlstate)); savm=oldm; @@ -1310,11 +1318,11 @@ float sum=0.; /*********** Tricode ****************************/ void tricode(int *Tvar, int **nbcode, int imx) { - int Ndum[80],ij, k, j, i; + int Ndum[80],ij=1, k, j, i, Ntvar[20]; int cptcode=0; for (k=0; k<79; k++) Ndum[k]=0; for (k=1; k<=7; k++) ncodemax[k]=0; - + for (j=1; j<=cptcovn; j++) { for (i=1; i<=imx; i++) { ij=(int)(covar[Tvar[j]][i]); @@ -1337,8 +1345,8 @@ void tricode(int *Tvar, int **nbcode, in } } } - - } + +} /*********** Health Expectancies ****************/ @@ -1690,7 +1698,7 @@ split(pathtot, path,optionfile); printf("title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncov=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=%s\n", title, datafile, lastobs, firstpass,lastpass,ftol, stepm, ncov, nlstate,ndeath, maxwav, mle, weightopt,model); fprintf(ficparo,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncov=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=%s\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncov,nlstate,ndeath,maxwav, mle, weightopt,model); - covar=matrix(1,NCOVMAX,1,n); + covar=matrix(0,NCOVMAX,1,n); if (strlen(model)<=1) cptcovn=0; else { j=0; @@ -1788,7 +1796,6 @@ split(pathtot, path,optionfile); printf("\n"); - if(mle==1){ /*-------- data file ----------*/ if((ficres =fopen(fileres,"w"))==NULL) { printf("Problem with resultfile: %s\n", fileres);goto end; @@ -1851,28 +1858,67 @@ split(pathtot, path,optionfile); imx=i-1; /* Number of individuals */ /* Calculation of the number of parameter from char model*/ - Tvar=ivector(1,8); + Tvar=ivector(1,15); + Tage=ivector(1,15); if (strlen(model) >1){ - j=0; + j=0, j1=0; j=nbocc(model,'+'); + j1=nbocc(model,'*'); cptcovn=j+1; strcpy(modelsav,model); if (j==0) { - cutv(stra,strb,modelsav,'V'); Tvar[1]=atoi(strb); + if (j1==0){ + cutv(stra,strb,modelsav,'V'); + Tvar[1]=atoi(strb); + } + else if (j1==1) { + cutv(stra,strb,modelsav,'*'); + /* printf("stra=%s strb=%s modelsav=%s ",stra,strb,modelsav);*/ + Tage[1]=1; cptcovage++; + if (strcmp(stra,"age")==0) { + cutv(strd,strc,strb,'V'); + Tvar[1]=atoi(strc); + } + else if (strcmp(strb,"age")==0) { + cutv(strd,strc,stra,'V'); + Tvar[1]=atoi(strc); + } + else {printf("Error"); exit(0);} + } } else { for(i=j; i>=1;i--){ cutv(stra,strb,modelsav,'+'); + /*printf("%s %s %s\n", stra,strb,modelsav);*/ if (strchr(strb,'*')) { cutv(strd,strc,strb,'*'); - cutv(strb,stre,strc,'V');Tvar[i+1]=ncov+1; - cutv(strb,strc,strd,'V'); - for (k=1; k<=lastobs;k++) - covar[ncov+1][k]=covar[atoi(stre)][k]*covar[atoi(strc)][k]; + if (strcmp(strc,"age")==0) { + cutv(strb,stre,strd,'V'); + Tvar[i+1]=atoi(stre); + cptcovage++; + Tage[cptcovage]=i+1; + printf("stre=%s ", stre); + } + else if (strcmp(strd,"age")==0) { + cutv(strb,stre,strc,'V'); + Tvar[i+1]=atoi(stre); + cptcovage++; + Tage[cptcovage]=i+1; + } + else { + cutv(strb,stre,strc,'V'); + Tvar[i+1]=ncov+1; + cutv(strb,strc,strd,'V'); + for (k=1; k<=lastobs;k++) + covar[ncov+1][k]=covar[atoi(stre)][k]*covar[atoi(strc)][k]; + } } - else {cutv(strd,strc,strb,'V'); + else { + cutv(strd,strc,strb,'V'); + /* printf("%s %s %s", strd,strc,strb);*/ + Tvar[i+1]=atoi(strc); } strcpy(modelsav,stra); @@ -1881,10 +1927,12 @@ split(pathtot, path,optionfile); Tvar[1]=atoi(strc); } } - /*printf("tvar=%d ",Tvar[1]); - scanf("%d ",i);*/ + + /* printf("tvar=%d %d cptcovage=%d %d",Tvar[1],Tvar[2],cptcovage,Tage[1]); + scanf("%d ",i);*/ fclose(fic); + if(mle==1){ if (weightopt != 1) { /* Maximisation without weights*/ for(i=1;i<=n;i++) weight[i]=1.0; } @@ -1958,7 +2006,7 @@ printf("Total number of individuals= %d, concatwav(wav, dh, mw, s, agedc, agev, firstpass, lastpass, imx, nlstate, stepm); -Tcode=ivector(1,100); + Tcode=ivector(1,100); nbcode=imatrix(1,nvar,1,8); ncodemax[1]=1; if (cptcovn > 0) tricode(Tvar,nbcode,imx); @@ -1978,17 +2026,17 @@ Tcode=ivector(1,100); } } - /*for(i=1; i <=m ;i++){ + /* for(i=1; i <=m ;i++){ for(k=1; k <=cptcovn; k++){ printf("i=%d k=%d %d ",i,k,codtab[i][k]); } printf("\n"); - }*/ - /*scanf("%d",i);*/ + } + scanf("%d",i);*/ /* 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); pmmij= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */ oldms= matrix(1,nlstate+ndeath,1,nlstate+ndeath); /* creation */ @@ -2214,24 +2262,23 @@ fprintf(ficgp,"\nset out \"v%s%d%d.gif\" fprintf(ficgp," exp(p%d+p%d*x",i,i+1); for(j=3; j <=ncovmodel; j++) - fprintf(ficgp,"+p%d*%d",k2,nbcode[Tvar[j-2]][codtab[jk][j-2]]); + fprintf(ficgp,"+p%d*%d",i+j-1,nbcode[Tvar[j-2]][codtab[jk][j-2]]); fprintf(ficgp,")/(1"); - - for(k1=1; k1 <=nlstate+1; k1=k1+2){ - fprintf(ficgp,"+exp(p%d+p%d*x",k1+k3-1,k1+k3); - - for(j=3; j <=ncovmodel; j++) - fprintf(ficgp,"+p%d*%d",k2,nbcode[Tvar[j-2]][codtab[jk][j-2]]); - fprintf(ficgp,")"); + + for(k1=1; k1 <=nlstate; k1++){ + fprintf(ficgp,"+exp(p%d+p%d*x",k3+(k1-1)*ncovmodel,k3+(k1-1)*ncovmodel+1); + for(j=3; j <=ncovmodel; j++) + fprintf(ficgp,"+p%d*%d",k3+(k1-1)*ncovmodel+1+j-2,nbcode[Tvar[j-2]][codtab[jk][j-2]]); + fprintf(ficgp,")"); } fprintf(ficgp,") t \"p%d%d\" ", k2,k); if ((k+k2)!= (nlstate*2+ndeath)) fprintf(ficgp,","); - i=i+ncovmodel; + i=i+ncovmodel; } } } - fprintf(ficgp,"\nset out \"pe%s%d.gif\" \nreplot\n\n",strtok(optionfile, "."),jk); - } + fprintf(ficgp,"\nset out \"pe%s%d.gif\" \nreplot\n\n",strtok(optionfile, "."),jk); + } fclose(ficgp); @@ -2354,9 +2401,9 @@ fclose(fichtm); for(cptcod=1;cptcod<=ncodemax[cptcov];cptcod++){ k=k+1; /*printf("cptcov=%d cptcod=%d codtab=%d nbcode=%d\n",cptcov, cptcod,Tcode[cptcode],codtab[cptcod][cptcov]);*/ - fprintf(ficrespl,"\n#****** "); + fprintf(ficrespl,"\n#******"); for(j=1;j<=cptcovn;j++) - fprintf(ficrespl,"V%d=%d ",Tvar[j],nbcode[Tvar[j]][codtab[k][j]]); + fprintf(ficrespl," V%d=%d ",Tvar[j],nbcode[Tvar[j]][codtab[k][j]]); fprintf(ficrespl,"******\n"); for (age=agebase; age<=agelim; age++){