--- imach/src/imach.c 2023/05/22 17:03:18 1.355 +++ imach/src/imach.c 2023/05/23 12:08:43 1.356 @@ -1,6 +1,11 @@ -/* $Id: imach.c,v 1.355 2023/05/22 17:03:18 brouard Exp $ +/* $Id: imach.c,v 1.356 2023/05/23 12:08:43 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.356 2023/05/23 12:08:43 brouard + Summary: 0.99r46 + + * imach.c (Module): Fixed PROB_r + Revision 1.355 2023/05/22 17:03:18 brouard Summary: 0.99r46 @@ -1379,12 +1384,12 @@ double gnuplotversion=GNUPLOTVERSION; #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.355 2023/05/22 17:03:18 brouard Exp $ */ +/* $Id: imach.c,v 1.356 2023/05/23 12:08:43 brouard Exp $ */ /* $State: Exp $ */ #include "version.h" char version[]=__IMACH_VERSION__; char copyright[]="April 2023,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2020, Nihon University 2021-202, INED 2000-2022"; -char fullversion[]="$Revision: 1.355 $ $Date: 2023/05/22 17:03:18 $"; +char fullversion[]="$Revision: 1.356 $ $Date: 2023/05/23 12:08:43 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -7629,7 +7634,7 @@ void varprob(char optionfilefiname[], do double ***varpij; strcpy(fileresprob,"PROB_"); - strcat(fileresprob,fileres); + strcat(fileresprob,fileresu); if((ficresprob=fopen(fileresprob,"w"))==NULL) { printf("Problem with resultfile: %s\n", fileresprob); fprintf(ficlog,"Problem with resultfile: %s\n", fileresprob); @@ -8449,7 +8454,7 @@ void printinggnuplot(char fileresu[], ch kvar=Tvar[TvarFind[kf]]; /* variable name */ /* k=18+Tvar[TvarFind[kf]];/\*offset because there are 18 columns in the ILK_ file but could be placed else where *\/ */ /* k=18+kf;/\*offset because there are 18 columns in the ILK_ file *\/ */ - /* k=19+nlstate+kf;/\*offset because there are 19 columns in the ILK_ file *\/ */ + /* k=19+kf;/\*offset because there are 19 columns in the ILK_ file *\/ */ k=16+nlstate+kf;/*offset because there are 19 columns in the ILK_ file, first cov Vn on col 21 with 4 living states */ for (i=1; i<= nlstate ; i ++) { fprintf(ficgp,"\nset out \"%s-p%dj-%d.png\";set ylabel \"Probability for each individual/wave\";",subdirf2(optionfilefiname,"ILK_"),i,kvar);