version 1.228, 2016/07/22 17:45:30
|
version 1.229, 2016/07/23 09:45:53
|
Line 1
|
Line 1
|
/* $Id$ |
/* $Id$ |
$State$ |
$State$ |
$Log$ |
$Log$ |
|
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 |
Revision 1.228 2016/07/22 17:45:30 brouard |
Summary: Fixing some arrays, still debugging |
Summary: Fixing some arrays, still debugging |
|
|
Line 2997 double func( double *x)
|
Line 3000 double func( double *x)
|
*/ |
*/ |
for(mi=1; mi<= wav[i]-1; mi++){ |
for(mi=1; mi<= wav[i]-1; mi++){ |
for(itv=1; itv <= ntveff; itv++){ /* Varying dummy covariates */ |
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 */ |
for(iqtv=1; iqtv <= nqtveff; iqtv++){ /* Varying quantitatives covariates */ |
if(cotqvar[mw[mi][i]][iqtv][i] == -1){ |
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]); |
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; */ |
/* ioffset=2+nagesqr+cptcovn+nqv+ntv+nqtv; */ |
for (ii=1;ii<=nlstate+ndeath;ii++) |
for (ii=1;ii<=nlstate+ndeath;ii++) |
Line 3315 double funcone( double *x)
|
Line 3320 double funcone( double *x)
|
/* cov[ioffset+iv]=cotvar[mw[mi][i]][iv][i]; */ |
/* cov[ioffset+iv]=cotvar[mw[mi][i]][iv][i]; */ |
k=ioffset-2-nagesqr-cptcovage+itv; /* position in simple model */ |
k=ioffset-2-nagesqr-cptcovage+itv; /* position in simple model */ |
cov[ioffset+itv]=cotvar[mw[mi][i]][TmodelInvind[itv]][i]; |
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 */ |
for(iqtv=1; iqtv <= nqtveff; iqtv++){ /* Varying quantitatives covariates */ |
iv=TmodelInvQind[iqtv]; /* Counting the # varying covariate from 1 to ntveff */ |
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]; |
cov[ioffset+ntveff+iqtv]=cotqvar[mw[mi][i]][TmodelInvQind[iqtv]][i]; |
} |
} |
for (ii=1;ii<=nlstate+ndeath;ii++) |
for (ii=1;ii<=nlstate+ndeath;ii++) |