--- imach/src/imach.c 2017/06/29 09:47:08 1.274 +++ imach/src/imach.c 2017/06/30 13:39:33 1.275 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.274 2017/06/29 09:47:08 brouard Exp $ +/* $Id: imach.c,v 1.275 2017/06/30 13:39:33 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.275 2017/06/30 13:39:33 brouard + Summary: Saito's color + Revision 1.274 2017/06/29 09:47:08 brouard Summary: Version 0.99r14 @@ -1025,12 +1028,12 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.274 2017/06/29 09:47:08 brouard Exp $ */ +/* $Id: imach.c,v 1.275 2017/06/30 13:39:33 brouard Exp $ */ /* $State: Exp $ */ #include "version.h" char version[]=__IMACH_VERSION__; char copyright[]="February 2016,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2018"; -char fullversion[]="$Revision: 1.274 $ $Date: 2017/06/29 09:47:08 $"; +char fullversion[]="$Revision: 1.275 $ $Date: 2017/06/30 13:39:33 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -7893,12 +7896,12 @@ set ter svg size 640, 480\nunset log y\n } fprintf(ficgp,")"); if(ng ==2) - fprintf(ficgp," t \"p%d%d\" ", k2,k); + fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"p%d%d\" ", nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k); else /* ng= 3 */ - fprintf(ficgp," t \"i%d%d\" ", k2,k); + fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"i%d%d\" ", nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k); }else{ /* end ng <> 1 */ if( k !=k2) /* logit p11 is hard to draw */ - fprintf(ficgp," t \"logit(p%d%d)\" ", k2,k); + fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"logit(p%d%d)\" ", nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k); } if ((k+k2)!= (nlstate*2+ndeath) && ng != 1) fprintf(ficgp,",");