--- imach/src/imach.c 2019/05/09 13:39:37 1.290 +++ imach/src/imach.c 2019/05/09 13:44:18 1.291 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.290 2019/05/09 13:39:37 brouard Exp $ +/* $Id: imach.c,v 1.291 2019/05/09 13:44:18 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.291 2019/05/09 13:44:18 brouard + Summary: Before ncovmax + Revision 1.290 2019/05/09 13:39:37 brouard Summary: 0.99r18 unlimited number of individuals @@ -1054,7 +1057,7 @@ typedef struct { #define NINTERVMAX 8 #define NLSTATEMAX 8 /**< Maximum number of live states (for func) */ #define NDEATHMAX 8 /**< Maximum number of dead states (for func) */ -/* #define NCOVMAX 20 */ /**< Maximum number of covariates, including generated covariates V1*V2 */ +#define NCOVMAX 20 /**< Maximum number of covariates, including generated covariates V1*V2 */ #define codtabm(h,k) (1 & (h-1) >> (k-1))+1 /*#define decodtabm(h,k,cptcoveff)= (h <= (1<> (k-1)) & 1) +1 : -1)*/ #define decodtabm(h,k,cptcoveff) (((h-1) >> (k-1)) & 1) +1 @@ -1078,12 +1081,12 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.290 2019/05/09 13:39:37 brouard Exp $ */ +/* $Id: imach.c,v 1.291 2019/05/09 13:44:18 brouard Exp $ */ /* $State: Exp $ */ #include "version.h" char version[]=__IMACH_VERSION__; char copyright[]="April 2018,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.290 $ $Date: 2019/05/09 13:39:37 $"; +char fullversion[]="$Revision: 1.291 $ $Date: 2019/05/09 13:44:18 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */