From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Fri, 30 Sep 2005 18:02:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: imach-099s7~553
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=8f7628847a0bf188205eff27ba9e28d379e18caf;p=.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 267cb16..746abd5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,12 @@
 2005-09-30    <lievre@PC_00595>
 
 	* imach.c (Module): sump fixed, loop imx fixed, and simplifications.
+	(Module): If the status is missing at the last wave but we know
+	that the person is alive, then we can code his/her status as -2
+	(instead of missing=-1 in earlier versions) and his/her
+	contributions to the likelihood is 1 - Prob of dying from last
+	health status (= 1-p13= p11+p12 in the easiest case of somebody in
+	the healthy state at last known wave). Version is 0.98 
 
 2004-05-20  Brouard Nicolas  <brouard@localhost>
 
diff --git a/src/Makefile b/src/Makefile
index 9e8a81e..a89944e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -48,7 +48,7 @@ TMPSETUPEXE=imach-setup.exe
 LICENSEFILE=$(LICENSE)
 INFOBEFOREFILE=Readme.txt
 
-$(TMPSETUPSCRIPT):
+$(TMPSETUPSCRIPT): $(TMPSCRIPTIN)
 	$(SED) -e "s/@APPNAME@/$(APPNAME)/g; \
 		s/@VERSION@/$(VERSION)/g; \
 		s/@GNUPLOTVERSION@/$(GNUPLOTVERSION)/g; \
@@ -59,8 +59,9 @@ $(TMPSETUPSCRIPT):
 	   	s/@VERMAJOR@/$(VERMAJOR)/g; \
 		s/@COPYRIGHT@/$(COPYRIGHT)/g;" \
 		$(TMPSCRIPTIN) > $(TMPSETUPSCRIPT)
+	unix2dos $(TMPSETUPSCRIPT)
 
-$(TMPSETUPEXE):
+$(TMPSETUPEXE): $(TMPSETUPSCRIPT)
 	$(SETUPCOMP) /cc $(TMPSETUPSCRIPT)
 
 PARAM=mypar1
diff --git a/src/imach.exe b/src/imach.exe
index 87b274e..4a2b207 100644
Binary files a/src/imach.exe and b/src/imach.exe differ
diff --git a/src/setup.iss b/src/setup.iss
index d5cd4b2..148bc86 100644
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -1,12 +1,21 @@
 ; -- IMaCh.iss --
-; $Id: 
+; $Id$
+;  $State$
+;  $Log$
+;  Revision 1.4  2005/09/30 17:39:58  lievre
+;  The files mypar.txt and data1.txt added
+;
+;  Revision 1.3  2005/05/04 17:32:58  brouard
+;  Set version
+;
+;
 ;
 
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
 [Setup]
 AppName=IMaCh
-AppVerName=IMaCh Version 0.97b
+AppVerName=IMaCh Version 0.98
 AppCopyright=Copyright (C)  2002-2003-2004-2005 INED-EUROREVES-Institut de longévité
 DefaultDirName={pf}\IMaCh
 DefaultGroupName=IMaCh
@@ -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\
 Source: ..\html\doc\mydata.txt; DestDir: {app}\doc
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc
+Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:
 
 [Run]
@@ -92,8 +102,8 @@ Source: ..\html\doc\mypar.imach; DestDir: {app}\doc
 ;P.S. -silent is recommended for use in install scripts
 
 [Icons]
-Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh 0.97b; IconFilename: {app}\imach.ico
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh@ 0.97b; Flags: runmaximized
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh 0.98; IconFilename: {app}\imach.ico
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh@ 0.98; Flags: runmaximized
 Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 
 ; NOTE: Most apps do not need registry entries to be pre-created. If you
@@ -109,7 +119,7 @@ Name: {group}\Visit the IMaCh web site; Filename: {app}\website.url
 ;;Root: HKCU; Subkey: "Software\EuroREVES_INED\IMaCh"; Flags: uninsdeletekey
 ;;Root: HKLM; Subkey: "Software\EuroREVES_INED"; Flags: uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\IMaCh; Flags: uninsdeletekeyifempty
-Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.97b; Flags: uninsdeletekeyifempty
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.98; Flags: uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: InstallPath; ValueData: {app}
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: Current Version; ValueData: 4.0; Flags: uninsdeletekeyifempty
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}