From 624f22a8720a4ad3e8d3a138fdb34bcfa730ad90 Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Tue, 15 Mar 2022 18:40:36 +0000 Subject: [PATCH] Summary:IMaCh-0.99r24 --- src/ChangeLog | 29 ++++------------------------- src/Makefile | 28 ++++++++++++++++++++++++---- src/README.txt | 26 +++++++++++++++++--------- src/setup.iss | 33 +++++++++++++++++++-------------- src/setup.iss.in | 8 ++++++++ 5 files changed, 72 insertions(+), 52 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 56459fa..ebda2e7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,12 +1,11 @@ -2021-03-31 Nicolas Brouard - +*Wed Mar 31 2021 Nicolas Brouard * imach.c (Module): Still bugs in the result loop. Thank to Holly Benett -2021-03-08 Nicolas Brouard +*2021-03-08 Nicolas Brouard * ./ (Module): Fixed bug on result: -2021-02-20 Nicolas Brouard +*2021-02-20 Nicolas Brouard * imach.c (Module): Fix bug on quitting after result lines! (Module): Version 0.99r21 @@ -442,7 +441,7 @@ * imach.c: Summary: 0.98r0 - - Some new graphs like suvival functions + - Some new graphs like survival functions - Some bugs fixed like model=1+age+V2. * ChangeLog, Makefile: Summary: 0.98r0 @@ -719,32 +718,12 @@ probability to die within a month. Thanks to Chris Jackson for correcting this bug. Former versions increased mortality artificially. The bad side is that we add another loop - - which slows down the processing. The difference can be up to 10% - - lower mortality. - - - - 2002-05-30 - - - - - * - - - - - * imach.c (Module): Add correlation matrix of one-step - - probabilities and covariance matrix diff --git a/src/Makefile b/src/Makefile index a90dc3b..c061278 100644 --- 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 da50bd1..1413778 100755 --- a/src/README.txt +++ b/src/README.txt @@ -1,9 +1,4 @@ Version IMaCh 0.99 -Parameter files have new undocumented parameters. -Look at the archives of imach-users@listes.ined.fr for information. - -Current documentation on the web site is for 0.98 (before the -introduction of varying covariates). Interpolated Marlov Chain (IMaCh program) @@ -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 very efficient too. -Usually IMaCh binaries are distributed under two subdirectories, 'bin' for the -binaries which are imach.exe and gnuplot.exe and 'html' for some of the -documentation, and 'mytry' in order to test the program on a parameter -file named 'mypar.imach'. +Usually IMaCh binaries are distributed under two subdirectories, 'bin' +for the binaries which are imach.exe and gnuplot.exe and 'html' for +some of the documentation, and 'mytry' in order to test the program on +a parameter file named 'mypar.imach'. In order to use IMaCh, you need +two text files, one is called the parameter file with extension .imach +or .txt which contains few lines and the data file which can be juge +according to the number of people surveyed. You can find in the +subdirectory doc of your installed package, some testing files like +biaspar.imach and mypar.imach . If you edit such a parameter file, you +will see a link to the data file, for exemple data1.txt . You can copy +both files, parameter and data file into a private directory. Then run +imach and drag the parameter file. + +You can access to the main IMaCh server at +http://euroreves.ined.fr/imach but the main documentation is a wiki at +http://euroreves.ined.fr/imach/wiki . You can download the latest versions +at http://euroreves.ined.fr/imach/Download . By default the file 'gnuplot.exe' is located on the same directory as imach and is used by imach with its absolute path. Thus, if you have diff --git a/src/setup.iss b/src/setup.iss index 95538be..c8f3b05 100644 --- a/src/setup.iss +++ b/src/setup.iss @@ -52,13 +52,13 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES! [Setup] -AppName=IMaCh-0.99r16 -AppVerName=IMaCh-0.99r16 Version 0.99r16 -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 -DefaultDirName={pf}\IMaCh-0.99r16 +AppName=IMaCh-0.99r24 +AppVerName=IMaCh-0.99r24 Version 0.99r24 +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 +DefaultDirName={pf}\IMaCh-0.99r24 DefaultGroupName=IMaCh -OutputManifestFile=imach-0.99r16-icl-filelist.txt -OutputBaseFilename=imach-0.99r16-icl-setup +OutputManifestFile=imach-0.99r24-icl-filelist.txt +OutputBaseFilename=imach-0.99r24-icl-setup UninstallDisplayIcon={app}\imach.exe Compression=lzma2 SolidCompression=yes @@ -79,12 +79,12 @@ ArchitecturesInstallIn64BitMode=x64 ChangesAssociations=yes [Files] -; Install IMaCh-x640.99r16.exe if running in 64-bit mode (x64; see above), +; Install IMaCh-x640.99r24.exe if running in 64-bit mode (x64; see above), ; IMaCh.exe otherwise. -;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" Source: ..\html\doc\imach.htm; DestDir: {app}\doc Source: README.txt; DestDir: {app}; Flags: isreadme @@ -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 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc Source: ..\html\doc\data1.txt; DestDir: {app}\doc +Source: ..\tests\testV1V2.imach; DestDir: {app}\tests +Source: ..\tests\rtestV1V2.imach; DestDir: {app}\tests +Source: ..\tests\testV2.imach; DestDir: {app}\tests +Source: ..\tests\rtestV2.imach; DestDir: {app}\tests +Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps: [Run] @@ -164,8 +169,8 @@ Source: ..\html\doc\data1.txt; 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.99r16 0.99r16; IconFilename: {app}\imach.ico -Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r16 0.99r16; Flags: runmaximized +Name: {group}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; IconFilename: {app}\imach.ico +Name: {userdesktop}\IMaCH; Filename: {app}\bin\imach.exe; Comment: IMaCh-0.99r24 0.99r24; 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 @@ -181,7 +186,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.99r16; Flags: uninsdeletekeyifempty +Root: HKLM; Subkey: Software\IMaCh\imach; ValueType: string; ValueName: Current Version; ValueData: 0.99r24; 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: 5.1; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\IMaCh\gnuplot; ValueType: string; ValueName: InstallPath; ValueData: {app} diff --git a/src/setup.iss.in b/src/setup.iss.in index 8706896..69b0178 100644 --- a/src/setup.iss.in +++ b/src/setup.iss.in @@ -2,6 +2,9 @@ ; $Id$ ; $State$ ; $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 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc Source: ..\html\doc\data1.txt; DestDir: {app}\doc +Source: ..\tests\testV1V2.imach; DestDir: {app}\tests +Source: ..\tests\rtestV1V2.imach; DestDir: {app}\tests +Source: ..\tests\testV2.imach; DestDir: {app}\tests +Source: ..\tests\rtestV2.imach; DestDir: {app}\tests +Source: ..\tests\data\data2.txt; DestDir: {app}\tests\data ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps: [Run] -- 2.43.0