Summary: Merge

Author: Brouard

Merge, before building revised version.

diff --git a/src/imach.c b/src/imach.c
index bb6068556aeb1410c9fcdb62c99f4647e97310b9..b19660a245eda7cfbdd9810b57fef993c67d9dd3 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,19 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.145  2014/06/10 21:23:15  brouard
+  Summary: Debugging with valgrind
+  Author: Nicolas Brouard
+
+  Lot of changes in order to output the results with some covariates
+  After the Edimburgh REVES conference 2014, it seems mandatory to
+  improve the code.
+  No more memory valgrind error but a lot has to be done in order to
+  continue the work of splitting the code into subroutines.
+  Also, decodemodel has been improved. Tricode is still not
+  optimal. nbcode should be improved. Documentation has been added in
+  the source code.
+
   Revision 1.143  2014/01/26 09:45:38  brouard
   Summary: Version 0.98nR (to be improved, but gives same optimization results as 0.98k. Nice, promising
 
@@ -464,11 +477,20 @@ extern int errno;
 #define ODIRSEPARATOR '/'
 #endif
 
+<<<<<<< imach.c
+/* $Id$ */
+=======
 /* $Id$ */
+>>>>>>> 1.145
 /* $State$ */
 
+<<<<<<< imach.c
+char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
+char fullversion[]="$Revision$ $Date$"; 
+=======
 char version[]="Imach version 0.98nR2, January 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121)";
 char fullversion[]="$Revision$ $Date$"; 
+>>>>>>> 1.145
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */