Summary: 0.99r15

New Makefile with recent VirtualBox 5.26. Bug in sqrt negatve in imach.c

diff --git a/src/Makefile b/src/Makefile
index a1918b176a7e2e890f76b8a601b10e249761b68e..9719059ce252d1a0f5a5f26f39173f70610375b2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ OSTYPE = $(shell echo $$OSTYPE)
 DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build
-COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
+COPYRIGHT=Copyright (C)  2002-2016 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-18
 IMACHSETUPVERSION=icl
 # This is for Windows only
 #IMACHSETUPVERSION=mvc
@@ -61,7 +61,12 @@ IMACHSETUPVERSION=icl
 #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Yao/rhrs-yao-test-back.imach
 #TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-0.98r-powellf1f3linmnb-zeroes.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2V4V3V5.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2b4V4V3V5.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/Vn1b.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/rrrV4V3V5-suite6.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
@@ -343,8 +348,8 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        rm -rf ../build/icl64  && mkdir ../build/icl64
        cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
        cd ../build/icl64
-       VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
- --username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+ --username brouard  --verbose --wait-stdout  --wait-stderr -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
 #       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
@@ -358,8 +363,8 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        rm -rf ../build/icl32 && mkdir -p ../build/icl32
        cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
        cd ../build/icl32
-       VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-  --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+  --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
 # --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
@@ -368,8 +373,8 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        rm -rf ../build/vs32 && mkdir -p ../build/vs32
        cp mybuildvs32.bat ../build/vs32/
        cd ../build/vs32
-       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
-       --username brouard  --verbose  --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
+       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+       --username brouard  --verbose  --wait-stdout --  "C:\Windows\SysWOW64\cmd.exe" "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
 # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
 #WORK  --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
 #      --username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
@@ -422,11 +427,154 @@ ifdef _macosx
 endif
 
 imach.o : imach.c 
-        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c imach.c
+        $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c $<
+#       $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DDEBUGMEM -c $<
 #       $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
 
+imach-0.98r: imach-0.98r.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# Horrible no f3<f1 test and direct test,  converges if close to maximum otherwise diverges
+#calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
+imach-0.98r.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION)  -c $<
+
+#################
+imach-0.98r-powellsf1f3: imach-0.98r-powellsf1f3.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# test f3<f1 but direct test and no powell criteria which are NOPOWELLORIGINALNOMNBAKORIGINAL NOLINMINORIGINAL
+# diverges now from zeroes calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
+# but converges if close to the maximum
+# calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
+imach-0.98r-powellsf1f3.o : imach-0.98r.c 
+        $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -o $@  -c $<
+#       $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -E -c $< | cppbeauty
+
+######
+imach-0.98r-powellf1f3: imach-0.98r-powellf1f3.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+#Powell original but with mnbrak fix  -DUNKNOWNSTATUSNOTCONTRIBUTING -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE
+#diverges from zeroes
+# calls = 13 & 1760, -2 Log likelihood = 46537.411806825585 Real minumum
+imach-0.98r-powellf1f3.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3.i : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E   -c $<| cppbeauty
+#       $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL  $(CROSSCOMPILATION) -E -o $@  -c $<
+
+######################
+imach-0.98r-powell: imach-0.98r-powell.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# Powell original means without -DPOWELLNOF3INFF1TEST (with F3<F1 test) 
+#calls = 33 & 4088, -2 Log likelihood = 46623.239341985027 reaches the maximum !
+#From zeroes doesn't reach the maximum calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+#calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powell.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+#       $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E  -c $< | cppbeauty
+
+imach-0.98r-powell.i : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@ -c $< 
+
+###############
+# powell test with f1f3 powell, linmin fix but no mnbrak fix
+imach-0.98r-powellf1f3lin: imach-0.98r-powellf1f3lin.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# ?calls = 41 & 4718, -2 Log likelihood = 46690.242656475864
+#calls = 33 & 4088, -2 Log likelihood = 46623.239341985027
+# from zeroes calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powellf1f3lin.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+
+#############
+
+
+# directest with f3<f1 without mnbrak fix but linmin fix
+imach-0.98r-powellf1f3orilin: imach-0.98r-powellf1f3orilin.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+#Maximum not reached but converge from zeroes
+#calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powellf1f3orilin.o : imach-0.98r.c 
+        $(CC) $(CFLAGS)  -DMNBRAKORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+
+#######
+
+# Powell test not direct, with mnbrak and linmin fixes
+imach-0.98r-powellf1f3linmnb: imach-0.98r-powellf1f3linmnb.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# worst, diverges from zeroes -DDEBUGMNBRAK
+#calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
+
+imach-0.98r-powellf1f3linmnb.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3linmnb.i : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E -c $< | cppbeauty
+#########
+
+# Powell test not direct, with mnbrak and linmin fixes
+imach-0.98r-powellf1f3linmnbiter: imach-0.98r-powellf1f3linmnbiter.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+#
+#
+
+imach-0.98r-powellf1f3linmnbiter.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3linmnbiter.i : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -E -c $< | cppbeauty
+#########
+
+
+imach-0.98r-powellf1f3ori: imach-0.98r-powellf1f3ori.o 
+       $(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+       $(DSYMUTIL) $@
+endif
+
+# Powell  with -DPOWELLNOF3INFF1TEST which is not Powell original!
+#calls = 41 & 4718, -2 Log likelihood = 46690.242656475864, doesn't reach the maximum
+imach-0.98r-powellf1f3ori.o : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -o $@  -c $< 
+imach-0.98r-powellf1f3ori.i : imach-0.98r.c 
+        $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@  -c $<| cppbeauty
+
+
+
+
+
+
 imachtest.o : imach.c 
-        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c
+        $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o $@ -c $<
 
 #       $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c
 
@@ -547,8 +695,13 @@ upload:
 #      rsync -v Output/imach-0.98r4-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/IMaCh-0.99a3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach0.99a3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r9-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r9.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach-0.99r14-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach0.99r14.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o
@@ -566,8 +719,14 @@ imach.exe : imachw32.o
        i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
        i386-mingw32-strip imach.exe
 
+valgrindtoto: valgrindtoto.c
+       gcc -o valgrindtoto -DCROSS=0 -g valgrindtoto.c
+valgrindtototest: valgrindtoto
+       valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./valgrindtoto
+
 valgrind-test :  imach $(TESTFILE) 
        valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE)
+#      valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach-0.98r-powellf1f3linmnb $(TESTFILE)
 test:  imach $(TESTFILE) 
        gdb ./imach $(TESTFILE)
 

diff --git a/src/README.txt b/src/README.txt
index 978d69c62e93abb9864b2b1b1ba38de4eb7ca9e7..a4df93b9ef84f915c1a59b26d8821b8ce64d6f23 100755 (executable)
--- a/src/README.txt
+++ b/src/README.txt
@@ -1,3 +1,10 @@
+TEST Version IMaCh 0.99\r
+Parameter files have new undocumented parameters.\r
+Look at the archives of imach-users@listes.ined.fr for information.\r
+\r
+Current documentation on the web site is for 0.98 (before the\r
+introduction of varying covariates).\r
+\r
 Interpolated Marlov Chain (IMaCh program)\r
 \r
 This program will be licensed under the GNU GNU GENERAL PUBLIC LICENSE.\r
@@ -47,7 +54,7 @@ asked to enter a character and the terminal will not disappear.
   open: either type in the name and path of your parameter file or\r
   drag it from the finder.\r
 \r
-The output of you run is a lot of text files which are grouped into a\r
+The output of your run is a lot of text files which are grouped into a\r
 sub-directory having the name of your parameter file as well as an\r
 other text file foo.gp which is a gnuplot file. This gnuplot is run by\r
 imach and creates a lot of graphs from the various results text files.\r

diff --git a/src/imach.c b/src/imach.c
index 544804be5cdcc47b2508fc8841a3e8615e116e80..504d69f3d8d9ac4ae8f05eb662cbd2fb8ad48f3b 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.279  2017/07/20 13:35:01  brouard
+  Summary: temporary working
+
   Revision 1.278  2017/07/19 14:09:02  brouard
   Summary: Bug for mobil_average=0 and prevforecast fixed(?)
 
@@ -6639,7 +6642,12 @@ To be simple, these graphs help to understand the significativity of each parame
                 }
                                                                
                 /* Eigen vectors */
-                v11=(1./sqrt(1+(v1-lc1)*(v1-lc1)/cv12/cv12));
+                if(1+(v1-lc1)*(v1-lc1)/cv12/cv12 <1.e-5){
+                  printf(" Error sqrt of a negative number: %lf\n",1+(v1-lc1)*(v1-lc1)/cv12/cv12);
+                  fprintf(ficlog," Error sqrt of a negative number: %lf\n",1+(v1-lc1)*(v1-lc1)/cv12/cv12);
+                  v11=(1./sqrt(fabs(1+(v1-lc1)*(v1-lc1)/cv12/cv12)));
+                }else
+                  v11=(1./sqrt(1+(v1-lc1)*(v1-lc1)/cv12/cv12));
                 /*v21=sqrt(1.-v11*v11); *//* error */
                 v21=(lc1-v1)/cv12*v11;
                 v12=-v21;
@@ -6670,8 +6678,8 @@ To be simple, these graphs help to understand the significativity of each parame
                   fprintf(ficgp,"\nset label \"%d\" at %11.3e,%11.3e center",(int) age, mu1,mu2);
                   fprintf(ficgp,"\n# Age %d, p%1d%1d - p%1d%1d",(int) age, k1,l1,k2,l2);
                   fprintf(ficgp,"\nplot [-pi:pi] %11.3e+ %.3f*(%11.3e*%11.3e*cos(t)+%11.3e*%11.3e*sin(t)), %11.3e +%.3f*(%11.3e*%11.3e*cos(t)+%11.3e*%11.3e*sin(t)) not",      \
-                          mu1,std,v11,sqrt(lc1),v12,sqrt(fabs(lc2)),   \
-                          mu2,std,v21,sqrt(lc1),v22,sqrt(fabs(lc2))); /* For gnuplot only */
+                          mu1,std,v11,sqrt(fabs(lc1)),v12,sqrt(fabs(lc2)), \
+                          mu2,std,v21,sqrt(fabs(lc1)),v22,sqrt(fabs(lc2))); /* For gnuplot only */
                 }else{
                   first=0;
                   fprintf(fichtmcov," %d (%.3f),",(int) age, c12);