*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 267cb16fba6093fdb038810a4316d1b219616ce7..746abd55d3c4b0a916e1a487b6098c3496da48de 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
 2005-09-30    <lievre@PC_00595>\r
 \r
        * imach.c (Module): sump fixed, loop imx fixed, and simplifications.\r
+       (Module): If the status is missing at the last wave but we know\r
+       that the person is alive, then we can code his/her status as -2\r
+       (instead of missing=-1 in earlier versions) and his/her\r
+       contributions to the likelihood is 1 - Prob of dying from last\r
+       health status (= 1-p13= p11+p12 in the easiest case of somebody in\r
+       the healthy state at last known wave). Version is 0.98 \r
 \r
 2004-05-20  Brouard Nicolas  <brouard@localhost>\r
 \r

diff --git a/src/Makefile b/src/Makefile
index 9e8a81ea99c96d3b520d5bfc3c4b3b3ca22ac003..a89944ebd980bae3f052de5cb79fdf64c8dfaad8 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -48,7 +48,7 @@ TMPSETUPEXE=imach-setup.exe
 LICENSEFILE=$(LICENSE)\r
 INFOBEFOREFILE=Readme.txt\r
 \r
-$(TMPSETUPSCRIPT):\r
+$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)\r
        $(SED) -e "s/@APPNAME@/$(APPNAME)/g; \\r
                s/@VERSION@/$(VERSION)/g; \\r
                s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \\r
@@ -59,8 +59,9 @@ $(TMPSETUPSCRIPT):
                s/@VERMAJOR@/$(VERMAJOR)/g; \\r
                s/@COPYRIGHT@/$(COPYRIGHT)/g;" \\r
                $(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)\r
+       unix2dos $(TMPSETUPSCRIPT)\r
 \r
-$(TMPSETUPEXE):\r
+$(TMPSETUPEXE): $(TMPSETUPSCRIPT)\r
        $(SETUPCOMP) /cc $(TMPSETUPSCRIPT)\r
 \r
 PARAM=mypar1\r

diff --git a/src/imach.exe b/src/imach.exe
index 87b274e01c0e6216e88eab0d121af6be0561fe95..4a2b207128a9f70be36bd06f410e8d2376bbcd70 100644 (file)
Binary files a/src/imach.exe and b/src/imach.exe differ

diff --git a/src/setup.iss b/src/setup.iss
index d5cd4b259be0b21b54ea9e4d911d460b1a63bf69..148bc86fafd13ab4a72f06d388b29ce63e270534 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -1,12 +1,21 @@
 ; -- IMaCh.iss --\r
-; $Id: \r
+; $Id$\r
+;  $State$\r
+;  $Log$\r
+;  Revision 1.4  2005/09/30 17:39:58  lievre\r
+;  The files mypar.txt and data1.txt added\r
+;\r
+;  Revision 1.3  2005/05/04 17:32:58  brouard\r
+;  Set version\r
+;\r
+;\r
 ;\r
 \r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
 AppName=IMaCh\r
-AppVerName=IMaCh Version 0.97b\r
+AppVerName=IMaCh Version 0.98\r
 AppCopyright=Copyright (C)  2002-2003-2004-2005 INED-EUROREVES-Institut de longévité\r
 DefaultDirName={pf}\IMaCh\r
 DefaultGroupName=IMaCh\r
@@ -71,6 +80,7 @@ Source: ..\html\doc\biaspar\varpijgrbiaspar123-21.png; DestDir: {app}\doc\biaspa
 Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\doc\biaspar\\r
 Source: ..\html\doc\mydata.txt; DestDir: {app}\doc\r
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc\r
+Source: ..\html\doc\data1.txt; DestDir: {app}\doc\r
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:\r
 \r
 [Run]\r
@@ -92,8 +102,8 @@ Source: ..\html\doc\mypar.imach; DestDir: {app}\doc
 ;P.S. -silent is recommended for use in install scripts\r
 \r
 [Icons]\r
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh 0.97b; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh@ 0.97b; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh 0.98; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh@ 0.98; Flags: runmaximized\r
 Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url\r
 \r
 ; NOTE: Most apps do not need registry entries to be pre-created. If you\r
@@ -109,7 +119,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey\r
 ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty\r
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.97b; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.0; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r