--- imach/src/imach.c 2016/09/02 11:11:21 1.247 +++ imach/src/imach.c 2016/09/07 14:10:18 1.248 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.247 2016/09/02 11:11:21 brouard Exp $ +/* $Id: imach.c,v 1.248 2016/09/07 14:10:18 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.248 2016/09/07 14:10:18 brouard + *** empty log message *** + Revision 1.247 2016/09/02 11:11:21 brouard *** empty log message *** @@ -943,12 +946,12 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.247 2016/09/02 11:11:21 brouard Exp $ */ +/* $Id: imach.c,v 1.248 2016/09/07 14:10:18 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.247 $ $Date: 2016/09/02 11:11:21 $"; +char fullversion[]="$Revision: 1.248 $ $Date: 2016/09/07 14:10:18 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -8843,7 +8846,7 @@ Dummy[k] 0=dummy (0 1), 1 quantitative ( } int calandcheckages(int imx, int maxwav, double *agemin, double *agemax, int *nberr, int *nbwarn ) -{ +{/* Check ages at death */ int i, m; int firstone=0; @@ -9901,6 +9904,11 @@ int main(int argc, char *argv[]) fclose (ficlog); goto end; exit(0); + } else if(mle==-2) { /* Guessing from means */ + prwizard(ncovmodel, nlstate, ndeath, model, ficparo); + printf(" You chose mle=-2, look at file %s for a template of covariance matrix \n",filereso); + fprintf(ficlog," You chose mle=-2, look at file %s for a template of covariance matrix \n",filereso); + } else if(mle==-5) { /* Main Wizard */ prwizard(ncovmodel, nlstate, ndeath, model, ficparo); printf(" You chose mle=-3, look at file %s for a template of covariance matrix \n",filereso); @@ -10224,7 +10232,7 @@ Please run with mle=-1 to get a correct */ concatwav(wav, dh, bh, mw, s, agedc, agev, firstpass, lastpass, imx, nlstate, stepm); - /* */ + /* Concatenates waves */ free_vector(moisdc,1,n); free_vector(andc,1,n); @@ -10427,9 +10435,9 @@ Interval (in months) between two waves: /* For mortality only */ if (mle==-3){ ximort=matrix(1,NDIM,1,NDIM); - for(i=1;i<=NDIM;i++) - for(j=1;j<=NDIM;j++) - ximort[i][j]=0.; + for(i=1;i<=NDIM;i++) + for(j=1;j<=NDIM;j++) + ximort[i][j]=0.; /* ximort=gsl_matrix_alloc(1,NDIM,1,NDIM); */ cens=ivector(1,n); ageexmed=vector(1,n);