Summary:IMaCh-0.99r24

diff --git a/src/ChangeLog b/src/ChangeLog
index 56459fa7db0ada4dbf78a6a11b870e19511e4c3c..ebda2e76f017780ae36576ec542fbd6d6b6f0d2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,12 +1,11 @@
-2021-03-31  Nicolas Brouard   <brouard@ined.fr>\r
-\r
+*Wed Mar 31 2021  Nicolas Brouard   <brouard@ined.fr>\r
        * imach.c (Module): Still bugs in the result loop. Thank to Holly Benett\r
 \r
-2021-03-08  Nicolas Brouard   <brouard@ined.fr>\r
+*2021-03-08  Nicolas Brouard   <brouard@ined.fr>\r
 \r
        * ./ (Module): Fixed bug on result:\r
 \r
-2021-02-20  Nicolas Brouard   <brouard@ined.fr>\r
+*2021-02-20  Nicolas Brouard   <brouard@ined.fr>\r
 \r
        * imach.c (Module): Fix bug on quitting after result lines!\r
        (Module): Version 0.99r21\r
@@ -442,7 +441,7 @@
 \r
        * imach.c: Summary: 0.98r0\r
 \r
-       - Some new graphs like suvival functions\r
+       - Some new graphs like survival functions\r
        - Some bugs fixed like model=1+age+V2.\r
 \r
        * ChangeLog, Makefile: Summary: 0.98r0\r
@@ -719,32 +718,12 @@
        probability to die within a month. Thanks to Chris\r
        Jackson for correcting this bug.  Former versions increased\r
        mortality artificially. The bad side is that we add another loop\r
-\r
-\r
        which slows down the processing. The difference can be up to 10%\r
-\r
-\r
        lower mortality.\r
 \r
-\r
-\r
-\r
-\r
 2002-05-30    <brouard@BROUARD>\r
-\r
-\r
-\r
-\r
-\r
        * \r
-\r
-\r
-\r
-\r
-\r
        * imach.c (Module): Add correlation matrix of one-step\r
-\r
-\r
        probabilities and covariance matrix\r
 \r
 \r

diff --git a/src/Makefile b/src/Makefile
index a90dc3b6f96410a2cc8773932edca084890f3e6f..c06127863f37bf68907060bd5732f0b31f53d688 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,14 @@ IMACHSETUPVERSION=icl
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
 
 #        Windows
+# sudo xlcem make _windowsonosx=1 imachICL32-setup 
+# sudo xlcem make _windowsonosx=1 imachICL64-setup
+# and then
+# On Emacs make _windowonosx=1 imachICL-set (and not imachICL-setup)
+
 # make _windowsonosx=1 imachICL-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
+# make _windowsonosx=1 imachICL64-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
+# make _windowsonosx=1 imachICL32-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make _windowsonosx=1 imachMVC-noreg-setup
 #
@@ -330,7 +337,7 @@ imachICL-build: imach.c
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
 
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat setup.iss 
+imachICL-set: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss  setup.iss 
        pwd
        touch setup.iss.in
        $(SETUPCOMP) /cc setup.iss
@@ -368,6 +375,10 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
        cd ../build/icl32
        VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
   --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+#      VBoxManage startvm "Windows7-64" --type headless
+#      VBoxManage list runningvms
+#      sudo xlcem VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+# --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 #VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
 # --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
@@ -389,7 +400,7 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VERSION).exe noreg-setup.iss
 
 imachICL64-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat
 
-imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat
+imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl32.bat
 
 imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat
 
@@ -730,8 +741,17 @@ upload:
 #      rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach-0.99r9-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach0.99r9.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach-0.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-       rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r21-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r21.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r22-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r22.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r23-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r23.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach-0.99r24-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#      rsync -v Output/imach0.99r24.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+       rsync -v Output/imach-0.99r24-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach-0.99r19-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #      rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download

diff --git a/src/README.txt b/src/README.txt
index da50bd1e805e2cc857891ddf89d910490129c167..1413778ef13338de678c9736253e107a23e941bf 100755 (executable)
--- a/src/README.txt
+++ b/src/README.txt
@@ -1,9 +1,4 @@
 Version IMaCh 0.99\r
-Parameter files have new undocumented parameters.\r
-Look at the archives of imach-users@listes.ined.fr for information.\r
-\r
-Current documentation on the web site is for 0.98 (before the\r
-introduction of varying covariates).\r
 \r
 Interpolated Marlov Chain (IMaCh program)\r
 \r
@@ -84,10 +79,23 @@ efficient on Windows 64 and current binaries are compiled with the
 Intel C compiler.  On OS/X the native LLVM C compiler from Apple is\r
 very efficient too.\r
 \r
-Usually IMaCh binaries are distributed under two subdirectories, 'bin' for the\r
-binaries which are imach.exe and gnuplot.exe and 'html' for some of the\r
-documentation, and 'mytry' in order to test the program on a parameter\r
-file named 'mypar.imach'.\r
+Usually IMaCh binaries are distributed under two subdirectories, 'bin'\r
+for the binaries which are imach.exe and gnuplot.exe and 'html' for\r
+some of the documentation, and 'mytry' in order to test the program on\r
+a parameter file named 'mypar.imach'. In order to use IMaCh, you need\r
+two text files, one is called the parameter file with extension .imach\r
+or .txt which contains few lines and the data file which can be juge\r
+according to the number of people surveyed.  You can find in the\r
+subdirectory doc of your installed package, some testing files like\r
+biaspar.imach and mypar.imach . If you edit such a parameter file, you\r
+will see a link to the data file, for exemple data1.txt . You can copy\r
+both files, parameter and data file into a private directory. Then run\r
+imach and drag the parameter file.\r
+\r
+You can access to the main IMaCh server at\r
+http://euroreves.ined.fr/imach but the main documentation is a wiki at\r
+http://euroreves.ined.fr/imach/wiki .  You can download the latest versions\r
+at http://euroreves.ined.fr/imach/Download .\r
 \r
 By default the file 'gnuplot.exe' is located on the same directory as\r
 imach and is used by imach with its absolute path. Thus, if you have\r

diff --git a/src/setup.iss b/src/setup.iss
index 95538be7c77cba12190d665b1195fea4cef1fea9..c8f3b056f3936601ef936209dbf7f22f1c32df9f 100644 (file)
--- a/src/setup.iss
+++ b/src/setup.iss
@@ -52,13 +52,13 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!\r
 \r
 [Setup]\r
-AppName=IMaCh-0.99r16\r
-AppVerName=IMaCh-0.99r16 Version 0.99r16\r
-AppCopyright=Copyright (C)  2002-2016 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-18\r
-DefaultDirName={pf}\IMaCh-0.99r16\r
+AppName=IMaCh-0.99r24\r
+AppVerName=IMaCh-0.99r24 Version 0.99r24\r
+AppCopyright=Copyright (C)  2002-2019 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19\r
+DefaultDirName={pf}\IMaCh-0.99r24\r
 DefaultGroupName=IMaCh\r
-OutputManifestFile=imach-0.99r16-icl-filelist.txt
-OutputBaseFilename=imach-0.99r16-icl-setup\r
+OutputManifestFile=imach-0.99r24-icl-filelist.txt
+OutputBaseFilename=imach-0.99r24-icl-setup\r
 UninstallDisplayIcon={app}\imach.exe\r
 Compression=lzma2\r
 SolidCompression=yes\r
@@ -79,12 +79,12 @@ ArchitecturesInstallIn64BitMode=x64
 ChangesAssociations=yes\r
 \r
 [Files]\r
-; Install IMaCh-x640.99r16.exe if running in 64-bit mode (x64; see above),\r
+; Install IMaCh-x640.99r24.exe if running in 64-bit mode (x64; see above),\r
 ; IMaCh.exe otherwise.\r
-;Source: "IMaCh-icl64-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-Source: "..\build\icl64\Release\IMaCh-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
-;Source: "IMaCh-icl32-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
-Source: "..\build\icl32\Release\IMaCh-0.99r16.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh-icl64-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "..\build\icl64\Release\IMaCh-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+;Source: "IMaCh-icl32-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+Source: "..\build\icl32\Release\IMaCh-0.99r24.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
 ;Source: "IMaCh.chm"; DestDir: "{app}\bin"\r
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc\r
 Source: README.txt; DestDir: {app}; Flags: isreadme\r
@@ -143,6 +143,11 @@ Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\d
 Source: ..\html\doc\data\mydata.txt; DestDir: {app}\doc\data\r
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc\r
 Source: ..\html\doc\data1.txt; DestDir: {app}\doc\r
+Source: ..\tests\testV1V2.imach; DestDir: {app}\tests\r
+Source: ..\tests\rtestV1V2.imach; DestDir: {app}\tests\r
+Source: ..\tests\testV2.imach; DestDir: {app}\tests\r
+Source: ..\tests\rtestV2.imach; DestDir: {app}\tests\r
+Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data\r
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:\r
 \r
 [Run]\r
@@ -164,8 +169,8 @@ Source: ..\html\doc\data1.txt; 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.99r16 0.99r16; IconFilename: {app}\imach.ico\r
-Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; Flags: runmaximized\r
+Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; IconFilename: {app}\imach.ico\r
+Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; 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
@@ -181,7 +186,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.99r16; Flags: uninsdeletekeyifempty\r
+Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r24; 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: 5.1; Flags: uninsdeletekeyifempty\r
 Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app}\r

diff --git a/src/setup.iss.in b/src/setup.iss.in
index 8706896c5cff8c5aad1419007b65c6711cf6008d..69b0178856eac16ca97efc1347d54e58b2f20b44 100644 (file)
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -2,6 +2,9 @@
 ; $Id$\r
 ;  $State$\r
 ;  $Log$
+;  Revision 1.16  2015/10/27 19:51:28  brouard
+;  Summary: some new subdirs
+;
 ;  Revision 1.15  2015/10/27 17:36:40  brouard
 ;  Summary: Adding gnuplot 5.1 with bin and etc for pango fonts
 ;
@@ -140,6 +143,11 @@ Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\d
 Source: ..\html\doc\data\mydata.txt; DestDir: {app}\doc\data\r
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc\r
 Source: ..\html\doc\data1.txt; DestDir: {app}\doc\r
+Source: ..\tests\testV1V2.imach; DestDir: {app}\tests\r
+Source: ..\tests\rtestV1V2.imach; DestDir: {app}\tests\r
+Source: ..\tests\testV2.imach; DestDir: {app}\tests\r
+Source: ..\tests\rtestV2.imach; DestDir: {app}\tests\r
+Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data\r
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps:\r
 \r
 [Run]\r