--- imach/src/imach.c	2016/07/22 17:45:30	1.228
+++ imach/src/imach.c	2016/07/23 09:45:53	1.229
@@ -1,6 +1,9 @@
-/* $Id: imach.c,v 1.228 2016/07/22 17:45:30 brouard Exp $
+/* $Id: imach.c,v 1.229 2016/07/23 09:45:53 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.229  2016/07/23 09:45:53  brouard
+  Summary: Completing for func too
+
   Revision 1.228  2016/07/22 17:45:30  brouard
   Summary: Fixing some arrays, still debugging
 
@@ -884,12 +887,12 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.228 2016/07/22 17:45:30 brouard Exp $ */
+/* $Id: imach.c,v 1.229 2016/07/23 09:45:53 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.228 $ $Date: 2016/07/22 17:45:30 $"; 
+char fullversion[]="$Revision: 1.229 $ $Date: 2016/07/23 09:45:53 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -2997,13 +3000,15 @@ double func( double *x)
       */
       for(mi=1; mi<= wav[i]-1; mi++){
 	for(itv=1; itv <= ntveff; itv++){ /* Varying dummy covariates */
-	  cov[ioffset+itv]=cotvar[mw[mi][i]][Tvar[itv]][i]; /* Not sure, Tvar V4+V3+V5 Tvaraff ? */
+	  /* cov[ioffset+itv]=cotvar[mw[mi][i]][Tvar[itv]][i]; /\* Not sure, Tvar V4+V3+V5 Tvaraff ? *\/ */
+	  cov[ioffset+itv]=cotvar[mw[mi][i]][TmodelInvind[itv]][i];
 	}
 	for(iqtv=1; iqtv <= nqtveff; iqtv++){ /* Varying quantitatives covariates */
 	  if(cotqvar[mw[mi][i]][iqtv][i] == -1){
 	    printf("i=%d, mi=%d, iqtv=%d, cotqvar[mw[mi][i]][iqtv][i]=%f",i,mi,iqtv,cotqvar[mw[mi][i]][iqtv][i]);
 	  }
-	  cov[ioffset+ntveff+iqtv]=cotqvar[mw[mi][i]][iqtv][i];
+	  cov[ioffset+ntveff+iqtv]=cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i];
+	  /* cov[ioffset+ntveff+iqtv]=cotqvar[mw[mi][i]][iqtv][i]; */
 	}
 	/* ioffset=2+nagesqr+cptcovn+nqv+ntv+nqtv; */
 	for (ii=1;ii<=nlstate+ndeath;ii++)
@@ -3315,11 +3320,11 @@ double funcone( double *x)
 	/* cov[ioffset+iv]=cotvar[mw[mi][i]][iv][i]; */
 	k=ioffset-2-nagesqr-cptcovage+itv; /* position in simple model */
 	cov[ioffset+itv]=cotvar[mw[mi][i]][TmodelInvind[itv]][i];
-	printf(" i=%d,mi=%d,itv=%d,TmodelInvind[itv]=%d,cotvar[mw[mi][i]][TmodelInvind[itv]][i]=%f\n", i, mi, itv, TmodelInvind[itv],cotvar[mw[mi][i]][TmodelInvind[itv]][i]);
+	/* printf(" i=%d,mi=%d,itv=%d,TmodelInvind[itv]=%d,cotvar[mw[mi][i]][TmodelInvind[itv]][i]=%f\n", i, mi, itv, TmodelInvind[itv],cotvar[mw[mi][i]][TmodelInvind[itv]][i]); */
       }
       for(iqtv=1; iqtv <= nqtveff; iqtv++){ /* Varying quantitatives covariates */
 	iv=TmodelInvQind[iqtv]; /* Counting the # varying covariate from 1 to ntveff */
-	printf(" i=%d,mi=%d,iqtv=%d,TmodelInvQind[iqtv]=%d,cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i]=%f\n", i, mi, iqtv, TmodelInvQind[iqtv],cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i]);
+	/* printf(" i=%d,mi=%d,iqtv=%d,TmodelInvQind[iqtv]=%d,cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i]=%f\n", i, mi, iqtv, TmodelInvQind[iqtv],cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i]); */
 	cov[ioffset+ntveff+iqtv]=cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i];
       }
       for (ii=1;ii<=nlstate+ndeath;ii++)