![](\"%s%s.png\")
![](\"varmuptjgr%s%s.png\")
![](\"%s%s.svg\")
![](\"varmuptjgr%s%s.svg\")
![](\"%s%d%1d%1d-%1d%1d.png\")
",subdirf2(optionfilefiname,"varpijgr"), j1,k1,l1,k2,l2);
+ :![](\"%s_%d%1d%1d-%1d%1d.svg\")
",subdirf2(optionfilefiname,"VARPIJGR_"), j1,k1,l1,k2,l2);
fprintf(fichtmcov,"\nResult files (first order: no variance)
\n \ - Observed prevalence in each state (during the period defined between %.lf/%.lf/%.lf and %.lf/%.lf/%.lf): %s\n ", - jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,subdirf2(fileres,"p"),subdirf2(fileres,"p")); + jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,subdirf2(fileresu,"P_"),subdirf2(fileresu,"P_")); fprintf(fichtm,"\ - Estimated transition probabilities over %d (stepm) months: %s
\n ", - stepm,subdirf2(fileres,"pij"),subdirf2(fileres,"pij")); + stepm,subdirf2(fileresu,"PIJ_"),subdirf2(fileresu,"PIJ_")); fprintf(fichtm,"\ - Period (stable) prevalence in each health state: %s
\n", - subdirf2(fileres,"pl"),subdirf2(fileres,"pl")); + subdirf2(fileresu,"PL_"),subdirf2(fileresu,"PL_")); fprintf(fichtm,"\ - (a) Life expectancies by health status at initial age, ei. (b) health expectancies by health status at initial age, eij . If one or more covariates are included, specific tables for each value of the covariate are output in sequences within the same file (estepm=%2d months): \ %s
\n", - estepm,subdirf2(fileres,"e"),subdirf2(fileres,"e")); + estepm,subdirf2(fileresu,"E_"),subdirf2(fileresu,"E_")); fprintf(fichtm,"\ - Population projections by age and states: \ - %s
\n
\n", subdirf2(fileresu,"F_"),subdirf2(fileresu,"F_")); fprintf(fichtm," \n
- Graphs
- Graphs
if (cptcovn > 0) {
fprintf(fichtm,"
************ Results for covariates"); for (cpt=1; cpt<=cptcoveff;cpt++){ - fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]); - printf(" V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]);fflush(stdout); + fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtabm(jj1,cpt)]); + printf(" V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtabm(jj1,cpt)]);fflush(stdout); } fprintf(fichtm," ************\n
"); } + /* aij, bij */ + fprintf(fichtm,"
- Logit model, for example: logit(pij)=log(pij/pii)= aij+ bij age + V1 age + etc. as a function of age: %s_%d-1.svg
\ +![](\"%s_%d-1.svg\")
",subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1);
/* Pij */
- fprintf(fichtm,"
- Pij or Conditional probabilities to be observed in state j being in state i, %d (stepm) months before: %s%d_1.png
\ -![](\"%s%d_1.png\")
",stepm,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1);
+ fprintf(fichtm,"
\n- Pij or Conditional probabilities to be observed in state j being in state i, %d (stepm) months before: %s_%d-2.svg
\ +![](\"%s_%d-2.svg\")
",stepm,subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1);
/* Quasi-incidences */
- fprintf(fichtm,"
- Pij or Conditional probabilities to be observed in state j being in state i %d (stepm) months\ - before but expressed in per year i.e. quasi incidences if stepm is small and probabilities too: %s%d_2.png
\ -![](\"%s%d_2.png\")
",stepm,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1,subdirf2(optionfilefiname,"pe"),jj1);
- /* Period (stable) prevalence in each health state */
- for(cpt=1; cpt<=nlstate;cpt++){
- fprintf(fichtm,"
- Convergence to period (stable) prevalence in state %d. Or probability to be in state %d being in state (1 to %d) at different ages. %s%d_%d.png
\ -![](\"%s%d_%d.png\")
", cpt, cpt, nlstate, subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1,subdirf2(optionfilefiname,"p"),cpt,jj1);
- }
+ fprintf(fichtm,"
\n- Iij or Conditional probabilities to be observed in state j being in state i %d (stepm) months\ + before but expressed in per year i.e. quasi incidences if stepm is small and probabilities too,\ + incidence (rates) are the limit when h tends to zero of the ratio of the probability hPij \ +divided by h: hPij/h : %s_%d-3.svg
\ +![](\"%s_%d-3.svg\")
",stepm,subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1,subdirf2(optionfilefiname,"PE_"),jj1);
+ /* Survival functions (period) in state j */
+ for(cpt=1; cpt<=nlstate;cpt++){
+ fprintf(fichtm,"
\n- Survival functions in state %d. Or probability to survive in state %d being in state (1 to %d) at different ages. %s%d_%d.svg
\ +![](\"%s_%d-%d.svg\")
", cpt, cpt, nlstate, subdirf2(optionfilefiname,"LIJ_"),cpt,jj1,subdirf2(optionfilefiname,"LIJ_"),cpt,jj1,subdirf2(optionfilefiname,"LIJ_"),cpt,jj1);
+ }
+ /* State specific survival functions (period) */
+ for(cpt=1; cpt<=nlstate;cpt++){
+ fprintf(fichtm,"
\n- Survival functions from state %d in any different live states and total.\ + Or probability to survive in various states (1 to %d) being in state %d at different ages.\ + %s%d_%d.svg
", cpt, nlstate, cpt, subdirf2(optionfilefiname,"LIJT_"),cpt,jj1,subdirf2(optionfilefiname,"LIJT_"),cpt,jj1,subdirf2(optionfilefiname,"LIJT_"),cpt,jj1);
+ }
+ /* Period (stable) prevalence in each health state */
+ for(cpt=1; cpt<=nlstate;cpt++){
+ fprintf(fichtm,"
\n- Convergence to period (stable) prevalence in state %d. Or probability to be in state %d being in state (1 to %d) at different ages. %s%d_%d.svg
\ +", cpt, cpt, nlstate, subdirf2(optionfilefiname,"P_"),cpt,jj1,subdirf2(optionfilefiname,"P_"),cpt,jj1,subdirf2(optionfilefiname,"P_"),cpt,jj1);
+ }
for(cpt=1; cpt<=nlstate;cpt++) {
- fprintf(fichtm,"\n
- Life expectancy by health state (%d) at initial age and its decomposition into health expectancies in each alive state (1 to %d) : %s%d%d.png
\ -![](\"%s%d%d.png\")
",cpt,nlstate,subdirf2(optionfilefiname,"exp"),cpt,jj1,subdirf2(optionfilefiname,"exp"),cpt,jj1,subdirf2(optionfilefiname,"exp"),cpt,jj1);
+ fprintf(fichtm,"\n
- Life expectancy by health state (%d) at initial age and its decomposition into health expectancies in each alive state (1 to %d) (or area under each survival functions): %s%d%d.svg
\ +![](\"%s_%d%d.svg\")
",cpt,nlstate,subdirf2(optionfilefiname,"EXP_"),cpt,jj1,subdirf2(optionfilefiname,"EXP_"),cpt,jj1,subdirf2(optionfilefiname,"EXP_"),cpt,jj1);
}
/* } /\* end i1 *\/ */
}/* End k1 */
@@ -4558,34 +4606,41 @@ fprintf(fichtm," \n- Graphs
fprintf(fichtm,"\
\n
Result files (second order: variances)
\n\ - Parameter file with estimated parameters and covariance matrix: %s
\ - - 95%% confidence intervals and T statistics are in the log file.
\n", rfileres,rfileres); + - 95%% confidence intervals and Wald tests of the estimated parameters are in the log file.
\ +But because parameters are usually highly correlated (a higher incidence of disability \ +and a higher incidence of recovery can give very close observed transition) it might \ +be very useful to look not only at linear confidence intervals estimated from the \ +variances but at the covariance matrix. And instead of looking at the estimated coefficients \ +(parameters) of the logistic regression, it might be more meaningful to visualize the \ +covariance matrix of the one-step probabilities. \ +See page 'Matrix of variance-covariance of one-step probabilities' below. \n", rfileres,rfileres); fprintf(fichtm," - Standard deviation of one-step probabilities: %s
\n", - subdirf2(fileres,"prob"),subdirf2(fileres,"prob")); + subdirf2(fileresu,"PROB_"),subdirf2(fileresu,"PROB_")); fprintf(fichtm,"\ - Variance-covariance of one-step probabilities: %s
\n", - subdirf2(fileres,"probcov"),subdirf2(fileres,"probcov")); + subdirf2(fileresu,"PROBCOV_"),subdirf2(fileresu,"PROBCOV_")); fprintf(fichtm,"\ - Correlation matrix of one-step probabilities: %s
\n", - subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor")); + subdirf2(fileresu,"PROBCOR_"),subdirf2(fileresu,"PROBCOR_")); fprintf(fichtm,"\ - Variances and covariances of health expectancies by age and initial health status (cov(eij,ekl)(estepm=%2d months): \ %s
\n ",
- estepm,subdirf2(fileres,"cve"),subdirf2(fileres,"cve"));
+ estepm,subdirf2(fileresu,"CVE_"),subdirf2(fileresu,"CVE_"));
fprintf(fichtm,"\
- (a) Health expectancies by health status at initial age (eij) and standard errors (in parentheses) (b) life expectancies and standard errors (ei.=ei1+ei2+...)(estepm=%2d months): \
%s
\n ",
- estepm,subdirf2(fileres,"stde"),subdirf2(fileres,"stde"));
+ estepm,subdirf2(fileresu,"STDE_"),subdirf2(fileresu,"STDE_"));
fprintf(fichtm,"\
- Variances and covariances of health expectancies by age. Status (i) based health expectancies (in state j), eij are weighted by the period prevalences in each state i (if popbased=1, an additional computation is done using the cross-sectional prevalences, i.e population based) (estepm=%d months): %s - Graphs
fprintf(fichtm,"\
\n
- Graphs
if (cptcovn > 0) {
fprintf(fichtm,"
************ Results for covariates"); for (cpt=1; cpt<=cptcoveff;cpt++) - fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtab[jj1][cpt]]); + fprintf(fichtm," V%d=%d ",Tvaraff[cpt],nbcode[Tvaraff[cpt]][codtabm(jj1,cpt)]); fprintf(fichtm," ************\n
"); } for(cpt=1; cpt<=nlstate;cpt++) { fprintf(fichtm,"
- Observed (cross-sectional) and period (incidence based) \ -prevalence (with 95%% confidence interval) in state (%d): %s%d_%d.png
\ -",cpt,subdirf2(optionfilefiname,"v"),cpt,jj1,subdirf2(optionfilefiname,"v"),cpt,jj1);
+prevalence (with 95%% confidence interval) in state (%d): %s%d_%d.svg
\ +",cpt,subdirf2(optionfilefiname,"V_"),cpt,jj1,subdirf2(optionfilefiname,"V_"),cpt,jj1);
}
fprintf(fichtm,"\n
- Total life expectancy by age and \ health expectancies in states (1) and (2). If popbased=1 the smooth (due to the model) \ true period expectancies (those weighted with period prevalences are also\ drawn in addition to the population based expectancies computed using\ - observed and cahotic prevalences: %s%d.png
\ -![](\"%s%d.png\")
",subdirf2(optionfilefiname,"e"),jj1,subdirf2(optionfilefiname,"e"),jj1);
+ observed and cahotic prevalences: %s_%d.svg
\ +![](\"%s_%d.svg\")
",subdirf2(optionfilefiname,"E_"),jj1,subdirf2(optionfilefiname,"E_"),jj1);
/* } /\* end i1 *\/ */
}/* End k1 */
fprintf(fichtm," Life table
\n
"); @@ -5415,7 +5569,7 @@ fprintf(fichtm,"Life table=1;k--) /**< Number of covariates */ @@ -6128,8 +6282,8 @@ int prevalence_limit(double *p, double * double ftolpl = 1.e-10; double age, agebase, agelim; - strcpy(filerespl,"pl"); - strcat(filerespl,fileres); + strcpy(filerespl,"PL_"); + strcat(filerespl,fileresu); if((ficrespl=fopen(filerespl,"w"))==NULL) { printf("Problem with period (stable) prevalence resultfile: %s\n", filerespl);return 1; fprintf(ficlog,"Problem with period (stable) prevalence resultfile: %s\n", filerespl);return 1; @@ -6155,14 +6309,14 @@ int prevalence_limit(double *p, double * //for(cptcod=1;cptcod<=ncodemax[cptcov];cptcod++){ k=k+1; /* to clean */ - //printf("cptcov=%d cptcod=%d codtab=%d\n",cptcov, cptcod,codtab[cptcod][cptcov]); - fprintf(ficrespl,"\n#******"); - printf("\n#******"); - fprintf(ficlog,"\n#******"); + //printf("cptcov=%d cptcod=%d codtab=%d\n",cptcov, cptcod,codtabm(cptcod,cptcov)); + fprintf(ficrespl,"#******"); + printf("#******"); + fprintf(ficlog,"#******"); for(j=1;j<=cptcoveff;j++) { - fprintf(ficrespl," V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); - printf(" V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); - fprintf(ficlog," V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficrespl," V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); + printf(" V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); + fprintf(ficlog," V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); } fprintf(ficrespl,"******\n"); printf("******\n"); @@ -6170,7 +6324,7 @@ int prevalence_limit(double *p, double * fprintf(ficrespl,"#Age "); for(j=1;j<=cptcoveff;j++) { - fprintf(ficrespl,"V%d %d",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficrespl,"V%d %d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); } for(i=1; i<=nlstate;i++) fprintf(ficrespl,"%d-%d ",i,i); fprintf(ficrespl,"\n"); @@ -6180,7 +6334,7 @@ int prevalence_limit(double *p, double * prevalim(prlim, nlstate, p, age, oldm, savm,ftolpl,k); fprintf(ficrespl,"%.0f ",age ); for(j=1;j<=cptcoveff;j++) - fprintf(ficrespl,"%d %d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficrespl,"%d %d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); for(i=1; i<=nlstate;i++) fprintf(ficrespl," %.5f", prlim[i][i]); fprintf(ficrespl,"\n"); @@ -6202,7 +6356,7 @@ int hPijx(double *p, int bage, int fage) double agedeb; double ***p3mat; - strcpy(filerespij,"pij"); strcat(filerespij,fileres); + strcpy(filerespij,"PIJ_"); strcat(filerespij,fileresu); if((ficrespij=fopen(filerespij,"w"))==NULL) { printf("Problem with Pij resultfile: %s\n", filerespij); return 1; fprintf(ficlog,"Problem with Pij resultfile: %s\n", filerespij); return 1; @@ -6227,7 +6381,7 @@ int hPijx(double *p, int bage, int fage) for (k=1; k <= (int) pow(2,cptcoveff); k++){ fprintf(ficrespij,"\n#****** "); for(j=1;j<=cptcoveff;j++) - fprintf(ficrespij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficrespij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); fprintf(ficrespij,"******\n"); for (agedeb=fage; agedeb>=bage; agedeb--){ /* If stepm=6 months */ @@ -6279,6 +6433,7 @@ int main(int argc, char *argv[]) int jj, ll, li, lj, lk; int numlinepar=0; /* Current linenumber of parameter file */ + int num_filled; int itimes; int NDIM=2; int vpopbased=0; @@ -6297,7 +6452,9 @@ int main(int argc, char *argv[]) double ***mobaverage; char line[MAXLINE]; - char path[MAXLINE],pathc[MAXLINE],pathcd[MAXLINE],pathtot[MAXLINE],model[MAXLINE]; + char path[MAXLINE],pathc[MAXLINE],pathcd[MAXLINE],pathtot[MAXLINE]; + + char model[MAXLINE], modeltemp[MAXLINE]; char pathr[MAXLINE], pathimach[MAXLINE]; char *tok, *val; /* pathtot */ int firstobs=1, lastobs=10; @@ -6441,7 +6598,7 @@ int main(int argc, char *argv[]) goto end; } fprintf(ficlog,"Log filename:%s\n",filelog); - fprintf(ficlog,"\n%s\n%s",version,fullversion); + fprintf(ficlog,"Version %s %s",version,fullversion); fprintf(ficlog,"\nEnter the parameter file name: \n"); fprintf(ficlog,"pathimach=%s\npathtot=%s\n\ path=%s \n\ @@ -6449,7 +6606,7 @@ int main(int argc, char *argv[]) optionfilext=%s\n\ optionfilefiname='%s'\n",pathimach,pathtot,path,optionfile,optionfilext,optionfilefiname); - syscompilerinfo(0); + syscompilerinfo(1); printf("Local time (at start):%s",strstart); fprintf(ficlog,"Local time (at start): %s",strstart); @@ -6460,7 +6617,9 @@ int main(int argc, char *argv[]) /* */ strcpy(fileres,"r"); strcat(fileres, optionfilefiname); + strcat(fileresu, optionfilefiname); /* Without r in front */ strcat(fileres,".txt"); /* Other files have txt extension */ + strcat(fileresu,".txt"); /* Other files have txt extension */ /* Main ---------arguments file --------*/ @@ -6475,7 +6634,7 @@ int main(int argc, char *argv[]) strcpy(filereso,"o"); - strcat(filereso,fileres); + strcat(filereso,fileresu); if((ficparo=fopen(filereso,"w"))==NULL) { /* opened on subdirectory */ printf("Problem with Output resultfile: %s\n", filereso); fprintf(ficlog,"Problem with Output resultfile: %s\n", filereso); @@ -6485,23 +6644,84 @@ int main(int argc, char *argv[]) /* Reads comments: lines beginning with '#' */ numlinepar=0; - while((c=getc(ficpar))=='#' && c!= EOF){ - ungetc(c,ficpar); - fgets(line, MAXLINE, ficpar); + + /* First parameter line */ + while(fgets(line, MAXLINE, ficpar)) { + /* If line starts with a # it is a comment */ + if (line[0] == '#') { + numlinepar++; + fputs(line,stdout); + fputs(line,ficparo); + fputs(line,ficlog); + continue; + }else + break; + } + if((num_filled=sscanf(line,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\n", \ + title, datafile, &lastobs, &firstpass,&lastpass)) !=EOF){ + if (num_filled != 5) { + printf("Should be 5 parameters\n"); + } numlinepar++; - fputs(line,stdout); - fputs(line,ficparo); - fputs(line,ficlog); + printf("title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\n", title, datafile, lastobs, firstpass,lastpass); + } + /* Second parameter line */ + while(fgets(line, MAXLINE, ficpar)) { + /* If line starts with a # it is a comment */ + if (line[0] == '#') { + numlinepar++; + fputs(line,stdout); + fputs(line,ficparo); + fputs(line,ficlog); + continue; + }else + break; + } + if((num_filled=sscanf(line,"ftol=%lf stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\n", \ + &ftol, &stepm, &ncovcol, &nlstate, &ndeath, &maxwav, &mle, &weightopt)) !=EOF){ + if (num_filled != 8) { + printf("Not 8\n"); + } + printf("ftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\n",ftol, stepm, ncovcol, nlstate,ndeath, maxwav, mle, weightopt); } - ungetc(c,ficpar); - fscanf(ficpar,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%lf stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d model=1+age+%s\n",title, datafile, &lastobs, &firstpass,&lastpass,&ftol, &stepm, &ncovcol, &nlstate,&ndeath, &maxwav, &mle, &weightopt,model); - numlinepar=numlinepar+3; /* In general */ - printf("title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s\n", title, datafile, lastobs, firstpass,lastpass,ftol, stepm, ncovcol, nlstate,ndeath, maxwav, mle, weightopt,model); + /* Third parameter line */ + while(fgets(line, MAXLINE, ficpar)) { + /* If line starts with a # it is a comment */ + if (line[0] == '#') { + numlinepar++; + fputs(line,stdout); + fputs(line,ficparo); + fputs(line,ficlog); + continue; + }else + break; + } + if((num_filled=sscanf(line,"model=1+age%[^.\n]", model)) !=EOF){ + if (num_filled == 0) + model[0]='\0'; + else if (num_filled != 1){ + printf("ERROR %d: Model should be at minimum 'model=1+age.' %s\n",num_filled, line); + fprintf(ficlog,"ERROR %d: Model should be at minimum 'model=1+age.' %s\n",num_filled, line); + model[0]='\0'; + goto end; + } + else{ + if (model[0]=='+'){ + for(i=1; i<=strlen(model);i++) + modeltemp[i-1]=model[i]; + strcpy(model,modeltemp); + } + } + /* printf(" model=1+age%s modeltemp= %s, model=%s\n",model, modeltemp, model);fflush(stdout); */ + } + /* fscanf(ficpar,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%lf stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d model=1+age+%s\n",title, datafile, &lastobs, &firstpass,&lastpass,&ftol, &stepm, &ncovcol, &nlstate,&ndeath, &maxwav, &mle, &weightopt,model); */ + /* numlinepar=numlinepar+3; /\* In general *\/ */ + /* printf("title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s\n", title, datafile, lastobs, firstpass,lastpass,ftol, stepm, ncovcol, nlstate,ndeath, maxwav, mle, weightopt,model); */ if(model[strlen(model)-1]=='.') /* Suppressing leading dot in the model */ model[strlen(model)-1]='\0'; - fprintf(ficparo,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model); - fprintf(ficlog,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model); + fprintf(ficparo,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model); + fprintf(ficlog,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model); fflush(ficlog); /* if(model[0]=='#'|| model[0]== '\0'){ */ if(model[0]=='#'){ @@ -6725,8 +6945,8 @@ Please run with mle=-1 to get a correct strcat(rfileres,"."); /* */ strcat(rfileres,optionfilext); /* Other files have txt extension */ if((ficres =fopen(rfileres,"w"))==NULL) { - printf("Problem writing new parameter file: %s\n", fileres);goto end; - fprintf(ficlog,"Problem writing new parameter file: %s\n", fileres);goto end; + printf("Problem writing new parameter file: %s\n", rfileres);goto end; + fprintf(ficlog,"Problem writing new parameter file: %s\n", rfileres);goto end; } fprintf(ficres,"#%s\n",version); } /* End of mle != -3 */ @@ -6836,8 +7056,8 @@ Please run with mle=-1 to get a correct V2+V1*age, there are 3 covariates Tvar[2]=1 (V1).*/ /* 1 to ncodemax[j] is the maximum value of this jth covariate */ - codtab=imatrix(1,100,1,10); /* codtab[h,k]=( (h-1) - mod(k-1,2**(k-1) )/2**(k-1) */ - /*printf(" codtab[1,1],codtab[100,10]=%d,%d\n", codtab[1][1],codtab[100][10]);*/ + /* codtab=imatrix(1,100,1,10);*/ /* codtab[h,k]=( (h-1) - mod(k-1,2**(k-1) )/2**(k-1) */ + /*printf(" codtab[1,1],codtab[100,10]=%d,%d\n", codtab[1][1],codtabm(100,10));*/ /* codtab gives the value 1 or 2 of the hth combination of k covariates (1 or 2).*/ h=0; @@ -6847,13 +7067,6 @@ Please run with mle=-1 to get a correct m=pow(2,cptcoveff); - for(k=1;k<=cptcoveff; k++){ /* scans any effective covariate */ - for(i=1; i <=pow(2,cptcoveff-k);i++){ /* i=1 to 8/1=8; i=1 to 8/2=4; i=1 to 8/8=1 */ - for(j=1; j <= ncodemax[k]; j++){ /* For each modality of this covariate ncodemax=2*/ - for(cpt=1; cpt <=pow(2,k-1); cpt++){ /* cpt=1 to 8/2**(3+1-1 or 3+1-3) =1 or 4 */ - h++; - if (h>m) - h=1; /**< codtab(h,k) k = codtab[h,k]=( (h-1) - mod(k-1,2**(k-1) )/2**(k-1) + 1 * For k=4 covariates, h goes from 1 to 2**k * codtabm(h,k)= 1 & (h-1) >> (k-1) ; @@ -6867,32 +7080,47 @@ Please run with mle=-1 to get a correct * 6 2 1 2 1 * 7 i=4 1 2 2 1 * 8 2 2 2 1 - * 9 i=5 1 i=3 1 i=2 1 1 - * 10 2 1 1 1 - * 11 i=6 1 2 1 1 - * 12 2 2 1 1 - * 13 i=7 1 i=4 1 2 1 - * 14 2 1 2 1 - * 15 i=8 1 2 2 1 - * 16 2 2 2 1 + * 9 i=5 1 i=3 1 i=2 1 2 + * 10 2 1 1 2 + * 11 i=6 1 2 1 2 + * 12 2 2 1 2 + * 13 i=7 1 i=4 1 2 2 + * 14 2 1 2 2 + * 15 i=8 1 2 2 2 + * 16 2 2 2 2 */ - codtab[h][k]=j; - /* codtab[12][3]=1; */ - /*codtab[h][Tvar[k]]=j;*/ - 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]]); - } - } - } - } + for(h=1; h <=100 ;h++){ + /* printf("h=%2d ", h); */ + /* for(k=1; k <=10; k++){ */ + /* printf("k=%d %d ",k,codtabm(h,k)); */ + /* codtab[h][k]=codtabm(h,k); */ + /* } */ + /* printf("\n"); */ + } + /* for(k=1;k<=cptcoveff; k++){ /\* scans any effective covariate *\/ */ + /* for(i=1; i <=pow(2,cptcoveff-k);i++){ /\* i=1 to 8/1=8; i=1 to 8/2=4; i=1 to 8/8=1 *\/ */ + /* for(j=1; j <= ncodemax[k]; j++){ /\* For each modality of this covariate ncodemax=2*\/ */ + /* for(cpt=1; cpt <=pow(2,k-1); cpt++){ /\* cpt=1 to 8/2**(3+1-1 or 3+1-3) =1 or 4 *\/ */ + /* h++; */ + /* if (h>m) */ + /* h=1; */ + /* codtab[h][k]=j; */ + /* /\* codtab[12][3]=1; *\/ */ + /* /\*codtab[h][Tvar[k]]=j;*\/ */ + /* /\* 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]]); *\/ */ + /* } */ + /* } */ + /* } */ + /* } */ /* printf("codtab[1][2]=%d codtab[2][2]=%d",codtab[1][2],codtab[2][2]); codtab[1][2]=1;codtab[2][2]=2; */ - /* for(i=1; i <=m ;i++){ - for(k=1; k <=cptcovn; k++){ - printf("i=%d k=%d %d %d ",i,k,codtab[i][k], cptcoveff); - } - printf("\n"); - } - scanf("%d",i);*/ + /* for(i=1; i <=m ;i++){ */ + /* for(k=1; k <=cptcovn; k++){ */ + /* printf("i=%d k=%d %d %d ",i,k,codtab[i][k], cptcoveff); */ + /* } */ + /* printf("\n"); */ + /* } */ + /* scanf("%d",i);*/ free_ivector(Ndum,-1,NCOVMAX); @@ -6901,7 +7129,7 @@ Please run with mle=-1 to get a correct /* Initialisation of ----------- gnuplot -------------*/ strcpy(optionfilegnuplot,optionfilefiname); if(mle==-3) - strcat(optionfilegnuplot,"-mort"); + strcat(optionfilegnuplot,"-MORT_"); strcat(optionfilegnuplot,".gp"); if((ficgp=fopen(optionfilegnuplot,"w"))==NULL) { @@ -6920,7 +7148,7 @@ Please run with mle=-1 to get a correct strcpy(optionfilehtm,optionfilefiname); /* Main html file */ if(mle==-3) - strcat(optionfilehtm,"-mort"); + strcat(optionfilehtm,"-MORT_"); strcat(optionfilehtm,".htm"); if((fichtm=fopen(optionfilehtm,"w"))==NULL) { printf("Problem with %s \n",optionfilehtm); @@ -7036,8 +7264,8 @@ Interval (in months) between two waves: #else printf("Powell\n"); fprintf(ficlog,"Powell\n"); #endif - strcpy(filerespow,"pow-mort"); - strcat(filerespow,fileres); + strcpy(filerespow,"POW-MORT_"); + strcat(filerespow,fileresu); if((ficrespow=fopen(filerespow,"w"))==NULL) { printf("Problem with resultfile: %s\n", filerespow); fprintf(ficlog,"Problem with resultfile: %s\n", filerespow); @@ -7191,8 +7419,8 @@ Please run with mle=-1 to get a correct This is probably because your parameter file doesn't \n contain the exact number of lines (or columns) corresponding to your model line.\n\ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpar); }else - printinggnuplotmort(fileres, optionfilefiname,ageminpar,agemaxpar,fage, pathc,p); - printinghtmlmort(fileres,title,datafile, firstpass, lastpass, \ + printinggnuplotmort(fileresu, optionfilefiname,ageminpar,agemaxpar,fage, pathc,p); + printinghtmlmort(fileresu,title,datafile, firstpass, lastpass, \ stepm, weightopt,\ model,imx,p,matcov,agemortsup); @@ -7255,16 +7483,16 @@ Please run with mle=-1 to get a correct ftolhess=ftol; /* Usually correct */ hesscov(matcov, p, npar, delti, ftolhess, func); } - printf("Parameters and 95%% confidence intervals\n"); - fprintf(ficlog, "Parameters, T and confidence intervals\n"); + printf("Parameters and 95%% confidence intervals\n W is simply the result of the division of the parameter by the square root of covariance of the parameter.\n And Wald-based confidence intervals plus and minus 1.96 * W .\n But be careful that parameters are highly correlated because incidence of disability is highly correlated to incidence of recovery.\n It might be better to visualize the covariance matrix. See the page 'Matrix of variance-covariance of one-step probabilities' and its graphs.\n"); + fprintf(ficlog, "Parameters, Wald tests and Wald-based confidence intervals\n W is simply the result of the division of the parameter by the square root of covariance of the parameter.\n And Wald-based confidence intervals plus and minus 1.96 * W \n It might be better to visualize the covariance matrix. See the page 'Matrix of variance-covariance of one-step probabilities' and its graphs.\n"); for(i=1,jk=1; i <=nlstate; i++){ for(k=1; k <=(nlstate+ndeath); k++){ if (k != i) { printf("%d%d ",i,k); fprintf(ficlog,"%d%d ",i,k); for(j=1; j <=ncovmodel; j++){ - printf("%12.7f T=%8.3f CI=[%12.7f ; %12.7f] ",p[jk], p[jk]/sqrt(matcov[jk][jk]), p[jk]-2*sqrt(matcov[jk][jk]),p[jk]+2*sqrt(matcov[jk][jk])); - fprintf(ficlog,"%12.7f T=%8.3f CI=[%12.7f ; %12.7f] ",p[jk], p[jk]/sqrt(matcov[jk][jk]), p[jk]-2*sqrt(matcov[jk][jk]),p[jk]+2*sqrt(matcov[jk][jk])); + printf("%12.7f W=%8.3f CI=[%12.7f ; %12.7f] ",p[jk], p[jk]/sqrt(matcov[jk][jk]), p[jk]-1.96*sqrt(matcov[jk][jk]),p[jk]+1.96*sqrt(matcov[jk][jk])); + fprintf(ficlog,"%12.7f W=%8.3f CI=[%12.7f ; %12.7f] ",p[jk], p[jk]/sqrt(matcov[jk][jk]), p[jk]-1.96*sqrt(matcov[jk][jk]),p[jk]+1.96*sqrt(matcov[jk][jk])); jk++; } printf("\n"); @@ -7462,9 +7690,9 @@ Please run with mle=-1 to get a correct This is probably because your parameter file doesn't \n contain the exact number of lines (or columns) corresponding to your model line.\n\ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpar); }else - printinggnuplot(fileres, optionfilefiname,ageminpar,agemaxpar,fage, pathc,p); + printinggnuplot(fileresu, optionfilefiname,ageminpar,agemaxpar,fage, pathc,p); - printinghtml(fileres,title,datafile, firstpass, lastpass, stepm, weightopt,\ + printinghtml(fileresu,title,datafile, firstpass, lastpass, stepm, weightopt,\ model,imx,jmin,jmax,jmean,rfileres,popforecast,estepm,\ jprev1,mprev1,anprev1,jprev2,mprev2,anprev2); @@ -7516,7 +7744,7 @@ Please run with mle=-1 to get a correct /*if((stepm == 1) && (strcmp(model,".")==0)){*/ if(prevfcast==1){ /* if(stepm ==1){*/ - prevforecast(fileres, anproj1, mproj1, jproj1, agemin, agemax, dateprev1, dateprev2, mobilavproj, bage, fage, firstpass, lastpass, anproj2, p, cptcoveff); + prevforecast(fileresu, anproj1, mproj1, jproj1, agemin, agemax, dateprev1, dateprev2, mobilavproj, bage, fage, firstpass, lastpass, anproj2, p, cptcoveff); /* (popforecast==1) populforecast(fileres, anpyram,mpyram,jpyram, agemin,agemax, dateprev1, dateprev2,mobilav, agedeb, fage, popforecast, popfile, anpyram1,p, i1);*/ /* } */ /* else{ */ @@ -7546,8 +7774,8 @@ Please run with mle=-1 to get a correct /*---------- Health expectancies, no variances ------------*/ - strcpy(filerese,"e"); - strcat(filerese,fileres); + strcpy(filerese,"E_"); + strcat(filerese,fileresu); if((ficreseij=fopen(filerese,"w"))==NULL) { printf("Problem with Health Exp. resultfile: %s\n", filerese); exit(0); fprintf(ficlog,"Problem with Health Exp. resultfile: %s\n", filerese); exit(0); @@ -7560,7 +7788,7 @@ Please run with mle=-1 to get a correct for (k=1; k <= (int) pow(2,cptcoveff); k++){ fprintf(ficreseij,"\n#****** "); for(j=1;j<=cptcoveff;j++) { - fprintf(ficreseij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficreseij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); } fprintf(ficreseij,"******\n"); @@ -7577,8 +7805,8 @@ Please run with mle=-1 to get a correct /*---------- Health expectancies and variances ------------*/ - strcpy(filerest,"t"); - strcat(filerest,fileres); + strcpy(filerest,"T_"); + strcat(filerest,fileresu); if((ficrest=fopen(filerest,"w"))==NULL) { printf("Problem with total LE resultfile: %s\n", filerest);goto end; fprintf(ficlog,"Problem with total LE resultfile: %s\n", filerest);goto end; @@ -7587,8 +7815,8 @@ Please run with mle=-1 to get a correct fprintf(ficlog,"Computing Total Life expectancies with their standard errors: file '%s' \n", filerest); - strcpy(fileresstde,"stde"); - strcat(fileresstde,fileres); + strcpy(fileresstde,"STDE_"); + strcat(fileresstde,fileresu); if((ficresstdeij=fopen(fileresstde,"w"))==NULL) { printf("Problem with Health Exp. and std errors resultfile: %s\n", fileresstde); exit(0); fprintf(ficlog,"Problem with Health Exp. and std errors resultfile: %s\n", fileresstde); exit(0); @@ -7596,8 +7824,8 @@ Please run with mle=-1 to get a correct printf("Computing Health Expectancies and standard errors: result on file '%s' \n", fileresstde); fprintf(ficlog,"Computing Health Expectancies and standard errors: result on file '%s' \n", fileresstde); - strcpy(filerescve,"cve"); - strcat(filerescve,fileres); + strcpy(filerescve,"CVE_"); + strcat(filerescve,fileresu); if((ficrescveij=fopen(filerescve,"w"))==NULL) { printf("Problem with Covar. Health Exp. resultfile: %s\n", filerescve); exit(0); fprintf(ficlog,"Problem with Covar. Health Exp. resultfile: %s\n", filerescve); exit(0); @@ -7605,8 +7833,8 @@ Please run with mle=-1 to get a correct printf("Computing Covar. of Health Expectancies: result on file '%s' \n", filerescve); fprintf(ficlog,"Computing Covar. of Health Expectancies: result on file '%s' \n", filerescve); - strcpy(fileresv,"v"); - strcat(fileresv,fileres); + strcpy(fileresv,"V_"); + strcat(fileresv,fileresu); if((ficresvij=fopen(fileresv,"w"))==NULL) { printf("Problem with variance resultfile: %s\n", fileresv);exit(0); fprintf(ficlog,"Problem with variance resultfile: %s\n", fileresv);exit(0); @@ -7620,21 +7848,21 @@ Please run with mle=-1 to get a correct for (k=1; k <= (int) pow(2,cptcoveff); k++){ fprintf(ficrest,"\n#****** "); for(j=1;j<=cptcoveff;j++) - fprintf(ficrest,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficrest,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); fprintf(ficrest,"******\n"); fprintf(ficresstdeij,"\n#****** "); fprintf(ficrescveij,"\n#****** "); for(j=1;j<=cptcoveff;j++) { - fprintf(ficresstdeij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); - fprintf(ficrescveij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficresstdeij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); + fprintf(ficrescveij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); } fprintf(ficresstdeij,"******\n"); fprintf(ficrescveij,"******\n"); fprintf(ficresvij,"\n#****** "); for(j=1;j<=cptcoveff;j++) - fprintf(ficresvij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficresvij,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); fprintf(ficresvij,"******\n"); eij=ma3x(1,nlstate,1,nlstate,(int) bage, (int) fage); @@ -7649,7 +7877,7 @@ Please run with mle=-1 to get a correct for(vpopbased=0; vpopbased <= popbased; vpopbased++){ /* Done for vpopbased=0 and vpopbased=1 if popbased==1*/ - oldm=oldms;savm=savms; /* Segmentation fault */ + oldm=oldms;savm=savms; /* ZZ Segmentation fault */ cptcod= 0; /* To be deleted */ varevsij(optionfilefiname, vareij, matcov, p, delti, nlstate, stepm, (int) bage, (int) fage, oldm, savm, prlim, ftolpl,k, estepm, cptcov,cptcod,vpopbased,mobilav, strstart); /* cptcod not initialized Intel */ fprintf(ficrest,"# Total life expectancy with std error and decomposition into time to be expected in each health state\n# (weighted average of eij where weights are "); @@ -7657,13 +7885,13 @@ Please run with mle=-1 to get a correct fprintf(ficrest,"the age specific prevalence observed (cross-sectionally) in the population i.e cross-sectionally\n in each health state (popbased=1) (mobilav=%d)\n",mobilav); else fprintf(ficrest,"the age specific period (stable) prevalences in each health state \n"); - fprintf(ficrest,"# Age e.. (std) "); + fprintf(ficrest,"# Age popbased mobilav e.. (std) "); for (i=1;i<=nlstate;i++) fprintf(ficrest,"e.%d (std) ",i); fprintf(ficrest,"\n"); - + /* printf("Which p?\n"); for(i=1;i<=npar;i++)printf("p[i=%d]=%lf,",i,p[i]);printf("\n"); */ epj=vector(1,nlstate+1); for(age=bage; age <=fage ;age++){ - prevalim(prlim, nlstate, p, age, oldm, savm,ftolpl,k); + prevalim(prlim, nlstate, p, age, oldm, savm,ftolpl,k); /*ZZ Is it the correct prevalim */ if (vpopbased==1) { if(mobilav ==0){ for(i=1; i<=nlstate;i++) @@ -7674,14 +7902,17 @@ Please run with mle=-1 to get a correct } } - fprintf(ficrest," %4.0f",age); + fprintf(ficrest," %4.0f %d %d",age, vpopbased, mobilav); + /* printf(" age %4.0f ",age); */ for(j=1, epj[nlstate+1]=0.;j <=nlstate;j++){ for(i=1, epj[j]=0.;i <=nlstate;i++) { epj[j] += prlim[i][i]*eij[i][j][(int)age]; - /* printf("%lf %lf ", prlim[i][i] ,eij[i][j][(int)age]);*/ + /*ZZZ printf("%lf %lf ", prlim[i][i] ,eij[i][j][(int)age]);*/ + /* printf("%lf %lf ", prlim[i][i] ,eij[i][j][(int)age]); */ } epj[nlstate+1] +=epj[j]; } + /* printf(" age %4.0f \n",age); */ for(i=1, vepp=0.;i <=nlstate;i++) for(j=1;j <=nlstate;j++) @@ -7713,8 +7944,8 @@ Please run with mle=-1 to get a correct /*------- Variance of period (stable) prevalence------*/ - strcpy(fileresvpl,"vpl"); - strcat(fileresvpl,fileres); + strcpy(fileresvpl,"VPL_"); + strcat(fileresvpl,fileresu); if((ficresvpl=fopen(fileresvpl,"w"))==NULL) { printf("Problem with variance of period (stable) prevalence resultfile: %s\n", fileresvpl); exit(0); @@ -7727,7 +7958,7 @@ Please run with mle=-1 to get a correct for (k=1; k <= (int) pow(2,cptcoveff); k++){ fprintf(ficresvpl,"\n#****** "); for(j=1;j<=cptcoveff;j++) - fprintf(ficresvpl,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtab[k][j]]); + fprintf(ficresvpl,"V%d=%d ",Tvaraff[j],nbcode[Tvaraff[j]][codtabm(k,j)]); fprintf(ficresvpl,"******\n"); varpl=matrix(1,nlstate,(int) bage, (int) fage); @@ -7764,7 +7995,7 @@ Please run with mle=-1 to get a correct free_ivector(Tage,1,NCOVMAX); free_imatrix(nbcode,0,NCOVMAX,0,NCOVMAX); - free_imatrix(codtab,1,100,1,10); + /* free_imatrix(codtab,1,100,1,10); */ fflush(fichtm); fflush(ficgp);
"); @@ -4530,26 +4562,42 @@ fprintf(fichtm," \n
![%s%d_%d.svg](\"%s%d_%d.svg\"){kind=link}
![%s%d%d.svg](\"%s%d%d.svg\"){kind=link}
\n", - estepm, subdirf2(fileres,"v"),subdirf2(fileres,"v")); + estepm, subdirf2(fileresu,"V_"),subdirf2(fileresu,"V_")); fprintf(fichtm,"\ - Total life expectancy and total health expectancies to be spent in each health state e.j with their standard errors (if popbased=1, an additional computation is done using the cross-sectional prevalences, i.e population based) (estepm=%d months): %s
\n", - estepm, subdirf2(fileres,"t"),subdirf2(fileres,"t")); + estepm, subdirf2(fileresu,"T_"),subdirf2(fileresu,"T_")); fprintf(fichtm,"\ - Standard deviation of period (stable) prevalences: %s
\n",\ - subdirf2(fileres,"vpl"),subdirf2(fileres,"vpl")); + subdirf2(fileresu,"VPL_"),subdirf2(fileresu,"VPL_")); /* if(popforecast==1) fprintf(fichtm,"\n */ /* - Prevalences forecasting: f%s
\n */ @@ -4606,20 +4661,20 @@ fprintf(fichtm," \n
",p[1],p[2],agegomp); for (i=1;i<=2;i++) fprintf(fichtm," p[%d] = %lf [%f ; %f]
\n",i,p[i],p[i]-2*sqrt(matcov[i][i]),p[i]+2*sqrt(matcov[i][i])); - fprintf(fichtm,"
![](\"graphmort.png\")
");
+ fprintf(fichtm,"![](\"graphmort.svg\")
");
fprintf(fichtm,"