*** empty log message ***

diff --git a/src/imach.c b/src/imach.c
index a4e42f86594a8c93ee43d0fb31c517cb01ece0f5..94de963b2d851f01d2993cec18c6f687e4f55ab3 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.247  2016/09/02 11:11:21  brouard
+  *** empty log message ***
+
   Revision 1.246  2016/09/02 08:49:22  brouard
   *** empty log message ***
 
@@ -8840,7 +8843,7 @@ Dummy[k] 0=dummy (0 1), 1 quantitative (single or product without age), 2 dummy
 }
 
 int calandcheckages(int imx, int maxwav, double *agemin, double *agemax, int *nberr, int *nbwarn )
-{
+{/* Check ages at death */
   int i, m;
   int firstone=0;
   
@@ -9898,6 +9901,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);
@@ -10221,7 +10229,7 @@ Please run with mle=-1 to get a correct covariance matrix.\n",optionfile,numline
   */
 
   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);
@@ -10424,9 +10432,9 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf<br>\n",\
   /* 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);