Summary: 0.98r0

diff --git a/src/ChangeLog b/src/ChangeLog
index bc7698ae489514379e17f8cdfd756975466de095..52d842e9ff75cbd9e9a636401c578b56d7e1a198 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-15  Nicolas J Brouard   <nbrouard@tugault.ined.fr>\r
+\r
+       *  (Module): 0.98r0 Some new graphs, some bugs fixed: model=1+age+V2. etc\r
+\r
 2015-08-18  Nicolas J Brouard   <nbrouard@tugault.local>\r
 \r
        *  (Module): Adding error when the covariance matrix doesn't contain the exact number of lines required by the model line.\r

diff --git a/src/Makefile b/src/Makefile
index c693c9718c01de752851888aff8bfe91e3725cbf..123f554c24d4a31cdbab53accb5d9fb9dd4c2d24 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
 #Version has to be set in ../CMakeLists.txt too.
-VERSION=0.98q6
+VERSION=0.98r0
 # DRIVEG is for VirtualBox Windows 64bit 
 DRIVEG=g:
 #DIRG is the corresponding build directory for Virtual Windows
@@ -51,7 +51,7 @@ IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-wopowell.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/ADL0w_V2c.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.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