*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 407ae6b73ac333a2e07ec3674a68822592dbf45e..35b95ca43e52f8d0c67682d0a0c749e941377282 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-15  Brouard Nicolas  <brouard@localhost>\r
+\r
+       * imach.c (Module): Bug if status = -2, the loglikelihood was\r
+       computed as likelihood omitting the logarithm. Version O.98e\r
+\r
 2006-03-14  Brouard Nicolas  <brouard@localhost>\r
 \r
        * imach.c (Module): varevsij Comments added explaining the second\r

diff --git a/src/Makefile b/src/Makefile
index 4ae6364194c2e7f9150b34d6739c15c2baab215b..dad60112258e21b5bdded0196ccb8e1921c9488c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,146 +1,155 @@
-#CC= gcc -v\r
-CC= gcc\r
-\r
-# Mac OS/X version\r
-#MACOSX#_LFLAGS= -O3 -lm -DUNIX\r
-#MACOSX#_CFLAGS= -O3 -DUNIX\r
-#MACOSX#_UNIX2DOS= echo "Unix2dos " \r
-# Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg\r
-# ./createdmg.sh imach imach098panther ./imach098Panther\r
-# and directory ./imach098Panther contains package file imach098Panther.pkg\r
-\r
-# Windows cygwin version\r
-#WINDOWS#_\r
-LFLAGS= -g -mno-cygwin\r
-CFLAGS= -g -mno-cygwin\r
-LFLAGSOPT= -O3 -mno-cygwin\r
-CFLAGSOPT= -O3 -mno-cygwin\r
-UNIX2DOS= unix2dos\r
-\r
-# Linux version\r
-#LINUX#_\r
-#LINUX#_CFLAGS= -g -DUNIX\r
-#LINUX#_LFLAGS= -g -lm\r
-#LINUX#_CFLAGSOPT= -O3 -DUNIX -lm\r
-#LINUX#_LFLAGSOPT= -O3 -lm\r
-#UNIX2DOS= unix2dos\r
-\r
-SED= sed\r
-PACKAGE=imach\r
-PROGRAM=IMaCh\r
-##ifdef DICTLANGUAGE\r
-  DICTNAME=$(PACKAGE) $(DICTLANGUAGE) Dictionary\r
-##else\r
-##  ISERROR=1\r
-##endif\r
-\r
-##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"\r
-\r
-#SETUPCOMP= echo \r
-# Linux\r
-#LINUX#_SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"\r
-##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"\r
-\r
-#Windows cygwin\r
-# make imachcyg\r
-# make imach-setup.exe\r
-# sortie dans Output/setup.exe\r
-# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32\r
-##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"\r
-\r
-SETUPCOMP= Compil32 \r
-TMPSETUPSCRIPT=setup.iss\r
-TMPNOREGSETUPSCRIPT=noreg-setup.iss\r
-TMPSCRIPTIN=setup.iss.in\r
-APPLICATION=IMaCh\r
-APPNAME=$(APPLICATION)-$(VERSION)\r
-VERSION=0.98d\r
-GNUPLOTVERSION=4.0\r
-IMACHSETUPVERSION=1\r
-LICENSE=Copying\r
-COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité\r
-TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe\r
-LICENSEFILE=$(LICENSE)\r
-INFOBEFOREFILE=README.txt\r
-\r
-$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)\r
-       $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
-               s/@NOTINNOREG@//g; \\r
-               s/@NOREG@//g; \\r
-               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \\r
-               s/@VERSION@/$(VERSION)/g; \\r
-               s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
-               s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r
-               s/@LICENSEFILE@/$(LICENSEFILE)/g; \\r
-               s/@PACKAGE@/$(PACKAGE)/g; \\r
-               s/@DICTLANG@/$(DICTLANG)/g; \\r
-               s/@VERMAJOR@/$(VERMAJOR)/g; \\r
-               s/@COPYRIGHT@/$(COPYRIGHT)/g;" \\r
-               $(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)\r
-       $(UNIX2DOS) $(TMPSETUPSCRIPT)\r
-\r
-$(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)\r
-       $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
-               s/@NOTINNOREG@/\\;/g; \\r
-               s/@NOREG@/noreg-/g; \\r
-               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \\r
-               s/@VERSION@/$(VERSION)/g; \\r
-               s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
-               s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \\r
-               s/@LICENSEFILE@/$(LICENSEFILE)/g; \\r
-               s/@PACKAGE@/$(PACKAGE)/g; \\r
-               s/@DICTLANG@/$(DICTLANG)/g; \\r
-               s/@VERMAJOR@/$(VERMAJOR)/g; \\r
-               s/@COPYRIGHT@/$(COPYRIGHT)/g;" \\r
-               $(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)\r
-       $(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)\r
-\r
-$(TMPSETUPEXE): $(TMPSETUPSCRIPT)\r
-       $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)\r
-\r
-$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)\r
-       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)\r
-\r
-PARAM=mypar1\r
-\r
-imachcyg-setup: imachcygopt.exe setup.iss\r
-       cp imachcygopt.exe imach.exe\r
-       $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)\r
-\r
-# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)\r
-imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss\r
-       cp imachcygopt.exe imach.exe\r
-       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)\r
-\r
-imach : imach.o \r
-       $(CC) $(LFLAGS) -o imach imach.o\r
-imach.o : imach.c \r
-       $(CC) $(CFLAGS) -c imach.c\r
-\r
-imachcyg : imachcyg.o  strsep.o\r
-       $(CC) $(LFLAGS) -o imach imachcyg.o strsep.o\r
-imachcyg.o : imach.c \r
-       $(CC) $(CFLAGS)  -c -o imachcyg.o imach.c\r
-imachcygopt.exe : imachcygopt.o  strsep.o\r
-       $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o strsep.o\r
-imachcygopt.o : imach.c \r
-       $(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c\r
-strsep.o : strsep.c \r
-       $(CC) $(CFLAGSOPT) -c -o strsep.o strsep.c\r
-\r
-imachw32.o : imach.c\r
-       i386-mingw32-gcc -c imach.c -o imachw32.o\r
-imach.exe : imachw32.o \r
-       i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o\r
-       i386-mingw32-strip imach.exe\r
-\r
-\r
-$(PARAM).htm: imach $(PARAM).imach data1.txt\r
-       ./imach $(PARAM).imach\r
-\r
-clean: \r
-       rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \\r
-       r$(PARAM).txt tr$(PARAM).txt vpl$(PARAM).txt pr$(PARAM).txt \\r
-       vr$(PARAM).txt *.gif imach.exe imach.o\r
-\r
-\r
+VERSION=0.98d
+COPYRIGHT=Copyright (C)  2002-2006 INED-EUROREVES-Institut de longévité
+IMACHSETUPVERSION=1
+
+# make _linux=1 imachopt
+# make _linux=1 imach
+
+# make _macosx=1
+
+#        Windows
+# make _windows=1 imachcyg
+# make _windows=1 imach-setup.exe
+# make _windows=1 imach-noreg-setup.exe
+# sortie dans Output/setup.exe
+# ln -s /cygdrive/c/Program\ Files/Inno\ Setup\ 4/Compil32.exe /usr/local/bin/Compil32
+##SETUPCOMP=  "C:\Program Files\Inno Setup 3\Compil32.exe"
+
+#CC= gcc -v
+CC= gcc
+
+ifdef _macosx
+# Mac OS/X version
+LFLAGS= -O3 -lm -DUNIX
+CFLAGS= -O3 -DUNIX
+UNIX2DOS= echo "Unix2dos " 
+# Don'know how to launch imach098.pmsp in batch to create package file imach098Panther.pkg
+# ./createdmg.sh imach imach098panther ./imach098Panther
+# and directory ./imach098Panther contains package file imach098Panther.pkg
+endif
+
+ifdef _windows
+# Windows cygwin version
+LFLAGS= -g -mno-cygwin
+CFLAGS= -g -mno-cygwin
+LFLAGSOPT= -O3 -mno-cygwin
+CFLAGSOPT= -O3 -mno-cygwin
+UNIX2DOS= unix2dos
+SETUPCOMP= Compil32 
+##SETUPCOMP=start /wait "C:\Program\ Files\\Compil32.exe"
+##SETUPCOMP=  "C:\Program Files\Inno Setup 4\Compil32.exe"
+endif
+
+ifdef _linux
+CFLAGS= -g -DUNIX
+LFLAGS= -g -lm
+CFLAGSOPT= -O3 -DUNIX
+LFLAGSOPT= -O3 -lm
+UNIX2DOS= unix2dos
+SETUPCOMP= wine "C:////Program Files////Inno Setup 4////Compil32.exe"
+endif
+
+SED= sed
+PACKAGE=imach
+PROGRAM=IMaCh
+
+
+
+TMPSETUPSCRIPT=setup.iss
+TMPNOREGSETUPSCRIPT=noreg-setup.iss
+TMPSCRIPTIN=setup.iss.in
+APPLICATION=IMaCh
+APPNAME=$(APPLICATION)-$(VERSION)
+GNUPLOTVERSION=4.0
+LICENSE=Copying
+TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
+LICENSEFILE=$(LICENSE)
+INFOBEFOREFILE=README.txt
+
+$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
+       $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+               s/@NOTINNOREG@//g; \
+               s/@NOREG@//g; \
+               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
+               s/@VERSION@/$(VERSION)/g; \
+               s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
+               s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
+               s/@LICENSEFILE@/$(LICENSEFILE)/g; \
+               s/@PACKAGE@/$(PACKAGE)/g; \
+               s/@DICTLANG@/$(DICTLANG)/g; \
+               s/@VERMAJOR@/$(VERMAJOR)/g; \
+               s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
+               $(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
+       $(UNIX2DOS) $(TMPSETUPSCRIPT)
+
+$(TMPNOREGSETUPSCRIPT): $(TMPSCRIPTIN)
+       $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
+               s/@NOTINNOREG@/\\;/g; \
+               s/@NOREG@/noreg-/g; \
+               s/@IMACHSETUPVERSION@/$(IMACHSETUPVERSION)/g; \
+               s/@VERSION@/$(VERSION)/g; \
+               s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
+               s/@INFOBEFOREFILE@/$(INFOBEFOREFILE)/g; \
+               s/@LICENSEFILE@/$(LICENSEFILE)/g; \
+               s/@PACKAGE@/$(PACKAGE)/g; \
+               s/@DICTLANG@/$(DICTLANG)/g; \
+               s/@VERMAJOR@/$(VERMAJOR)/g; \
+               s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
+               $(TMPSCRIPTIN) > $(TMPNOREGSETUPSCRIPT)
+       $(UNIX2DOS) $(TMPNOREGSETUPSCRIPT)
+
+$(TMPSETUPEXE): $(TMPSETUPSCRIPT)
+       $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
+
+$(TMPNOREGSETUPEXE): $(TMPNOREGSETUPSCRIPT)
+       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+
+PARAM=mypar1
+
+imachcyg-setup: imachcygopt.exe setup.iss
+       cp imachcygopt.exe imach.exe
+       $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
+
+# imachcyg-noreg-setup : imachcygopt imachcygopt.o setup.iss.in noreg-setup.iss $(TMPNOREGSETUPEXE)
+imachcyg-noreg-setup: imachcygopt.exe noreg-setup.iss
+       cp imachcygopt.exe imach.exe
+       $(SETUPCOMP) /cc $(TMPNOREGSETUPSCRIPT)
+
+imach : imach.o 
+       $(CC) $(LFLAGS) -o imach imach.o
+imach.o : imach.c 
+       $(CC) $(CFLAGS) -c imach.c
+
+imachopt : imachopt.o 
+       $(CC) $(LFLAGSOPT) -o imachopt imachopt.o
+       ln -f imachopt imach
+imachopt.o : imach.c 
+       $(CC) $(CFLAGSOPT) -o imachopt.o -c imach.c
+
+imachcyg : imachcyg.o  strsep.o
+       $(CC) $(LFLAGS) -o imach imachcyg.o strsep.o
+imachcyg.o : imach.c 
+       $(CC) $(CFLAGS)  -c -o imachcyg.o imach.c
+imachcygopt.exe : imachcygopt.o  strsep.o
+       $(CC) $(LFLAGSOPT) -o imachcygopt.exe imachcygopt.o strsep.o
+imachcygopt.o : imach.c 
+       $(CC) $(CFLAGSOPT) -c -o imachcygopt.o imach.c
+strsep.o : strsep.c 
+       $(CC) $(CFLAGSOPT) -c -o strsep.o strsep.c
+
+imachw32.o : imach.c
+       i386-mingw32-gcc -c imach.c -o imachw32.o
+imach.exe : imachw32.o 
+       i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
+       i386-mingw32-strip imach.exe
+
+
+$(PARAM).htm: imach $(PARAM).imach data1.txt
+       ./imach $(PARAM).imach
+
+clean: 
+       rm or$(PARAM).txt er$(PARAM).txt pijr$(PARAM).txt plr$(PARAM).txt \
+       r$(PARAM).txt tr$(PARAM).txt vpl$(PARAM).txt pr$(PARAM).txt \
+       vr$(PARAM).txt *.gif imach.exe imach.o
+
+