Version 0.00s9 Graph of proportion DFLE/TLE when popbased=1 added

If T_....txt file was correct. The graph wasn't plotted when
popbased=1 (thanks to Saito). Also, the y2tics as well as the label
"popbased=" were not unset and all graphs generated after the graph of
proportions were displayed with these wrong information.

The difference between verion 0.99s7 and 0.99s8 resides when firstpass is higher than 1 and when
there is no interview at that firstpass and later because the death
occurred between the first wave and firstpass: a death event was added
to the likelihood, instead of skipping that person. I only recently
read that the ChangeLog can be verbose...

diff --git a/src/Makefile b/src/Makefile
index 2dfbba64b2450bf5280fa3a3c818dc91a2e2eb5c..aa856b430a3a60e50234879367dd763c2775b88a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -261,9 +261,10 @@ imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/creat
 md5:
        ls ../build/Output/* | xargs md5sum
 upload:
-       rsync -v ../build/Output/imach-0.99s6-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v ../build/Output/imach0.99s6.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-
+#      rsync -v ../build/Output/imach-0.99s6-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v ../build/Output/imach0.99s6.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v ../build/Output/imach-0.99s8-1.src.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v ../build/Output/imach-0.99s8-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 $(PARAM).htm: imach $(PARAM).imach data1.txt
        ./imach $(PARAM).imach
 

diff --git a/src/imach.c b/src/imach.c
index f04ffd8846400d147de7ba0213dfd7a66ca28794..8f4efa17de398b86b49c82751a49b0177afd298f 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -10348,10 +10348,10 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
       fprintf(ficgp,"\nset out \"%s_%d-%d.svg\" \n",subdirf2(optionfilefiname,"E_"),k1,nres);
       for(vpopbased=0; vpopbased <= popbased; vpopbased++){ /* Done for vpopbased=0 and vpopbased=1 if popbased==1*/
        fprintf(ficgp,"\nset label \"popbased %d %s\" at graph 0.98,0.5 center rotate font \"Helvetica,12\"\n",vpopbased,gplotlabel);
-       if(vpopbased==0){
+       /*if(vpopbased==0){*/
          fprintf(ficgp,"set ylabel \"Years\" \nset ter svg size 640, 480\nunset ytics; unset y2tics; set ytics nomirror; set y2tics 0,10,100;set y2range [0:100];\nplot [%.f:%.f] ",ageminpar,fage);
-       }else
-         fprintf(ficgp,"\nreplot ");
+         /*}else*/
+         /* fprintf(ficgp,"\nreplot "); */
        for (i=1; i<= nlstate+1 ; i ++) { /* For state i-1=0 is LE, while i-1=1 to nlstate are origin state */
          k=2*i;
          fprintf(ficgp,"\"%s\" every :::%d::%d u 1:($2==%d && $4!=0 ?$4 : 1/0) \"%%lf %%lf %%lf",subdirf2(fileresu,"T_"),nres-1,nres-1, vpopbased); /* for fixed variables age, popbased, mobilav */
@@ -10402,9 +10402,10 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
            if (j==i) fprintf(ficgp," %%lf (%%lf)");
            else fprintf(ficgp," %%*lf (%%*lf)");
          }   
-         if (i== (nlstate+1)) fprintf(ficgp,"\" t\"\" w l lt 0 axis x1y2");
+         if (i== (nlstate+1)) fprintf(ficgp,"\" t\"\" w l lt 0 axis x1y2;\n");
          else fprintf(ficgp,"\" t\"\" w l lt 0 axis x1y2,\\\n");
        } /* state for percent */
+       fprintf(ficgp,"unset ytics; unset y2tics; unset y2range; unset label;\n"); /* Otherwise y2tics remained on other graphs */
       } /* vpopbased */
       fprintf(ficgp,"\nset out;set out \"%s_%d-%d.svg\"; replot; set out; unset label;\n",subdirf2(optionfilefiname,"E_"),k1,nres); /* Buggy gnuplot */
     } /* end nres */

diff --git a/src/version.h b/src/version.h
index d66a98235f3c5166bd5feb3ed242b96c3968fc70..da4ad03fdd64f1782bf5605489c284d8e68f5855 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 #define __IMACH_VERSION_MAJOR__ 0
-#define __IMACH_VERSION_MINOR__ 99s8
+#define __IMACH_VERSION_MINOR__ 99s9
 #define __IMACH_VERSION_PATCH__ 0
 
-#define __IMACH_VERSION__ "0.99s8"
+#define __IMACH_VERSION__ "0.99s9"