*** empty log message ***

diff --git a/src/imach.c b/src/imach.c
index 1cf4f3fd2bd6a18710780f9c03c8d98cc536e126..5bf8c7742c4e0ba5b9c89e14c577e7d723213e43 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.242  2016/08/30 15:01:20  brouard
+  Summary: Fixing a lots
+
   Revision 1.241  2016/08/29 17:17:25  brouard
   Summary: gnuplot problem in Back projection to fix
 
@@ -2219,7 +2222,8 @@ void powell(double p[], double **xi, int n, double ftol, int *iter, double *fret
                                /* printf("\n"); */
                                /* fprintf(ficlog,"\n"); */
                        }
-    if (2.0*fabs(fp-(*fret)) <= ftol*(fabs(fp)+fabs(*fret))) { /* Did we reach enough precision? */
+    /* if (2.0*fabs(fp-(*fret)) <= ftol*(fabs(fp)+fabs(*fret))) { /\* Did we reach enough precision? *\/ */
+    if (2.0*fabs(fp-(*fret)) <= ftol) { /* Did we reach enough precision? */
       /* We could compare with a chi^2. chisquare(0.95,ddl=1)=3.84 */
       /* By adding age*age in a model, the new -2LL should be lower and the difference follows a */
       /* a chisquare statistics with 1 degree. To be significant at the 95% level, it should have */
@@ -3210,7 +3214,7 @@ double func( double *x)
         Then computes with function pmij which return a matrix p[i][j] giving the elementary probability
         to be observed in j being in i according to the model.
       */
-      ioffset=2+nagesqr+cptcovage;
+      ioffset=2+nagesqr ;
    /* Fixed */
       for (k=1; k<=ncovf;k++){ /* Simple and product fixed covariates without age* products */
        cov[ioffset+TvarFind[k]]=covar[Tvar[TvarFind[k]]][i];/* V5+V4+V3+V4*V3+V5*age+V2+V1*V2+V1*age+V1, only V1 is fixed (k=6)*/
@@ -3529,7 +3533,8 @@ double funcone( double *x)
   for(k=1; k<=nlstate; k++) ll[k]=0.;
   ioffset=0;
   for (i=1,ipmx=0, sw=0.; i<=imx; i++){
-    ioffset=2+nagesqr+cptcovage;
+    /* ioffset=2+nagesqr+cptcovage; */
+    ioffset=2+nagesqr;
     /* Fixed */
     /* for (k=1; k<=cptcovn;k++) cov[2+nagesqr+k]=covar[Tvar[k]][i]; */
     /* for (k=1; k<=ncoveff;k++){ /\* Simple and product fixed Dummy covariates without age* products *\/ */