*** empty log message ***

diff --git a/src/imach.c b/src/imach.c
index 5f306cf099e3605b16bc4538f66bcd90cbff37be..eedf8cdf38ed021ae5a2979a8b5d963a3fd726e1 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.245  2016/09/02 07:25:01  brouard
+  *** empty log message ***
+
   Revision 1.244  2016/09/02 07:17:34  brouard
   *** empty log message ***
 
@@ -3646,7 +3649,7 @@ double funcone( double *x)
       ll[s[mw[mi][i]][i]] += 2*weight[i]*lli;
       /*printf("i=%6d s1=%1d s2=%1d mi=%1d mw=%1d dh=%3d prob=%10.6f w=%6.4f out=%10.6f sav=%10.6f\n",i,s1,s2,mi,mw[mi][i],dh[mi][i],exp(lli),weight[i],out[s1][s2],savm[s1][s2]); */
       if(globpr){
-       fprintf(ficresilk,"%9ld %6.1f %6.1f %6d %2d %2d %2d %2d %3d %15.6f %8.4f %8.3f\
+       fprintf(ficresilk,"%09ld %6.1f %6.1f %6d %2d %2d %2d %2d %3d %15.6f %8.4f %8.3f\
  %11.6f %11.6f %11.6f ", \
                num[i], agebegin, ageend, i,s1,s2,mi,mw[mi][i],dh[mi][i],exp(lli),weight[i],weight[i]*gipmx/gsw,
                2*weight[i]*lli,out[s1][s2],savm[s1][s2]);
@@ -4004,8 +4007,8 @@ double hessij( double x[], double **hess, double delti[], int thetai,int thetaj,
       kmax=kmax+10;
     }
     if(kmax >=10 || firstime ==1){
-      printf("Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you may increase ftol=%.2e\n",thetai,thetaj, ftol);
-      fprintf(ficlog,"Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you may increase ftol=%.2e\n",thetai,thetaj, ftol);
+      printf("Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you could increase ftol=%.2e\n",thetai,thetaj, ftol);
+      fprintf(ficlog,"Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you could increase ftol=%.2e\n",thetai,thetaj, ftol);
       printf("%d %d k=%d, k1=%.12e k2=%.12e k3=%.12e k4=%.12e delti*k=%.12e deltj*k=%.12e, xi-de*k=%.12e xj-de*k=%.12e  res=%.12e k1234=%.12e,k1-2=%.12e,k3-4=%.12e\n",thetai,thetaj,k,k1,k2,k3,k4,delti[thetai]/k,delti[thetaj]/k,x[thetai]-delti[thetai]/k,x[thetaj]-delti[thetaj]/k, res,k1-k2-k3+k4,k1-k2,k3-k4);
       fprintf(ficlog,"%d %d k=%d, k1=%.12e k2=%.12e k3=%.12e k4=%.12e delti*k=%.12e deltj*k=%.12e, xi-de*k=%.12e xj-de*k=%.12e  res=%.12e k1234=%.12e,k1-2=%.12e,k3-4=%.12e\n",thetai,thetaj,k,k1,k2,k3,k4,delti[thetai]/k,delti[thetaj]/k,x[thetai]-delti[thetai]/k,x[thetaj]-delti[thetaj]/k, res,k1-k2-k3+k4,k1-k2,k3-k4);
     }
@@ -6398,7 +6401,7 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
        if(TKresult[nres]!= k1)
          continue;
        /* We are interested in selected combination by the resultline */
-       printf("\n# 1st: Period (stable) prevalence with CI: 'VPL_' files and live state =%d ", cpt);
+       /* printf("\n# 1st: Period (stable) prevalence with CI: 'VPL_' files and live state =%d ", cpt); */
        fprintf(ficgp,"\n# 1st: Period (stable) prevalence with CI: 'VPL_' files  and live state =%d ", cpt);
        for (k=1; k<=cptcoveff; k++){    /* For each covariate k get corresponding value lv for combination k1 */
          lv= decodtabm(k1,k,cptcoveff); /* Should be the value of the covariate corresponding to k1 combination */
@@ -6407,14 +6410,14 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
          /* decodtabm(13,3,4)= 2 because h=13 k=  1  1 (2) 2 */
          vlv= nbcode[Tvaraff[k]][lv]; /* vlv is the value of the covariate lv, 0 or 1 */
          /* For each combination of covariate k1 (V1=1, V3=0), we printed the current covariate k and its value vlv */
-         printf(" V%d=%d ",Tvaraff[k],vlv);
+         /* printf(" V%d=%d ",Tvaraff[k],vlv); */
          fprintf(ficgp," V%d=%d ",Tvaraff[k],vlv);
        }
        for (k4=1; k4<= nsq; k4++){ /* For each selected (single) quantitative value */
-         printf(" V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]);
+         /* printf(" V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]); */
          fprintf(ficgp," V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]);
        }       
-       printf("\n#\n");
+       /* printf("\n#\n"); */
        fprintf(ficgp,"\n#\n");
        if(invalidvarcomb[k1]){
          fprintf(ficgp,"#Combination (%d) ignored because no cases \n",k1);