imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.66 and 1.67

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

version 1.66, 2003/01/28 17:23:35	version 1.67, 2003/01/28 17:41:19
Line 2058 void varevsij(char optionfilefiname[], d	Line 2058 void varevsij(char optionfilefiname[], d
exit(0);	exit(0);
}	}
else{	else{
fprintf(fichtm,"\n<li><h4> Computing probabilities of dying as a weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");	fprintf(fichtm,"\n<li><h4> Computing probabilities of dying over estepm months as a weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");
fprintf(fichtm,"\n<br>%s (à revoir) <br>\n",digitp);	fprintf(fichtm,"\n<br>%s <br>\n",digitp);
}	}
varppt = matrix(nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);	varppt = matrix(nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);

Line 2267 void varevsij(char optionfilefiname[], d	Line 2267 void varevsij(char optionfilefiname[], d
fprintf(ficgp,"\nset noparametric;set nolabel; set ter png small;set size 0.65, 0.65");	fprintf(ficgp,"\nset noparametric;set nolabel; set ter png small;set size 0.65, 0.65");
/* for(j=nlstate+1; j<= nlstate+ndeath; j++){ // Only the first actually */	/* for(j=nlstate+1; j<= nlstate+ndeath; j++){ // Only the first actually */
fprintf(ficgp,"\n set log y; set nolog x;set xlabel \"Age\"; set ylabel \"Force of mortality (year-1)\";");	fprintf(ficgp,"\n set log y; set nolog x;set xlabel \"Age\"; set ylabel \"Force of mortality (year-1)\";");
fprintf(ficgp,"\n plot \"%s\" u 1:($3*%6.3f) not w l 1 ",fileresprobmorprev,YEARM/estepm);	/* fprintf(ficgp,"\n plot \"%s\" u 1:($3%6.3f) not w l 1 ",fileresprobmorprev,YEARM/estepm); /
fprintf(ficgp,"\n replot \"%s\" u 1:(($3+1.96$4)%6.3f) t \"95\%% interval\" w l 2 ",fileresprobmorprev,YEARM/estepm);	/* fprintf(ficgp,"\n replot \"%s\" u 1:(($3+1.96$4)%6.3f) t \"95\%% interval\" w l 2 ",fileresprobmorprev,YEARM/estepm); */
fprintf(ficgp,"\n replot \"%s\" u 1:(($3-1.96$4)%6.3f) not w l 2 ",fileresprobmorprev,YEARM/estepm);	/* fprintf(ficgp,"\n replot \"%s\" u 1:(($3-1.96$4)%6.3f) not w l 2 ",fileresprobmorprev,YEARM/estepm); */
	fprintf(ficgp,"\n plot \"%s\" u 1:($3) not w l 1 ",fileresprobmorprev);
	fprintf(ficgp,"\n replot \"%s\" u 1:(($3+1.96*$4)) t \"95\%% interval\" w l 2 ",fileresprobmorprev);
	fprintf(ficgp,"\n replot \"%s\" u 1:(($3-1.96*$4)) not w l 2 ",fileresprobmorprev);
fprintf(fichtm,"\n<br> File (multiple files are possible if covariates are present): <A href=\"%s\">%s</a>\n",fileresprobmorprev,fileresprobmorprev);	fprintf(fichtm,"\n<br> File (multiple files are possible if covariates are present): <A href=\"%s\">%s</a>\n",fileresprobmorprev,fileresprobmorprev);
fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months. <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", estepm,digitp,digit);	fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months. <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", estepm,digitp,digit);
/* fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months and then divided by estepm and multiplied by %.0f in order to have the probability to die over a year <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", stepm,YEARM,digitp,digit);	/* fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months and then divided by estepm and multiplied by %.0f in order to have the probability to die over a year <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", stepm,YEARM,digitp,digit);

Removed from v.1.66
changed lines
	Added in v.1.67