Summary: 0.99s7

* imach.c (Module): Some bug fixes: in drawings when age*age is
included in the model as well as with quantitative variables.

diff --git a/src/imach.c b/src/imach.c
index d2a3d398a0069998d0c7797fc9feb6570e26752c..59801460a10934ef49b7c76e22c67eba779e7666 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.366  2024/07/02 09:42:10  brouard
+  Summary: trying clang on Linux
+
   Revision 1.365  2024/06/28 13:53:38  brouard
   * imach.c (Module): fixing some bugs in gnuplot and quantitative variables, but not completely solved
 
@@ -10200,7 +10203,7 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
        fprintf(ficgp,"\n#set out \"V_%s_%d-%d-%d.svg\" \n",optionfilefiname,cpt,k1,nres);
        /* fprintf(ficgp,"set label \"Alive state %d %s\" at graph 0.98,0.5 center rotate font \"Helvetica,12\"\n",cpt,gplotlabel); */
        fprintf(ficgp,"set title \"Alive state %d %s model=1+age+%s\" font \"Helvetica,12\"\n",cpt,gplotlabel,model);
-       fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter svg size 640, 480\nplot [%.f:%.f] \"%s\" every :::%d::%d u 1:($2==%d ? $3:1/0) \"%%lf %%lf",ageminpar,fage,subdirf2(fileresu,"VPL_"),nres-1,nres-1,nres);
+       fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter svg size 640, 480\nplot [%.f:%.f] [0:1] \"%s\" every :::%d::%d u 1:($2==%d ? $3:1/0) \"%%lf %%lf",ageminpar,fage,subdirf2(fileresu,"VPL_"),nres-1,nres-1,nres);
        /* fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter svg size 640, 480\nplot [%.f:%.f] \"%s\" every :::%d::%d u 1:($2==%d ? $3:1/0) \"%%lf %%lf",ageminpar,fage,subdirf2(fileresu,"VPL_"),k1-1,k1-1,nres); */
       /* k1-1 error should be nres-1*/
        for (i=1; i<= nlstate ; i ++) {
@@ -10765,12 +10768,15 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
          }else{
            fprintf(ficgp,",\\\n '' ");
          }
-         if(cptcoveff ==0){ /* No covariate */
+         /* if(cptcoveff ==0){ /\* No covariate *\/ */
+         if(cptcovs ==0){ /* No covariate */
            ioffset=2; /* Age is in 2 */
            /*# yearproj age p11 p21 p31 p.1 p12 p22 p32 p.2 p13 p23 p33 p.3 p14 p24 p34 p.4*/
            /*#   1       2   3   4   5  6    7  8   9   10  11  12  13  14  15  16  17  18 */
            /*# V1  = 1 yearproj age p11 p21 p31 p.1 p12 p22 p32 p.2 p13 p23 p33 p.3 p14 p24 p34 p.4*/
            /*#  1    2        3   4   5  6    7  8   9   10  11  12  13  14  15  16  17  18 */
+           /*# V1  = 1 yearproj age age*p11 p21 p31 p.1 p12 p22 p32 p.2 p13 p23 p33 p.3 p14 p24 p34 p.4*/
+           /*#  1    2        3   4   5  6    7  8   9   10  11  12  13  14  15  16  17  18 */
            fprintf(ficgp," u %d:(", ioffset); 
            if(i==nlstate+1){
              fprintf(ficgp," $%d/(1.-$%d)):1 t 'pw.%d' with line lc variable ",        \
@@ -10784,9 +10790,15 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
              fprintf(ficgp," $%d/(1.-$%d)) t 'p%d%d' with line ",      \
                      ioffset+(cpt-1)*(nlstate+1)+1+(i-1),  ioffset+1+(i-1)+(nlstate+1)*nlstate,i,cpt );
          }else{ /* more than 2 covariates */
-           ioffset=2*cptcoveff+2; /* Age is in 4 or 6 or etc.*/
+           /* ioffset=2*cptcoveff+2; */ /* Age is in 4 or 6 or etc.*/
+           ioffset=2*cptcovs+2; /* Age is in 4 or 6 or etc.*/
            /*#  V1  = 1  V2 =  0 yearproj age p11 p21 p.1 p12 p22 p.2 p13 p23 p.3*/
            /*#   1    2   3    4    5      6  7   8   9   10   11 12  13   14  15 */
+           /* # Forecasting at date 3/1/2003  */
+            /* V1=0 V2=1 V3=0 V6=2.47 yearproj age */      
+            /* # 2 3 4 5 6 7  8    9   10   11    12     13    14   15     16    17    18    19   20    21    22     23    24   25    26 */
+            /* #                             p11  p21    p31   wp.1 p12    p22   p32   wp.2  p13   p23  p33  wp.3    p14   p24   p34  wp.4 */
+            /* 1 0 2 1 3 0 6 2.47 2003 100  1.000 0.000 0.000 0.297 0.000 1.000 0.000 0.207 0.000 0.000 1.000 0.497 0.000 0.000 0.000 0.000 */
            iyearc=ioffset-1;
            iagec=ioffset;
            fprintf(ficgp," u %d:(",ioffset); 
@@ -10903,27 +10915,38 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
            /*#  1    2        3   4   5  6    7  8   9   10  11  12  13  14  15  16  17  18 */
            fprintf(ficgp," u %d:(", ioffset); 
            if(i==nlstate+1){
-             fprintf(ficgp," $%d/(1.-$%d)):1 t 'bw%d' with line lc variable ", \
-                     ioffset+(cpt-1)*(nlstate+1)+1+(i-1),  ioffset+1+(i-1)+(nlstate+1)*nlstate,cpt );
+             fprintf(ficgp," $%d):1 t 'bw%d' with line lc variable ",  \
+                     ioffset+(cpt-1)*(nlstate+1)+1+(i-1),cpt );
+             /* fprintf(ficgp," $%d/(1.-$%d)):1 t 'bw%d' with line lc variable ",      \ */
+             /*              ioffset+(cpt-1)*(nlstate+1)+1+(i-1),  ioffset+1+(i-1)+(nlstate+1)*nlstate,cpt ); */
              fprintf(ficgp,",\\\n '' ");
              fprintf(ficgp," u %d:(",ioffset); 
              fprintf(ficgp," (($1-$2) == %d ) ? $%d : 1/0):1 with labels center not ", \
                     offbyear,                          \
                      ioffset+(cpt-1)*(nlstate+1)+1+(i-1) );
-           }else
-             fprintf(ficgp," $%d/(1.-$%d)) t 'b%d%d' with line ",      \
-                     ioffset+(cpt-1)*(nlstate+1)+1+(i-1),  ioffset+1+(i-1)+(nlstate+1)*nlstate,cpt,i );
+           }else  /* not sure divided by 1- to be checked */
+             fprintf(ficgp," $%d) t 'b%d%d' with line ",       \
+                     ioffset+(cpt-1)*(nlstate+1)+1+(i-1),cpt,i );
+             /* fprintf(ficgp," $%d/(1.-$%d)) t 'b%d%d' with line ",   \ */
+             /*              ioffset+(cpt-1)*(nlstate+1)+1+(i-1),  ioffset+1+(i-1)+(nlstate+1)*nlstate,cpt,i ); */
          }else{ /* more than 2 covariates */
-           ioffset=2*cptcoveff+2; /* Age is in 4 or 6 or etc.*/
+           /* ioffset=2*cptcoveff+2; /\* Age is in 4 or 6 or etc.*\/ */
+           ioffset=2*cptcovs+2; /* Age is in 4 or 6 or etc.*/
            /*#  V1  = 1  V2 =  0 yearproj age p11 p21 p.1 p12 p22 p.2 p13 p23 p.3*/
            /*#   1    2   3    4    5      6  7   8   9   10   11 12  13   14  15 */
+/* #****** hbijx=probability over h years, hb.jx is weighted by observed prev  */
+/* # V1=0  V2=1  V3=0  V6=2.47 */
+/*              yearbproj age b11     b21    b31   b.1   b12  b22  b32    b.2   b13   b23   b33   b.3   b14   b24   b34    b.4 */
+/* # Back Forecasting at date 3/1/2003  */
+/* 1 2 3 4 5 6 7   8    9  10  11     12     13    14    15   16    17    18    19    20    21     22    23   24    25    26   */          
+/* 1 0 2 1 3 0 6 2.47 2003 50  1.000 0.000 0.000 0.714 0.000 1.000 0.000 0.286 0.000 0.000 1.000 0.000 0.000 0.000 0.000 0.000 */
            iyearc=ioffset-1;
            iagec=ioffset;
            fprintf(ficgp," u %d:(",ioffset); 
            kl=0;
            strcpy(gplotcondition,"(");
            for (k=1; k<=cptcovs; k++){    /* For each covariate k of the resultline, get corresponding value lv for combination k1 */
-             if(Dummy[modelresult[nres][k]]==0){  /* To be verified */
+             /* if(Dummy[modelresult[nres][k]]==0){  /\* To be verified *\/ */
                /* for (k=1; k<=cptcoveff; k++){    /\* For each covariate writing the chain of conditions *\/ */
                /* lv= decodtabm(k1,k,cptcoveff); /\* Should be the covariate value corresponding to combination k1 and covariate k *\/ */
                /* lv= codtabm(k1,TnsdVar[Tvaraff[k]]); /\* Should be the covariate value corresponding to combination k1 and covariate k *\/ */
@@ -10940,7 +10963,7 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
                kl++;
                if(k <cptcovs && cptcovs>1)
                  sprintf(gplotcondition+strlen(gplotcondition)," && ");
-             }
+               /* } */ /* end dummy */
            }
            strcpy(gplotcondition+strlen(gplotcondition),")");
            /* kl=6+(cpt-1)*(nlstate+1)+1+(i-1); /\* 6+(1-1)*(2+1)+1+(1-1)=7, 6+(2-1)(2+1)+1+(1-1)=10 *\/ */