From: N. Brouard <brouard@ined.fr>
Date: Sat, 23 Jul 2016 09:45:53 +0000 (+0000)
Subject: Summary: Completing for func too
X-Git-Tag: imach-099s7~276
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=cf81c1d8706dbef2ad227f9f769adffef1fb16df;p=.git

Summary: Completing for func too
---

diff --git a/src/imach.c b/src/imach.c
index 77f9f7c..437bfd1 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.228  2016/07/22 17:45:30  brouard
+  Summary: Fixing some arrays, still debugging
+
   Revision 1.226  2016/07/12 18:42:34  brouard
   Summary: temp
 
@@ -2994,13 +2997,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++)
@@ -3312,11 +3317,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++)