--- imach/src/imach.c 2023/04/29 10:46:21 1.352 +++ imach/src/imach.c 2023/05/08 18:48:22 1.353 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.352 2023/04/29 10:46:21 brouard Exp $ +/* $Id: imach.c,v 1.353 2023/05/08 18:48:22 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.353 2023/05/08 18:48:22 brouard + *** empty log message *** + Revision 1.352 2023/04/29 10:46:21 brouard *** empty log message *** @@ -1367,12 +1370,12 @@ double gnuplotversion=GNUPLOTVERSION; #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.352 2023/04/29 10:46:21 brouard Exp $ */ +/* $Id: imach.c,v 1.353 2023/05/08 18:48:22 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.352 $ $Date: 2023/04/29 10:46:21 $"; +char fullversion[]="$Revision: 1.353 $ $Date: 2023/05/08 18:48:22 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -11122,14 +11125,15 @@ int decoderesult( char resultline[], int if (strlen(resultsav) >1){ j=nbocc(resultsav,'='); /**< j=Number of covariate values'=' in this resultline */ } - if(j == 0){ /* Resultline but no = */ + if(j == 0 && cptcovs== 0){ /* Resultline but no = and no covariate in the model */ TKresult[nres]=0; /* Combination for the nresult and the model */ return (0); } if( j != cptcovs ){ /* Be careful if a variable is in a product but not single */ - printf("ERROR: the number of variables in the resultline which is %d, differs from the number %d of single variables used in the model line, %s.\n",j, cptcovs, model); - fprintf(ficlog,"ERROR: the number of variables in the resultline which is %d, differs from the number %d of single variables used in the model line, %s.\n",j, cptcovs, model); - /* return 1;*/ + fprintf(ficlog,"ERROR: the number of variables in the resultline which is %d, differs from the number %d of single variables used in the model line, 1+age+%s.\n",j, cptcovs, model);fflush(ficlog); + printf("ERROR: the number of variables in the resultline which is %d, differs from the number %d of single variables used in the model line, 1+age+%s.\n",j, cptcovs, model);fflush(stdout); + if(j==0) + return 1; } for(k=1; k<=j;k++){ /* Loop on any covariate of the RESULT LINE */ if(nbocc(resultsav,'=') >1){