From afc4437947954600a4864fee59f309887f50716c Mon Sep 17 00:00:00 2001 From: nbrouard Date: Mon, 5 Aug 2024 18:02:53 +0200 Subject: [PATCH] Adapting Makefile and ChangeLog to git --- CMakeLists.txt | 3 + src/ChangeLog | 2613 ++++++++++++++++++++++++++++++++++++------------ src/Makefile | 12 +- 3 files changed, 2012 insertions(+), 616 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22a885b..e1b8fc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,7 @@ install(FILES "html/doc/mypar.imach" DESTINATION "${DOCDIR}") install(FILES "html/doc/data/mydata.txt" DESTINATION "${DOCDIR}/data") install(FILES "html/doc/biaspar.imach" DESTINATION "${DOCDIR}") install(FILES "html/doc/data1.txt" DESTINATION "${DOCDIR}") +install(FILES "src/ChangeLog" DESTINATION "${DOCDIR}") install(FILES "src/README.txt" DESTINATION "${DOCDIR}") #install(FILES "tests/testV1V2.imach" DESTINATION "${TESTDIR}") install(FILES "tests/rtestV1V2.imach" DESTINATION "${TESTDIR}") @@ -150,6 +151,8 @@ IF(UNIX) # This a .spec Changelog not an Emacs ChangeLog that you get with C-x v a (vc-update-change-log) # * Mon May 20 2019 Brouard Nicolas # ${CMAKE_CURRENT_SOURCE_DIR}/specchangelog") +# set(CPACK_RPM_CHANGELOG_FILE "${PROJECT_SOURCE_DIR}/src/ChangeLog") +# set(CPACK_RPM_CHANGELOG_FILE "${PROJECT_SOURCE_DIR}/src/CHANGELOG.md") set(CPACK_RPM_CHANGELOG_FILE "${PROJECT_SOURCE_DIR}/src/ChangeLog") SET(CPACK_BINARY_RPM "ON") # set(CPACK_RPM_COMPONENT_INSTALL ON) diff --git a/src/ChangeLog b/src/ChangeLog index 66be075..3ff5632 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,983 +1,2370 @@ -2024-07-08 Nicolas Brouard - - * imach.c (Module): Some bug fixes: in drawings when age*age is - included in the model as well as with quantitative variables. - -2024-07-02 Nicolas Brouard - - * imach.c (Module): Trying compiling on Linux with clang (instead - of gcc which is too slow) and lot of warnings suppressed - -2024-06-28 Nicolas Brouard - - * imach.c (Module): fixing some bugs in gnuplot and quantitative - variables, but not completely solved - -2024-06-28 Nicolas Brouard - - * imach.c (Module): s6 errors with age*age (harmless). +* Fri Jul 19 2024 N. Brouard (a18761f) +- Summary: Makfile for git -2024-05-12 Nicolas Brouard - - * imach.c Version 0.99s5 In fact, the covariance of total life - expectancy e.. with a partial life expectancy e.j is high, - therefore the complete matrix of variance covariance has to be - included in the formula of the standard error of the proportion of - total life expectancy spent in a specific state: - var(X/Y)=mu_x^2/mu_y^2*(sigma_x^2/mu_x^2 -2 - sigma_xy/mu_x/mu_y+sigma^2/mu_y^2). Also an error with mle=-3 - made the program core dump. It is fixed in this version. +* Fri Jul 19 2024 N. Brouard (a739b6f) +- *** empty log message *** -2024-04-30 Nicolas Brouard +* Fri Jul 19 2024 N. Brouard (f115ef4) +- Summary: before git - * (Module): In version 0.99s4, we incorporated the calculation of - the std error of the proportion of total life expectancy spent in - a specific state Var(e.j/e..) using the formula of Var(X/Y) - depending only of the variances of X and Y and expectancies. +* Fri Jul 19 2024 N. Brouard (30017a7) +- Summary: Example -2024-04-24 Nicolas Brouard +* Fri Jul 19 2024 N. Brouard (e9790ab) +- *** empty log message *** - * (Module): This version comes late after having tested - successfully the praxis C version of Buckhardt. But Buckardt's - version was difficult to read and Gegenfurtner's version had a few - typos which made its results less reliable than Buckhardt's - results. The most important work consisted in retyping the Brent - original PRAXIS program written in Algol W (published with errors, - ommitting the transposition of matrix V before its QR reduction - from Golub. I used the recent "awe" compiler from Gkynn Webster. - The awe library had errors, for example in arc tangent function - which have been fixed. +* Fri Jul 19 2024 N. Brouard (2abde74) +- *** empty log message *** - The main objective was to get identical results with the three - versions: (1) Algol W, (2) Buckhardt'C version as well (3) - Gegenfürtner C versions on the various test functions published by - Brent in 1973 in Algol W. +* Fri Jul 19 2024 N. Brouard (66e1fdf) +- *** empty log message *** - Also, in order to compare them, the random function had to produce - the same sequence for the 3 softwares. The random function used in - imach corresponds to original Brent's random function written in - Algol W. Other point, in Algol W, the arrays of dimension n are - 'normal' mathematical arrays starting from 1 to n. But this is a - real issue in C where, by default, arrays are starting from 0 to - n-1. In Buckhardt, as well as in Gegenfürtner C code, it can be - seen that authors while trying to mimick original Brent Algol W - code are hesitating by changing either a loop originally from 1 to - n in a loop from 0 to n-1, or keeping Brent's loop from 1 to n and - shifting the index from original X(I) in Algol W to x[i-1] in C. - But as IMaCh is using, since the beginning, the Numerical Recipes - functions vector or matrix, I changed Geggenfürtner code to mimick - the original Algol W arrays. Thus the X(I) is translated in C as - x[i] which minimizes the errors. The Golub QR algorithm was - published in Algol with overflow errors which were reproduced in - Brent's Algol W code. Buckhardt code fixed these errors which are - much more problematic in C than in Algol W. Thus Buckhardt code - seems very safe, but i haven't chosen it for IMaCh because the C - style is horrible and almost unreadable compared to Gegenfürtner - CO code which is very close to Brent's original. Also what makes - Buckhardt code more difficult to read is, instead of passing the - minimum of parameters in the functions calls, as it is in Algol - Brent's code or Gegenfürtner's code, the list of parameters is - high. For example, the flin function LONG REAL PROCEDURE FLIN - (LONG REAL VALUE L) has only one parameter in Algol W, the - Gegenfürtner flin function had two parameters: static double - flin(l, j) double l; { int i; double tflin[N];} but Buckhardt - function has 14 parameters which makes the code unreadable and - useless. Gegenfürtner used a lot of static variables or functions - which I tried to minimize. Also in Gegefürtner, array dimensions - were fixed to N. In my adaptation the flin is static double - flin(double l, int j) and the parameter used are global variables. +* Fri Jul 19 2024 N. Brouard (879f70f) +- Summary: removing gnuplot from distribution -2023-06-14 Nicolas Brouard +* Fri Jul 19 2024 N. Brouard (f315300) +- Summary: removing gnuplot - * imach.c (Module): Testing if conjugate gradient could be quicker - when lot of variables POWELLORIGINCONJUGATE +* Mon Jul 08 2024 N. Brouard (36bb754) +- Summary: 0.99s7* imach.c (Module): Some bug fixes: in drawings when age*age is +included in the model as well as with quantitative variables. -2023-05-23 Nicolas Brouard - * imach.c (Module): Fixed PROB_r +* Mon Jul 08 2024 N. Brouard (5e2a65b) +- Summary: 0.99s7 -2023-05-22 Nicolas Brouard +* Tue Jul 02 2024 N. Brouard (de227ae) +- *** empty log message *** - * imach.c (Module): In the ILK....txt file, the number of columns - before the covariates values is dependent of the number of states (16+nlstate): 0.99r46 +* Tue Jul 02 2024 N. Brouard (85cf04e) +- Summary: trying clang on Linux -2023-05-08 Nicolas Brouard +* Tue Jul 02 2024 N. Brouard (3d2ac0c) +- Summary: trying clang compiler on Linux - * (Module): Error V0 when result:. and model 1+age+V1: fixed +* Sun Jun 30 2024 N. Brouard (fcccf9d) +- *** empty log message *** -2023-04-29 Nicolas Brouard +* Fri Jun 28 2024 N. Brouard (48856ff) +- * imach.c (Module): fixing some bugs in gnuplot and quantitative variables, but not completely solved - * imach.c (Module): Inverting the model equation and fixingg bugs - in the drawings - "1+age+V7*V4*age+V6*V4*age+V7*V3*age+V6*V3*age+V6*V2*age+V7*age+V6*age+V4*age+V3*age+V2*age+V7*V4+V6*V4+V7*V3+V6*V3+V7*V2+V6*V2+V7+V6+V4+V3+V2\000\0003+V2" +* Fri Jun 28 2024 N. Brouard (2217259) +- Summary: 0.99s6 -2023-04-24 Nicolas Brouard +* Fri Jun 28 2024 N. Brouard (b64b89d) +- * imach.c (Module): fixing some bugs in gnuplot and quantitative variables, but not completely solved - * imach.c (Module): some bugs in printinggnuplot +* Fri Jun 28 2024 N. Brouard (c3375b5) +- Summary: Adding log lines too -2022-09-19 Nicolas Brouard +* Fri Jun 28 2024 N. Brouard (9396e76) +- Summary: 0.99s6 - * imach.c (Module): Version 0.99r42 needed a newer version of - Gnuplot. But newer version 0.99r43 should run with the Gnuplot - version 5.0 or 5.1 distributed with IMaCh. +* Fri Jun 28 2024 N. Brouard (4b9a2ca) +- Summary: 0.99s6* imach.c (Module): s6 errors with age*age (harmless). -2022-09-18 Nicolas Brouard - * imach.c (Module): Fixing when a state in the data is 0 or higher - than lstate+ndeath. Fixing the plot of contribution to Likelihood. +* Fri Jun 28 2024 N. Brouard (774a9da) +- Summary: s6 -2022-09-16 Nicolas Brouard +* Sun May 12 2024 N. Brouard (43a2132) +- Summary: Version 0.99s5* src/imach.c Version 0.99s5 In fact, the covariance of total life +expectancy e.. with a partial life expectancy e.j is high, +therefore the complete matrix of variance covariance has to be +included in the formula of the standard error of the proportion of +total life expectancy spent in a specific state: +var(X/Y)=mu_x^2/mu_y^2*(sigma_x^2/mu_x^2 -2 +sigma_xy/mu_x/mu_y+sigma^2/mu_y^2). Also an error with mle=-3 +made the program core dump. It is fixed in this version. - * imach.c (Module): 0.99r41 Was an error when product of timevarying and fixed. Using FixedV[of name] now. Thank you Feinuo -2022-09-14 Nicolas Brouard +* Sun May 12 2024 N. Brouard (10c0072) +- Summary: Version 0.99s5 - * imach.c (Module): Fixing names of variables in T_ (thanks to Feinuo) +* Tue Apr 30 2024 N. Brouard (a596ac0) +- *** empty log message *** -2022-09-14 Nicolas Brouard +* Tue Apr 30 2024 N. Brouard (6afc5f1) +- Summary: version 0.99s4 - * imach.c (Module): Version 0.99r39 with colored dummy covariates - (fixed or time varying), using new last columns of - ILK_parameter.txt file. +* Tue Apr 30 2024 N. Brouard (5f25f7f) +- Summary: Version 0.99s4 and estimation of std of e.j/e.. -2022-09-11 Nicolas Brouard +* Tue Apr 30 2024 N. Brouard (1e28d3c) +- Summary: version 0.99s4 and std of e.j/e.. - * imach.c (Module): Adding timevarying products of any kinds, - should work before shifting cotvar from ncovcol+nqv columns in - order to have a correspondance between the column of cotvar and - the id of column. - (Module): Some cleaning and adding covariates in ILK.txt +* Wed Apr 24 2024 N. Brouard (30f643b) +- Summary: First IMaCh version using Brent Praxis software based on Buckhardt and Gegenfürtner C codes -2022-09-09 Nicolas Brouard +* Wed Apr 24 2024 N. Brouard (69cbe1b) +- Summary: First IMaCh version using Brent Praxis software based on Buckhardt and Gegenfürtner C codes - * imach.c (Module): Many improvements for fixing products of fixed - timevarying as well as fixed * fixed, and test with quantitative - covariate. +* Wed Apr 24 2024 N. Brouard (4a1123a) +- Summary: First IMaCh version using praxis method and adapted C code from Gegenfürtner -2022-09-04 Nicolas Brouard +* Sat Feb 03 2024 N. Brouard (799cd8b) +- Summary: Random from Brent in Algol W - * imach.c (Module): Now the easy runs i.e. without result or - model=1+age only did not work. The defautl combination should be 1 - and not 0 because everything hasn't been tranformed yet. +* Sat Feb 03 2024 N. Brouard (1609c72) +- Summary: praxis procedure as published by brent 1973With the minimum of modifications to run the tests and to be called by a C main. -2022-09-02 Nicolas Brouard - * imach.c: Version 0.99r35 because it outputs same results with - 1+age+V1+V1*age for females and 1+age for females only - (education=1 noweight) +* Sat Feb 03 2024 N. Brouard (d02a9f4) +- Summary: Imach calling praxis.alw -2022-08-31 Nicolas Brouard +* Mon Oct 09 2023 N. Brouard (08f1caf) +- Summary: trying to reconsider - * imach.c (Module): Some improvments in fichtm and many verifications 0.99r34 +* Thu Jul 20 2023 N. Brouard (4adeeda) +- *** empty log message *** -2022-08-21 Nicolas Brouard +* Wed Jul 19 2023 N. Brouard (ec1eb35) +- *** empty log message *** - * imach.c (Module): Version 0.99r33 A lot of changes in - reassigning covariates: my first idea was that people will always - use the first covariate V1 into the model but in fact they are - producing data with many covariates and can use an equation model - with some of the covariate; it means that in a model V2+V3 instead - of codtabm(k,Tvaraff[j]) which calculates for combination k, for - three covariates (V1, V2, V3) the value of Tvaraff[j], but in fact - the equation model is restricted to two variables only (V2, V3) - and the combination for V2 should be codtabm(k,1) instead of - (codtabm(k,2), and the code should be - codtabm(k,TnsdVar[Tvaraff[j]]. Many many changes have been - made. All of these should be simplified once a day like we did in - hpxij() for example by using precov[nres] which is computed in - decoderesult for each nres of each resultline. Loop should be done - on the equation model globally by distinguishing only product with - age (which are changing with age) and no more on type of - covariates, single dummies, single covariates. +* Fri Jul 14 2023 N. Brouard (ac9c89d) +- Summary: R program to provie simulated data for IMaCh -2022-08-06 Nicolas Brouard +* Thu Jun 22 2023 N. Brouard (3c1d71f) +- Summary: stil on going - * imach.c (Module): Version of imach using partly decoderesult to rebuild xpxij function +* Thu Jun 22 2023 N. Brouard (7dfc504) +- *** empty log message *** -2022-08-03 Nicolas Brouard +* Thu Jun 22 2023 N. Brouard (1f92194) +- Summary: with svd but not working yet - * imach.c (Module): Many errors in graphs fixed with Vn*age covariates. +* Wed Jun 14 2023 N. Brouard (aeaa12b) +- * imach.c (Module): Testing if conjugate gradient could be quicker when lot of variables POWELLORIGINCONJUGATE -2022-07-25 Brouard Nicolas - - * imach.c (Module): Error cptcovn instead of nsd in bmij (was - coredumped, revealed by Feiuno, thank you. +* Wed Jun 14 2023 N. Brouard (c138dd1) +- * imach.c (Module): Testing if conjugate gradient could be quicker when lot of variables POWELLORIGINCONJUGATE -2022-07-23 Nicolas Brouard +* Tue May 23 2023 N. Brouard (90e517b) +- *** empty log message *** - * r29 W and not sqrt(Wald) +* Tue May 23 2023 N. Brouard (41330d9) +- Summary: 0.99r46* imach.c (Module): Fixed PROB_r -2022-07-22 Nicolas Brouard - * imach.c (Module): Output of Wald test in the htm file and not only in the log. +* Mon May 22 2023 N. Brouard (788efc0) +- Summary: 0.99r46* imach.c (Module): In the ILK....txt file, the number of columns +before the covariates values is dependent of the number of states (16+nlstate): 0.99r46 -2022-06-02 Brouard Nicolas - - * imach.c (Module): Adding the Wald tests from the log to the main - htm for better display of the maximum likelihood estimators. -2022-05-30 Brouard Nicolas +* Mon May 22 2023 N. Brouard (fbbb6b1) +- Summary: O.99r46 - * imach.c: With products of covariates (age or dummies or - quantitatives), estimates of parameters were good but when - estimating variances the positions of newly created covariates - were wrongly assigned and results were wrong. Thank to Feinua_Sun! +* Sun May 21 2023 N. Brouard (ecc0c07) +- Summary: Temporary change for imachprax -2022-05-24 Nicolas Brouard +* Mon May 08 2023 N. Brouard (be94f32) +- *** empty log message *** - * imach.c (Module): Some attempts to find a bug of wrong estimates - of confidencce intervals with product in the equation modelC +* Mon May 08 2023 N. Brouard (ba8be5f) +- *** empty log message *** -2022-05-15 Nicolas Brouard +* Sat Apr 29 2023 N. Brouard (fdccc97) +- Summary: 099r45 - * imach.c (Module): Some minor improvements +* Sat Apr 29 2023 N. Brouard (31077a4) +- *** empty log message *** -2022-04-13 Brouard Nicolas +* Sat Apr 29 2023 N. Brouard (3e54ec4) +- *** empty log message *** - * imach.c (Module): Adding link to text data files +* Sat Apr 29 2023 N. Brouard (f76ca44) +- Summary: 099r45 -2022-04-11 Nicolas Brouard +* Mon Apr 24 2023 N. Brouard (c81e5dd) +- *** empty log message *** - * imach.c (Module): Error in rewriting the 'r' file with yearsfproj or yearsbproj fixed +* Sat Apr 22 2023 N. Brouard (b00fef3) +- Summary: 099r45 -2022-04-05 Brouard Nicolas +* Tue Jan 31 2023 N. Brouard (25d261e) +- Summary: version s1 with praxis instead of Powell for large models with age and difficulties to converge - * imach.c (Module): Fixed covariates (dummy or quantitative) +* Tue Jan 31 2023 N. Brouard (6ebc177) +- Summary: r45 with age*Vn*Vm still Powell (and difficulties to converge, needs to look at Brent Praxis + +* Tue Jan 31 2023 N. Brouard (e7c2b2b) +- Summary: Improvements in models with age*Vn*Vm + +* Tue Sep 20 2022 N. Brouard (926eb4a) +- *** empty log message *** + +* Tue Sep 20 2022 N. Brouard (23ddd2d) +- Summary: version 0.99r43* imach.c (Module): Version 0.99r42 needed a newer version of +Gnuplot. But newer version 0.99r43 should run with the Gnuplot +version 5.0 or 5.1 distributed with IMaCh. + + +* Mon Sep 19 2022 N. Brouard (11435c4) +- Summary: version 0.99r43 + +* Sun Sep 18 2022 N. Brouard (c2f63ea) +- *** empty log message *** + +* Sun Sep 18 2022 N. Brouard (953a40a) +- Summary: version 0.99r42 + +* Fri Sep 16 2022 N. Brouard (f137377) +- * src/imach.c (Module): 0.99r41 Was an error when product of timevarying and fixed. Using FixedV[of name] now. Thank you Feinuo + +* Fri Sep 16 2022 N. Brouard (6f1ccd4) +- *** empty log message *** + +* Fri Sep 16 2022 N. Brouard (1811039) +- Summary: Version 0.99r41* imach.c (Module): 0.99r41 Was an error when product of timevarying and fixed. Using FixedV[of name] now. Thank you Feinuo + + +* Wed Sep 14 2022 N. Brouard (91a5224) +- Summary: version 0.99r40 + +* Wed Sep 14 2022 N. Brouard (aeed544) +- Summary: 0.99r40 + +* Wed Sep 14 2022 N. Brouard (27dd0b7) +- Summary: version 0.99r40* imach.c (Module): Fixing names of variables in T_ (thanks to Feinuo) + + +* Wed Sep 14 2022 N. Brouard (6a74cec) +- Summary: version 0.99r39* imach.c (Module): Version 0.99r39 with colored dummy covariates +(fixed or time varying), using new last columns of +ILK_parameter.txt file. + + +* Wed Sep 14 2022 N. Brouard (bafd70f) +- Summary: 0.99r39 + +* Sun Sep 11 2022 N. Brouard (d117b9f) +- Summary: 0.99r38* imach.c (Module): Adding timevarying products of any kinds, +should work before shifting cotvar from ncovcol+nqv columns in +order to have a correspondance between the column of cotvar and +the id of column. +(Module): Some cleaning and adding covariates in ILK.txt + + +* Sun Sep 11 2022 N. Brouard (9566b98) +- Summary: Version 0.99r38 + +* Sun Sep 11 2022 N. Brouard (cb85340) +- Summary: Version 0.99r38After adding change in cotvar. + + +* Sun Sep 11 2022 N. Brouard (d2bf4ed) +- Summary: 0.99r37 + +* Sun Sep 11 2022 N. Brouard (a9f3ca7) +- Summary: Version imach 0.99r37* imach.c (Module): Adding timevarying products of any kinds, +should work before shifting cotvar from ncovcol+nqv columns in +order to have a correspondance between the column of cotvar and +the id of column. + + +* Fri Sep 09 2022 N. Brouard (ca250b7) +- Summary: version 0.99r37 + +* Fri Sep 09 2022 N. Brouard (9d9f6cc) +- Summary: version 0.99r37* imach.c (Module): Many improvements for fixing products of fixed +timevarying as well as fixed * fixed, and test with quantitative +covariate. + + +* Sun Sep 04 2022 N. Brouard (c70577c) +- Summary: 0.99r36* imach.c (Module): Now the easy runs i.e. without result or +model=1+age only did not work. The defautl combination should be 1 +and not 0 because everything hasn't been tranformed yet. + + +* Sun Sep 04 2022 N. Brouard (ae95758) +- *** empty log message *** + +* Sun Sep 04 2022 N. Brouard (ccede37) +- Summary: 0.99r36 + +* Fri Sep 02 2022 N. Brouard (cba89df) +- Summary: version 0.99r35* src/imach.c: Version 0.99r35 because it outputs same results with +1+age+V1+V1*age for females and 1+age for females only +(education=1 noweight) + + +* Fri Sep 02 2022 N. Brouard (17a7757) +- Summary: 0.99r35 + +* Wed Aug 31 2022 N. Brouard (607b6f7) +- *** empty log message *** + +* Wed Aug 31 2022 N. Brouard (efea245) +- Summary: Typo + +* Wed Aug 31 2022 N. Brouard (ed220c1) +- *** empty log message *** + +* Wed Aug 31 2022 N. Brouard (de7dbf1) +- Summary: version 0.99r34 + +* Wed Aug 31 2022 N. Brouard (94c0f85) +- Summary: Version 0.99r34 + +* Wed Aug 31 2022 N. Brouard (4aa23e9) +- Summary: improvements... + +* Thu Aug 25 2022 N. Brouard (544f17d) +- Summary: In progress for quantitative + +* Sun Aug 21 2022 N. Brouard (71cf7a4) +- *** empty log message *** + +* Sun Aug 21 2022 N. Brouard (9268ea4) +- *** empty log message *** + +* Sun Aug 21 2022 N. Brouard (41b4f43) +- * src/imach.c (Module): Version 0.99r33 A lot of changes in reassigning covariates: my first idea was that people will always use the first covariate V1 into the model but in fact they are producing data with many covariates and can use an equation model with some of the covariate; it means that in a model V2+V3 instead of codtabm(k,Tvaraff[j]) which calculates for combination k, for three covariates (V1, V2, V3) the value of Tvaraff[j], but in fact the equation model is restricted to two variables only (V2, V3) and the combination for V2 should be codtabm(k,1) instead of (codtabm(k,2), and the code should be codtabm(k,TnsdVar[Tvaraff[j]]. Many many changes have been made. All of these should be simplified once a day like we did in hpxij() for example by using precov[nres] which is computed in decoderesult for each nres of each resultline. Loop should be done on the equation model globally by distinguishing only product with age (which are changing with age) and no more on type of covariates, single dummies, single covariates. + +* Sun Aug 21 2022 N. Brouard (7fb2e63) +- Summary: Version 0.99r33* src/imach.c (Module): Version 0.99r33 A lot of changes in +reassigning covariates: my first idea was that people will always +use the first covariate V1 into the model but in fact they are +producing data with many covariates and can use an equation model +with some of the covariate; it means that in a model V2+V3 instead +of codtabm(k,Tvaraff[j]) which calculates for combination k, for +three covariates (V1, V2, V3) the value of Tvaraff[j], but in fact +the equation model is restricted to two variables only (V2, V3) +and the combination for V2 should be codtabm(k,1) instead of +(codtabm(k,2), and the code should be +codtabm(k,TnsdVar[Tvaraff[j]]. Many many changes have been +made. All of these should be simplified once a day like we did in +hpxij() for example by using precov[nres] which is computed in +decoderesult for each nres of each resultline. Loop should be done +on the equation model globally by distinguishing only product with +age (which are changing with age) and no more on type of +covariates, single dummies, single covariates. + + +* Sun Aug 21 2022 N. Brouard (af22bae) +- Summary: Version 0.99r33 + +* Sun Aug 07 2022 N. Brouard (69ef0b6) +- *** empty log message *** + +* Sat Aug 06 2022 N. Brouard (4a7dc4a) +- *** empty log message *** + +* Sat Aug 06 2022 N. Brouard (9cac7d1) +- Summary: last 0.99r31* imach.c (Module): Version of imach using partly decoderesult to rebuild xpxij function + + +* Wed Aug 03 2022 N. Brouard (161ce18) +- *** empty log message *** + +* Wed Aug 03 2022 N. Brouard (1539b63) +- Summary: 0.99r31 + +* Wed Aug 03 2022 N. Brouard (68387ef) +- * imach.c (Module): Many errors in graphs fixed with Vn*age covariates. + +* Wed Jul 27 2022 N. Brouard (a4faedb) +- Summary: valgrind bug fixed by initializing to zero DummyV as well as Tage + +* Wed Jul 27 2022 N. Brouard (1b1a92a) +- *** empty log message *** + +* Wed Jul 27 2022 N. Brouard (7307aaa) +- Summary: Still a problem for one-step probabilities in case of quantitative variables + +* Tue Jul 26 2022 N. Brouard (caf1349) +- Summary: some test with nres=1 + +* Mon Jul 25 2022 N. Brouard (2cf0987) +- *** empty log message *** + +* Mon Jul 25 2022 N. Brouard (10f646e) +- Summary: r30 + +* Mon Jul 25 2022 N. Brouard (7d8ad62) +- Summary: r30* imach.c (Module): Error cptcovn instead of nsd in bmij (was +coredumped, revealed by Feiuno, thank you. + + +* Sat Jul 23 2022 N. Brouard (5af2544) +- *** empty log message *** + +* Sat Jul 23 2022 N. Brouard (acdb1bd) +- Summary: r29 + +* Fri Jul 22 2022 N. Brouard (e91aff6) +- *** empty log message *** + +* Fri Jul 22 2022 N. Brouard (34c519a) +- * imach.c (Module): Output of Wald test in the htm file and not only in the log. + +* Fri Jul 22 2022 N. Brouard (26524eb) +- * imach.c (Module): Output of Wald test in the htm file and not only in the log. + +* Fri Jul 22 2022 N. Brouard (c99b7c1) +- Summary: r28 + +* Fri Jul 22 2022 N. Brouard (6167921) +- Summary: r28* imach.c (Module): Output of Wald test in the htm file and not only in the log. + + +* Fri Jul 22 2022 N. Brouard (810ac31) +- *** empty log message *** + +* Thu Jun 02 2022 N. Brouard (a99ded2) +- *** empty log message *** + +* Thu Jun 02 2022 N. Brouard (a7d19d5) +- * imach.c (Module): Adding the Wald tests from the log to the main htm for better display of the maximum likelihood estimators. + +* Mon May 30 2022 N. Brouard (9892e16) +- *** empty log message *** + +* Tue May 24 2022 N. Brouard (71919d3) +- * imach.c (Module): Some attempts to find a bug of wrong estimates of confidencce intervals with product in the equation modelC + +* Tue May 24 2022 N. Brouard (0280580) +- *** empty log message *** + +* Sun May 15 2022 N. Brouard (b8029b2) +- * imach.c (Module): Some minor improvements + +* Wed May 11 2022 N. Brouard (b3dc031) +- Summary: r27 + +* Wed May 11 2022 N. Brouard (33a3c9b) +- *** empty log message *** + +* Wed May 11 2022 N. Brouard (49dc8c3) +- Summary: Test + +* Wed Apr 13 2022 N. Brouard (2e7bcfa) +- Summary: r27 + +* Wed Apr 13 2022 N. Brouard (84940a9) +- * imach.c (Module): Adding link to text data files + +* Mon Apr 11 2022 N. Brouard (28e75a1) +- *** empty log message *** + +* Mon Apr 11 2022 N. Brouard (7cc4c30) +- * imach.c (Module): Error in rewriting the 'r' file with yearsfproj or yearsbproj fixed + +* Mon Apr 11 2022 N. Brouard (7e84972) +- *** empty log message *** + +* Tue Apr 05 2022 N. Brouard (1561303) +- *** empty log message *** + +* Tue Apr 05 2022 N. Brouard (957bf82) +- *** empty log message *** + +* Tue Apr 05 2022 N. Brouard (129536a) +- Summary: Fixed quantitative covariates Fixed covariates (dummy or quantitative) with missing values have never been allowed but are ERRORS and program quits. Standard deviations of fixed covariates were wrongly computed. Mean and standard deviations of time varying covariates are still not computed. -2022-03-17 Brouard Nicolas - * 99r25 Improvements in fixing discrepancies between covariates - missing in result line but in model. +* Thu Mar 17 2022 N. Brouard (03ce527) +- *** empty log message *** + +* Thu Mar 17 2022 N. Brouard (9429a55) +- *** empty log message *** + +* Thu Mar 17 2022 N. Brouard (e8d7960) +- Summary: r25 + +* Thu Mar 17 2022 N. Brouard (3d9fdcc) +- Summary: 99r25Improving detection of errors: result lines should be compatible with +the model. + + +* Thu Mar 17 2022 N. Brouard (393aef9) +- *** empty log message *** + +* Wed Mar 16 2022 N. Brouard (fea8370) +- Summary:IMaCh-0.99r24 + +* Tue Mar 15 2022 N. Brouard (0ee87b9) +- Summary: IMaCh-0.99r24 + +* Tue Mar 15 2022 N. Brouard (624f22a) +- Summary:IMaCh-0.99r24 + +* Mon May 24 2021 N. Brouard (a702058) +- Summary: Adding symbolic link to imach + +* Sat May 22 2021 N. Brouard (920618d) +- Summary: gnuplot 5.0 for gnulinux too + +* Sat May 22 2021 N. Brouard (954326e) +- Summary: imach.1 added + +* Thu May 20 2021 N. Brouard (691f16b) +- Summary: Version 0.99r24 + +* Wed Mar 31 2021 N. Brouard (26e7861) +- Summary: Version 0.99r23Bugs in the relsutlines solved + + +* Wed Mar 31 2021 N. Brouard (33d00be) +- Summary: Version 0.99r23 + +* Wed Mar 31 2021 N. Brouard (861882c) +- Summary: version 0.99r23 + +* Wed Mar 31 2021 N. Brouard (d683c8f) +- Summary: Version 0.99r23* imach.c (Module): Still bugs in the result loop. Thank to Holly Benett + + +* Mon Mar 08 2021 N. Brouard (00fbaf0) +- Summary: 0.99r22 fixed bug on result: + +* Sat Feb 20 2021 N. Brouard (b5298ee) +- *** empty log message *** + +* Sat Feb 20 2021 N. Brouard (0ff6757) +- Summary: Version 0.99r21* imach.c (Module): Fix bug on quitting after result lines! +(Module): Version 0.99r21 + + +* Sat Feb 20 2021 N. Brouard (01a7c6e) +- *** empty log message *** + +* Sat Feb 20 2021 N. Brouard (deef2f9) +- * imach.c (Module): Fix bug on quitting after result lines! + +* Fri Feb 12 2021 N. Brouard (8c6d96a) +- * imach.c (Module): The use of a Windows BOM (huge) file is now an error + +* Fri Feb 12 2021 N. Brouard (212d8c8) +- *** empty log message *** + +* Thu Feb 11 2021 N. Brouard (5bffc7c) +- * (Module): imach.c Someone entered 'results:' instead of 'result:'. Now it is an error which is printed. + +* Thu Feb 11 2021 N. Brouard (7002119) +- Summary: results: instead of result: is now an error which is displayed + +* Sat Feb 22 2020 N. Brouard (cf57c7e) +- Summary: r20 + +* Sat Feb 22 2020 N. Brouard (8eb211b) +- * (Module): imach.c Update mle=-3 (for computing Life expectancy and life table from the data without any state) + +* Sat Feb 22 2020 N. Brouard (10cb207) +- Summary: mle=-3 working again + +* Tue Jun 04 2019 N. Brouard (949ca3d) +- Summary: r20 + +* Tue Jun 04 2019 N. Brouard (18a7e8c) +- Summary: Error in 'r'parameter file backcast yearsbproj instead of yearsfproj + +* Tue May 28 2019 N. Brouard (366dbcb) +- Summary: Icon Desktop for Linux + +* Tue May 28 2019 N. Brouard (0187002) +- Summary: LDFLAGS moved for -lm to be taken into account on Ubuntu + +* Wed May 22 2019 N. Brouard (9b572af) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (e61fe83) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (ba737f5) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (7b60983) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (ce59d7b) +- Summary: Makefile Linux + +* Wed May 22 2019 N. Brouard (bf92f70) +- Summary: version 0.99r19 of May 2019 + +* Wed May 22 2019 N. Brouard (3e759d2) +- Summary: version optimized 0.99r19 + +* Wed May 22 2019 N. Brouard (e87df7c) +- Summary: fixed 0.99r19 version + +* Wed May 22 2019 N. Brouard (ca703e7) +- Summary: version 0.99r19 + +* Wed May 22 2019 N. Brouard (0b7cb6c) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (9b5882f) +- Summary: Column added + +* Wed May 22 2019 N. Brouard (381118d) +- Summary: 0.99r19 version + +* Wed May 22 2019 N. Brouard (d5a2f1d) +- Summary: Cleaned 0.99r19 + +* Wed May 22 2019 N. Brouard (bdd36f6) +- *** empty log message *** + +* Wed May 22 2019 N. Brouard (6454455) +- Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1 + +* Tue May 21 2019 N. Brouard (443d070) +- Summary: RPM and SRPMS + +* Tue May 21 2019 N. Brouard (9229cd2) +- Summary: testting; seems to be a useless file now + +* Tue May 21 2019 N. Brouard (6a02ec7) +- Summary: Cleaning for Linux + +* Mon May 20 2019 N. Brouard (f5188f6) +- Summary: version 0.99.r19 + +* Mon May 20 2019 N. Brouard (87a302a) +- Summary: Projection syntax simplifiedWe can now start projections, forward or backward, from the mean date +of inteviews up to or down to a number of years of projection: +prevforecast=1 yearsfproj=15.3 mobil_average=0 +or +prevforecast=1 starting-proj-date=1/1/2007 final-proj-date=12/31/2017 mobil_average=0 +or +prevbackcast=1 yearsbproj=12.3 mobil_average=1 +or +prevbackcast=1 starting-back-date=1/10/1999 final-back-date=1/1/1985 mobil_average=1 + + +* Sat May 18 2019 N. Brouard (ff2e367) +- Summary: doxygen tex bug + +* Thu May 16 2019 N. Brouard (daf1d34) +- Summary: There was some wrong lines added + +* Thu May 09 2019 N. Brouard (d82fa94) +- *** empty log message *** + +* Thu May 09 2019 N. Brouard (20fb109) +- Summary: C= + +* Thu May 09 2019 N. Brouard (e62a2d6) +- Summary: Update + +* Thu May 09 2019 N. Brouard (2873921) +- *** empty log message *** + +* Thu May 09 2019 N. Brouard (8191aeb) +- Summary: Adding doxygen for Linux only + +* Thu May 09 2019 N. Brouard (4d571d9) +- Summary: Some updates + +* Thu May 09 2019 N. Brouard (6798293) +- Summary: Before ncovmax + +* Thu May 09 2019 N. Brouard (acb6fcd) +- Summary: Version 0.99r18 + +* Thu May 09 2019 N. Brouard (64eaaea) +- *** empty log message *** + +* Thu May 09 2019 N. Brouard (68ca446) +- Summary: 0.99r18 unlimited number of individualsThe number n which was limited to 20,000 cases is now unlimited, from firstobs to lastobs. If the number is too for the virtual memory, probably an error will occur. + + +* Thu Dec 13 2018 N. Brouard (ccdd5de) +- Summary: Bug for young ages (<-30) will be in r17 + +* Wed Dec 05 2018 N. Brouard (16d697a) +- Summary: 0.99r16 + +* Wed May 02 2018 N. Brouard (c76e9e2) +- Summary: Some bugs fixed + +* Tue May 01 2018 N. Brouard (0624b62) +- Summary: Bug fixed by providing frequencies only for non missing covariates + +* Fri Apr 27 2018 N. Brouard (9fce200) +- Summary: some minor bugs + +* Sat Apr 21 2018 N. Brouard (6a30113) +- Summary: more simple + +* Sat Apr 21 2018 N. Brouard (e6e4327) +- Summary: Borrowed from gnuplot + +* Sat Apr 21 2018 N. Brouard (afa1e06) +- Summary: Imach shell for osx + +* Sat Apr 21 2018 N. Brouard (60dd546) +- *** empty log message *** + +* Sat Apr 21 2018 N. Brouard (42205d5) +- Summary: Some bugs fixed, valgrind tested + +* Fri Apr 20 2018 N. Brouard (52b32d2) +- Summary: imach 0.99r16 + +* Fri Apr 20 2018 N. Brouard (83e0ad9) +- Summary: Computing mean and stdeviation of fixed quantitative variables + +* Thu Apr 19 2018 N. Brouard (0e01ba9) +- Summary: version 0.99R16 + +* Thu Apr 19 2018 N. Brouard (334cc1b) +- Summary: Some minor bugs fixed + +* Thu Apr 19 2018 N. Brouard (4f72dfc) +- *** empty log message *** + +* Tue Feb 27 2018 N. Brouard (2c5fe55) +- Summary: imach gui + +* Tue Feb 27 2018 N. Brouard (6f8a29b) +- *** empty log message *** + +* Tue Feb 27 2018 N. Brouard (a36cd1c) +- Summary: Adding second argument for quitting + +* Wed Feb 21 2018 N. Brouard (f87f99d) +- Summary: 0.99r15New Makefile with recent VirtualBox 5.26. Bug in sqrt negatve in imach.c + + +* Thu Jul 20 2017 N. Brouard (c2a50b1) +- Summary: temporary working + +* Wed Jul 19 2017 N. Brouard (a7b34b7) +- Summary: Bug for mobil_average=0 and prevforecast fixed(?) + +* Mon Jul 17 2017 N. Brouard (341142c) +- Summary: BOM files can be read now + +* Fri Jun 30 2017 N. Brouard (4ba895b) +- Summary: Graphs improvements + +* Fri Jun 30 2017 N. Brouard (93132da) +- Summary: Saito's color + +* Thu Jun 29 2017 N. Brouard (f4a9cf2) +- *** empty log message *** + +* Thu Jun 29 2017 N. Brouard (b8e110f) +- Summary: 0.99r14 + +* Thu Jun 29 2017 N. Brouard (eb44470) +- Summary: Version 0.99r14 + +* Tue Jun 27 2017 N. Brouard (7162551) +- Summary: More documentation on projections + +* Tue Jun 27 2017 N. Brouard (c36e6de) +- Summary: Color of backprojection changed from 6 to 5(yellow) + +* Tue Jun 27 2017 N. Brouard (ee3ef73) +- Summary: Some bug with rint + +* Wed May 24 2017 N. Brouard (cb90f84) +- *** empty log message *** + +* Tue May 23 2017 N. Brouard (b5b2745) +- Summary: Code into subroutine, cleanings + +* Thu May 18 2017 N. Brouard (8370b43) +- Summary: backprojection and confidence intervals of backprevalence + +* Sat May 13 2017 N. Brouard (41d8ec5) +- Summary: temporary save for backprojection + +* Sat May 13 2017 N. Brouard (bc7c217) +- Summary: Version 0.99r13 + +* Sat May 13 2017 N. Brouard (ed6cd13) +- Summary: Version 0.99r13 (improvements and bugs fixed) + +* Wed Apr 26 2017 N. Brouard (95f7a12) +- Summary: imach 0.99r13 Some bugs fixed + +* Wed Apr 26 2017 N. Brouard (b2fe8cc) +- Summary: Labels in graphs + +* Mon Apr 24 2017 N. Brouard (3ce6972) +- Summary: to save + +* Tue Apr 18 2017 N. Brouard (bf36d17) +- *** empty log message *** + +* Wed Apr 05 2017 N. Brouard (82bf739) +- Summary: Bug in E_ as well as in T_ fixed nres-1 vs k1-1 + +* Tue Apr 04 2017 N. Brouard (391aa15) +- Summary: Gnuplot indexations fixed (humm) + +* Tue Apr 04 2017 N. Brouard (d7ed67e) +- Summary: Some errors to warnings only if date of death is unknown but status is death we could set to pi3 + +* Mon Apr 03 2017 N. Brouard (0c70608) +- Summary: With comments + +* Mon Apr 03 2017 N. Brouard (0f6ca5d) +- Summary: 0.99r12 + +* Mon Apr 03 2017 N. Brouard (bf464dc) +- Summary: version 0.99r12 + +* Mon Apr 03 2017 N. Brouard (9ed0e74) +- Summary: Version 0.99r12Some cleanings, conformed with updated documentation. + + +* Thu Mar 30 2017 N. Brouard (0a79f38) +- *** empty log message *** + +* Thu Mar 30 2017 N. Brouard (b6b919f) +- Summary:0.99r11 + +* Thu Mar 30 2017 N. Brouard (2a2e672) +- Summary: 0.99r11 Author: + +* Wed Mar 29 2017 N. Brouard (c59d50c) +- Summary: Temp + +* Mon Mar 27 2017 N. Brouard (7c5f5c7) +- Summary: Temporary + +* Wed Mar 08 2017 N. Brouard (a278336) +- Summary: IMaCh version 0.99r10 bugs in gnuplot fixed + +* Wed Mar 08 2017 N. Brouard (a029593) +- Summary: Fixing data parameter line + +* Thu Dec 15 2016 N. Brouard (cd5aafc) +- Summary: 0.99 in progress + +* Thu Sep 15 2016 N. Brouard (2dd09dc) +- *** empty log message *** + +* Thu Sep 15 2016 N. Brouard (ba7d0ea) +- Summary: not working + +* Thu Sep 08 2016 N. Brouard (602160c) +- Summary: continue + +* Wed Sep 07 2016 N. Brouard (5f9cee1) +- Summary: Starting values from frequencies + +* Wed Sep 07 2016 N. Brouard (fd514a9) +- *** empty log message *** + +* Fri Sep 02 2016 N. Brouard (7d9a502) +- *** empty log message *** + +* Fri Sep 02 2016 N. Brouard (43e55aa) +- *** empty log message *** + +* Fri Sep 02 2016 N. Brouard (e9fe2fa) +- *** empty log message *** + +* Fri Sep 02 2016 N. Brouard (c0cae66) +- *** empty log message *** + +* Fri Sep 02 2016 N. Brouard (622907b) +- *** empty log message *** + +* Tue Aug 30 2016 N. Brouard (62c5897) +- Summary: Fixing a lots + +* Mon Aug 29 2016 N. Brouard (9978459) +- Summary: gnuplot problem in Back projection to fix + +* Mon Aug 29 2016 N. Brouard (e74e8a6) +- Summary: Better + +* Fri Aug 26 2016 N. Brouard (ebe35cf) +- Summary: Improvement in Powell output in order to copy and pasteAuthor: + + +* Fri Aug 26 2016 N. Brouard (55cd64c) +- Summary: Starting tests of 0.99 + +* Fri Aug 26 2016 N. Brouard (68638c0) +- Summary: to valgrind + +* Thu Aug 25 2016 N. Brouard (44c4f21) +- *** empty log message *** + +* Thu Aug 25 2016 N. Brouard (7169d81) +- *** empty log message *** + +* Tue Aug 23 2016 N. Brouard (ea6735e) +- *** empty log message *** + +* Tue Aug 23 2016 N. Brouard (4d8c6ac) +- Summary: not working + +* Mon Aug 22 2016 N. Brouard (f59f6ca) +- Summary: not working + +* Mon Aug 22 2016 N. Brouard (e1c81fe) +- Summary: not working + +* Mon Aug 22 2016 N. Brouard (5ab9cbe) +- Summary: Not working + +* Sat Jul 23 2016 N. Brouard (cf81c1d) +- Summary: Completing for func too + +* Fri Jul 22 2016 N. Brouard (449963b) +- Summary: Fixing some arrays, still debugging + +* Thu Jul 21 2016 N. Brouard (1c70a15) +- Summary: Version 0.99r8 (first working on my example V4+V3+V5) + +* Thu Jul 21 2016 N. Brouard (e84a94a) +- Summary: 0.99 working (more or less) for Asian Workshop on multitate methods + +* Tue Jul 12 2016 N. Brouard (b615ab9) +- Summary: temp + +* Tue Jul 12 2016 N. Brouard (1c22d85) +- Summary: saving but not running + +* Fri Jul 01 2016 N. Brouard (02f8860) +- Summary: Fixes + +* Fri Feb 19 2016 N. Brouard (20f3289) +- Summary: Kind of 0.98r? series, starting with r7 + +* Fri Feb 19 2016 N. Brouard (91733c5) +- *** empty log message *** + +* Fri Feb 19 2016 N. Brouard (c82b84a) +- Summary: temporary + +* Wed Feb 17 2016 N. Brouard (50fd17b) +- Summary: Probably last 0.98 stable version 0.98r6 + +* Mon Feb 15 2016 N. Brouard (6743f3b) +- Summary: minor bug + +* Mon Feb 15 2016 N. Brouard (ff49baa) +- Summary: 0.99r2 + +* Mon Feb 15 2016 N. Brouard (7e6529b) +- *** empty log message *** + +* Fri Feb 12 2016 N. Brouard (32c97b8) +- Summary: 0.99 Back projections + +* Wed Dec 23 2015 N. Brouard (0b1e0d4) +- Summary: Experimental backcast + +* Fri Dec 18 2015 N. Brouard (a34eca0) +- Summary: 0.98r4 Warning and status=-2Version 0.98r4 is now: + - displaying an error when status is -1, date of interview unknown and date of death known; + - permitting a status -2 when the vital status is unknown at a known date of right truncation. +Older changes concerning s=-2, dating from 2005 have been supersed. + + +* Fri Dec 18 2015 N. Brouard (b2958bb) +- *** empty log message *** + +* Wed Dec 16 2015 N. Brouard (52e5184) +- *** empty log message *** + +* Wed Dec 16 2015 N. Brouard (18f19ee) +- Summary: 0.98r4 working + +* Wed Dec 16 2015 N. Brouard (627a60a) +- Summary: linuxrpm added + +* Wed Dec 16 2015 N. Brouard (aa4312b) +- Summary: 0.98r4 + +* Wed Dec 16 2015 N. Brouard (4cee4ab) +- *** empty log message *** + +* Wed Dec 16 2015 N. Brouard (d8d0394) +- Summary: temporary not working + +* Fri Dec 11 2015 N. Brouard (cecca2c) +- Summary: 0.98r4 + +* Tue Dec 08 2015 N. Brouard (26e4f18) +- *** empty log message *** + +* Tue Dec 08 2015 N. Brouard (a624102) +- Summary: For 0.98r3 + +* Sat Nov 21 2015 N. Brouard (34cee2a) +- Summary: VBoxManage change from execute --image to run --exe and --wait-exit doesn't exist any more + +* Sat Nov 21 2015 N. Brouard (d3157db) +- Summary: minor typo + +* Sat Nov 21 2015 N. Brouard (3f01f53) +- Summary: 0.98r3 with some graph of projected cross-sectionalAuthor: Nicolas Brouard + + +* Wed Nov 18 2015 N. Brouard (e3494cb) +- Summary: Start working on projected prevalences + +* Tue Nov 17 2015 N. Brouard (34daae8) +- Summary: Adding ftolpl parameter Author: N BrouardWe had difficulties to get smoothed confidence intervals. It was due +to the period prevalence which wasn't computed accurately. The inner +parameter ftolpl is now an outer parameter of the .imach parameter +file after estepm. If ftolpl is small 1.e-4 and estepm too, +computation are long. + + +* Tue Nov 17 2015 N. Brouard (658d64e) +- *** empty log message *** + +* Tue Nov 17 2015 N. Brouard (555dc6e) +- Summary: temporary + +* Tue Oct 27 2015 N. Brouard (886ca0d) +- *** empty log message *** + +* Tue Oct 27 2015 N. Brouard (5010319) +- Summary: some new subdirs + +* Tue Oct 27 2015 N. Brouard (8114d1c) +- *** empty log message *** + +* Tue Oct 27 2015 N. Brouard (a409597) +- Summary: Adding gnuplot 5.1 with bin and etc for pango fonts + +* Tue Oct 27 2015 N. Brouard (f8e7bbf) +- Summary: 0.98r3 with new gnuplot 5.1 + +* Tue Oct 27 2015 N. Brouard (d854bb5) +- *** empty log message *** + +* Sat Oct 24 2015 N. Brouard (ed184a1) +- *** empty log message *** + +* Fri Oct 23 2015 N. Brouard (e83f285) +- Summary: 0.98r3 some clarification for graphs on likelihood contributions + +* Thu Oct 01 2015 N. Brouard (ee71571) +- Summary: Some new graphs of contribution to likelihood + +* Wed Sep 30 2015 N. Brouard (85036cf) +- Summary: Version read from version.h, itself read with cmake + +* Wed Sep 30 2015 N. Brouard (7933b92) +- Summary: 0.98r2 + +* Wed Sep 30 2015 N. Brouard (25075b8) +- Summary: looking at better estimation of the hessianAlso a better criteria for convergence to the period prevalence And +therefore adding the number of years needed to converge. (The +prevalence in any alive state shold sum to one + + +* Wed Sep 30 2015 N. Brouard (b2f7f5f) +- *** empty log message *** + +* Tue Sep 22 2015 N. Brouard (3010320) +- Summary: Adding some overall graph on contribution to likelihood. Might change + +* Thu Sep 17 2015 N. Brouard (82911d9) +- *** empty log message *** + +* Thu Sep 17 2015 N. Brouard (8bca07a) +- Summary: generate refman.pdf + +* Thu Sep 17 2015 N. Brouard (ccf7291) +- *** empty log message *** + +* Wed Sep 16 2015 N. Brouard (3a21d36) +- *** empty log message *** + +* Tue Sep 15 2015 N. Brouard (bc1a249) +- Summary: 0.98r0 + +* Tue Sep 15 2015 N. Brouard (5a6f191) +- *** empty log message *** + +* Tue Sep 15 2015 N. Brouard (f4fa819) +- Summary: 0.98r0- Some new graphs like suvival functions +- Some bugs fixed like model=1+age+V2. + + +* Tue Sep 15 2015 N. Brouard (040447b) +- Summary: 0.98r0 + +* Tue Sep 15 2015 N. Brouard (a3c2c26) +- Summary: Some tests for setup.iss + +* Wed Sep 09 2015 N. Brouard (5dfc56a) +- *** empty log message *** + +* Wed Sep 09 2015 N. Brouard (2b4bb09) +- Summary: Big bug thanks to FlaviaEven model=1+age+V2. did not work anymore + + +* Mon Sep 07 2015 N. Brouard (76b0649) +- Summary: 0.98q6 changing default small png format for graph to vectorized svg. + +* Mon Sep 07 2015 N. Brouard (e7739b0) +- *** empty log message *** + +* Thu Sep 03 2015 N. Brouard (33aec81) +- *** empty log message *** + +* Thu Sep 03 2015 N. Brouard (f7d7f7e) +- Summary: 0.98q5 Flavia + +* Thu Sep 03 2015 N. Brouard (e2d752d) +- *** empty log message *** + +* Wed Sep 02 2015 N. Brouard (c46ef79) +- Summary: Too old + +* Wed Sep 02 2015 N. Brouard (61bd69c) +- Summary: Some updates + +* Wed Sep 02 2015 N. Brouard (46b0fb6) +- Summary: Half way to using cmake on OS/X + +* Wed Sep 02 2015 N. Brouard (40d425b) +- *** empty log message *** + +* Tue Sep 01 2015 N. Brouard (1da19f8) +- *** empty log message *** + +* Tue Aug 18 2015 N. Brouard (b513698) +- *** empty log message *** + +* Tue Aug 18 2015 N. Brouard (27fc981) +- Summary: 0.98q5 + +* Tue Aug 18 2015 N. Brouard (2775484) +- Summary: cmake + +* Tue Aug 18 2015 N. Brouard (16d9dbb) +- *** empty log message *** + +* Tue Aug 18 2015 N. Brouard (410bec0) +- *** empty log message *** + +* Tue Aug 18 2015 N. Brouard (a9afcc3) +- Summary: Adding a hack for testing purposeAfter reading the title, ftol and model lines, if the comment line has +a q, starting with #q, the answer at the end of the run is quit. It +permits to run test files in batch with ctest. The former workaround was +$ echo q | imach foo.imach + + +* Tue Aug 18 2015 N. Brouard (a090a03) +- Summary: Adding error when the covariance matrix doesn't contain the exact number of lines required by the model line. + +* Tue Aug 18 2015 N. Brouard (fb5d51b) +- *** empty log message *** + +* Tue Aug 04 2015 N. Brouard (10857f4) +- *** empty log message *** + +* Tue Aug 04 2015 N. Brouard (053ef5f) +- Summary: 0.98q4 + +* Tue Aug 04 2015 N. Brouard (b0e8cfb) +- 0.98q4 + +* Mon Aug 03 2015 N. Brouard (bfb7f9c) +- Summary: + +* Thu Jul 16 2015 N. Brouard (b399d97) +- Summary: Fixing some outputs + +* Tue Jul 14 2015 N. Brouard (04f9e75) +- Summary: Some fixes + +* Tue May 05 2015 N. Brouard (157b383) +- *** empty log message *** + +* Tue May 05 2015 N. Brouard (52ff7cf) +- *** empty log message *** + +* Tue May 05 2015 N. Brouard (1847b82) +- Summary: Adding digits in output parameters (7 digits instead of 6)Fix 1+age+. + + +* Thu Apr 30 2015 N. Brouard (3d425d0) +- Summary: 0.98q2 + +* Thu Apr 30 2015 N. Brouard (75ffc90) +- *** empty log message *** + +* Wed Apr 29 2015 N. Brouard (958dfd3) +- *** empty log message *** + +* Wed Apr 29 2015 N. Brouard (9c8bf30) +- Summary: Author: + +* Thu Apr 23 2015 N. Brouard (c7d4ba5) +- Summary: 0.98q1 + +* Thu Apr 23 2015 N. Brouard (2666b2d) +- Summary: V1*age is working now, version 0.98q1Some codes had been disabled in order to simplify and Vn*age was +working in the optimization phase, ie, giving correct MLE parameters, +but, as usual, outputs were not correct and program core dumped. + + +* Tue Mar 31 2015 N. Brouard (78630fa) +- Summary: O.98p0 and 0.98q0 + +* Wed Mar 11 2015 N. Brouard (9fedbd2) +- Summary: March 2015 + +* Wed Mar 11 2015 N. Brouard (495dce0) +- *** empty log message *** + +* Wed Mar 11 2015 N. Brouard (82ecabf) +- *** empty log message *** + +* Wed Mar 11 2015 N. Brouard (74671c0) +- Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5 + +* Wed Mar 11 2015 N. Brouard (c8ca8e1) +- Summary: Inclusion of compile and links command line for Intel Compiler + +* Wed Mar 11 2015 N. Brouard (1e45ae6) +- Summary: Back from Windows 8. Intel Compiler + +* Tue Mar 10 2015 N. Brouard (2a942d6) +- *** empty log message *** + +* Tue Mar 10 2015 N. Brouard (0750992) +- Summary: 0.98q0, trying with directest, mnbrak fixedWe use directest instead of original Powell test; probably no +incidence on the results, but better justifications; +We fixed Numerical Recipes mnbrak routine which was wrong and gave +wrong results. + + +* Thu Feb 12 2015 N. Brouard (93d0f38) +- Summary: Trying to keep directest which seems simpler and more general Author: Nicolas Brouard + +* Wed Feb 11 2015 N. Brouard (e826e3e) +- Summary: Comments on Powell addedAuthor: + + +* Wed Feb 11 2015 N. Brouard (eb6670d) +- Summary: Finishing move from main to function (hpijx and prevalence_limit) + +* Wed Feb 11 2015 N. Brouard (96de7b4) +- Summary: update + +* Sun Jan 04 2015 N. Brouard (fe541a8) +- Summary: Back to OS/X + +* Sun Jan 04 2015 N. Brouard (26d6963) +- Summary: back to OS/X + +* Sun Jan 04 2015 N. Brouard (87bb1e1) +- *** empty log message *** + +* Sat Jan 03 2015 N. Brouard (66b2ec8) +- *** empty log message *** + +* Sat Jan 03 2015 N. Brouard (ff218a2) +- Summary: Still testing ilc32 on OSX + +* Sat Jan 03 2015 N. Brouard (8c22a11) +- *** empty log message *** + +* Sat Jan 03 2015 N. Brouard (5960554) +- *** empty log message *** + +* Sat Jan 03 2015 N. Brouard (7c606e1) +- *** empty log message *** + +* Sat Jan 03 2015 N. Brouard (9b965e8) +- Summary: Still in cross-compilation + +* Sat Jan 03 2015 N. Brouard (091b743) +- Summary: trying to detect cross-compilation + +* Sat Dec 27 2014 N. Brouard (4417987) +- Summary: Back from Visual Studio and Intel, options for compiling for Windows XP + +* Tue Dec 23 2014 N. Brouard (6fb67a8) +- Summary: Back from Visual CStill problem with utsname.h on Windows + + +* Tue Dec 23 2014 N. Brouard (a65a9c7) +- *** empty log message *** + +* Tue Dec 23 2014 N. Brouard (640ec05) +- Summary: Cleaning some \%% back to %%The escape was mandatory for a specific compiler (which one?), but too many warnings. + + +* Mon Dec 22 2014 N. Brouard (aa8aa5d) +- Summary: 0.98pOutputs some informations on compiler used, OS etc. Testing on different platforms. + + +* Mon Dec 22 2014 N. Brouard (b7db21d) +- Summary: Trying to integrate Intel OSX compiler + +* Mon Dec 22 2014 N. Brouard (e6826b6) +- Summary: udate + +* Mon Dec 22 2014 N. Brouard (6cb12f0) +- Summary: Testing uname and compiler version and if compiled 32 or 64Testing on Linux 64 + + +* Mon Dec 22 2014 N. Brouard (128a0e3) +- *** empty log message *** + +* Tue Dec 16 2014 N. Brouard (3baaf7c) +- Summary: After compiling on Visual C* imach.c (Module): Merging 1.61 to 1.162 + + +* Tue Dec 16 2014 N. Brouard (729e30d) +- Summary: Merging with Visual C after suppressing some warnings for unused variables. Also fixing Saito's bug 0.98Xn* imach.c (Module): Merging 1.61 to 1.162 + + +* Tue Dec 16 2014 N. Brouard (5bd78a3) +- * imach.c (Module): Merging 1.61 to 1.162 + +* Tue Dec 16 2014 N. Brouard (bd190c9) +- Summary: prevlim.h + +* Thu Sep 25 2014 N. Brouard (70f204f) +- Summary: temporary backup 0.99! + +* Thu Sep 25 2014 N. Brouard (5b08c52) +- Summary: backuup + +* Tue Sep 16 2014 N. Brouard (dd7090c) +- Summary: With some code (wrong) for nloptAuthor: + + +* Tue Sep 16 2014 N. Brouard (31dc3c8) +- Summary: nlopt trial + +* Mon Sep 15 2014 N. Brouard (0e4d160) +- *** empty log message *** + +* Mon Sep 15 2014 N. Brouard (19863e4) +- *** empty log message *** + +* Mon Sep 15 2014 N. Brouard (402d05c) +- Summary: Problem with macro SQR on Intel compiler + +* Tue Sep 02 2014 N. Brouard (ba0c857) +- *** empty log message *** + +* Tue Sep 02 2014 N. Brouard (ea350da) +- * prevlim.h (Module): + +* Tue Sep 02 2014 N. Brouard (70bb3fd) +- Summary:Adding test with ming-64 for Windows Author: Brouard + +* Tue Sep 02 2014 N. Brouard (18c54e0) +- *** empty log message *** + +* Mon Sep 01 2014 N. Brouard (4eca812) +- *** empty log message *** + +* Mon Sep 01 2014 N. Brouard (d44ee63) +- Summary: /MT instead of /MD in order to avoid the missing MSVCR100.dll Author: Brouardcompiled on Windows with cl /MT /O2 + + +* Mon Sep 01 2014 N. Brouard (fece78b) +- Summary: WIN32 Author: Brouard + +* Fri Aug 29 2014 N. Brouard (da45c64) +- *** empty log message *** + +* Fri Aug 29 2014 N. Brouard (bcba0b2) +- *** empty log message *** + +* Fri Aug 29 2014 N. Brouard (d21005b) +- Summary: 0.98nX compiled now with visual studio 2010 Author: Brouard + +* Fri Aug 29 2014 N. Brouard (8b77261) +- Summary: Some provisional steps for a rpm build Author: Brouard + +* Thu Aug 28 2014 N. Brouard (fb1c30d) +- Summary: New version 0.98nX Author: Nicolas Brouard + +* Thu Aug 28 2014 N. Brouard (f0e88fc) +- Author: brouard + +* Wed Aug 27 2014 N. Brouard (66b79d6) +- Summary: Integration Linux crosscompilation from OS/X Author: brouard + +* Wed Aug 27 2014 N. Brouard (e734c13) +- *** empty log message *** + +* Wed Aug 27 2014 N. Brouard (5b05c7d) +- Summary: Preparing windows Visual studio version Author: BrouardIn order to compile on Visual studio, time.h is now correct and time_t +and tm struct should be used. difftime should be used but sometimes I +just make the differences in raw time format (time(&now). +Trying to suppress #ifdef LINUX +Add xdg-open for __linux in order to open default browser. + + +* Wed Aug 27 2014 N. Brouard (e8ebfec) +- Summary: 0.98nX Author: brouard + +* Mon Aug 25 2014 N. Brouard (83075c4) +- Summary: Trying gcc-4.8.0-mingw32 Author: Brouard + +* Mon Aug 25 2014 N. Brouard (2653a34) +- *** empty log message *** + +* Mon Aug 25 2014 N. Brouard (cd4f381) +- Summary: New compile, minor changes Author: Brouard + +* Fri Jun 20 2014 N. Brouard (49a040d) +- Summary: Outputs now all graphs of convergence to period prevalence + +* Fri Jun 20 2014 N. Brouard (ed63623) +- Summary: If 3 live state, convergence to period prevalence on same graph Author: Brouard + +* Wed Jun 18 2014 N. Brouard (5cde4d1) +- Summary: create dmg improved with gnuplot osx binary Author: brouard + +* Wed Jun 18 2014 N. Brouard (7b2bf46) +- Summary: open browser, use gnuplot on same dir than imach if not found in the path + +* Wed Jun 18 2014 N. Brouard (bedb8eb) +- *** empty log message *** + +* Wed Jun 18 2014 N. Brouard (dbbebf0) +- Summary: If gnuplot is not in the path try on same directory than imach binary (OSX) Author: brouard + +* Wed Jun 18 2014 N. Brouard (85798a6) +- Summary: Some fixes in parameter files errors Author: Nicolas Brouard + +* Tue Jun 17 2014 N. Brouard (bb2c05c) +- Summary: Nothing new Author: BrouardJust a new packaging for OS/X version 0.98nS + + +* Tue Jun 17 2014 N. Brouard (f67c6d5) +- Summary: BrouardWith an other createdmg for OS/X + + +* Mon Jun 16 2014 N. Brouard (f5a8930) +- *** empty log message *** + +* Mon Jun 16 2014 N. Brouard (fc4772b) +- Summary: Merge Author: BrouardMerge, before building revised version. + + +* Tue Jun 10 2014 N. Brouard (e578b87) +- Author: Nicolas Brouard + +* Tue Jun 10 2014 N. Brouard (3e7db94) +- Summary: Valgrind added with test file Author: Nicolas BrouardValgrind works on OS/X too. + + +* Tue Jun 10 2014 N. Brouard (f867024) +- Summary: Debugging with valgrind Author: Nicolas BrouardLot of changes in order to output the results with some covariates +After the Edimburgh REVES conference 2014, it seems mandatory to +improve the code. +No more memory valgrind error but a lot has to be done in order to +continue the work of splitting the code into subroutines. +Also, decodemodel has been improved. Tricode is still not +optimal. nbcode should be improved. Documentation has been added in +the source code. -*Wed Mar 31 2021 Nicolas Brouard - * imach.c (Module): Still bugs in the result loop. Thank to Holly Benett -*2021-03-08 Nicolas Brouard +* Mon Feb 10 2014 N. Brouard (6d6805a) +- *** empty log message *** - * ./ (Module): Fixed bug on result: +* Mon Feb 10 2014 N. Brouard (b4123a3) +- *** empty log message *** -*2021-02-20 Nicolas Brouard +* Mon Feb 10 2014 N. Brouard (e4bb9fa) +- *** empty log message *** - * imach.c (Module): Fix bug on quitting after result lines! - (Module): Version 0.99r21 +* Sun Jan 26 2014 N. Brouard (ca57fe2) +- Summary: Version 0.98nR (to be improved, but gives same optimization results as 0.98k. Nice, promising* imach.c (Module): Trying to merge old staffs together while being at Tokyo. Not tested... +(Module): Version 0.98nR Running ok, but output format still only works for three covariates. -2021-02-12 Nicolas Brouard - * imach.c (Module): The use of a Windows BOM (huge) file is now an error +* Sun Jan 26 2014 N. Brouard (6e11765) +- Summary: gnuplot changed plot w l 1 has to be changed to plot w l lt 2* imach.c (Module): Trying to merge old staffs together while being at Tokyo. Not tested... -2021-02-11 Nicolas Brouard +* Sun Jan 26 2014 N. Brouard (bea20f7) +- * imach.c (Module): Trying to merge old staffs together while being at Tokyo. Not tested... - * (Module): imach.c Someone entered 'results:' instead of 'result:'. Now it is an error which is printed. +* Fri Sep 02 2011 N. Brouard (7882e79) +- Summary: times.h is ok with mingw32 now. -2020-02-22 Brouard Nicolas +* Fri Sep 02 2011 N. Brouard (31e808f) +- Summary: Merging - * (Module): imach.c Update mle=-3 (for computing Life expectancy - and life table from the data without any state) +* Mon Jun 14 2010 N. Brouard (b2a93c0) +- After the theft of my laptop, I probably lost some lines of codes which were not uploaded to the CVS tree. I remember having already fixed agemin agemax which are pointers now but not cvs saved. -2019-05-20 Brouard Nicolas +* Fri Apr 30 2010 N. Brouard (5279049) +- *** empty log message *** - * version.h: Summary: version 0.99.r19 +* Fri Apr 30 2010 N. Brouard (4afd9ae) +- Some comments added in order to remember what is done. - * imach.c: Summary: Projection syntax simplified - We can now start projections, forward or backward, from the mean date - of inteviews up to or down to a number of years of projection: - prevforecast=1 yearsfproj=15.3 mobil_average=0 - or - prevforecast=1 starting-proj-date=1/1/2007 final-proj-date=12/31/2017 mobil_average=0 - or - prevbackcast=1 yearsbproj=12.3 mobil_average=1 - or - prevbackcast=1 starting-back-date=1/10/1999 final-back-date=1/1/1985 mobil_average=1 +* Fri Apr 30 2010 N. Brouard (698c0fa) +- *** empty log message *** -2019-05-18 Brouard Nicolas +* Thu Apr 29 2010 N. Brouard (8d43360) +- (Module): Checking covariates for more complex models than V1+V2. A lot of change to be done. Unstable. - * imach.c: Summary: doxygen tex bug +* Mon Apr 26 2010 N. Brouard (cccb6f3) +- (Module): merging some libgsl code. Fixing computation of likelione (using inter/intrapolation if mle = 0) in order to get same likelihood as if mle=1. Some cleaning of code and comments added. -2019-05-16 Brouard Nicolas +* Thu Oct 29 2009 N. Brouard (c564c7c) +- (Module): Now imach stops if date of birth, at least year of birth, is not given. Some cleaning of the code. - * imach.c: Summary: There was some wrong lines added +* Thu Oct 29 2009 N. Brouard (7b8e30d) +- 0.98l -2019-05-09 Brouard Nicolas +* Thu Oct 29 2009 N. Brouard (ee62878) +- Changes for compiling on Windows with Mingw and not only cygwin. - * Makefile, imach.c: *** empty log message *** +* Thu Oct 29 2009 N. Brouard (21b9ac4) +- (Module): Now imach stops if date of birth, at least year of birth, is not given. Some cleaning of the code. - * ChangeLog: Summary: C= +* Thu Oct 29 2009 N. Brouard (2272ea6) +- *** empty log message *** - * imach.c: Summary: Some updates +* Mon Jul 06 2009 N. Brouard (525d379) +- O.98k - * imach.c: Summary: Before ncovmax +* Mon Jul 06 2009 N. Brouard (c1af7c3) +- Compiling for Windows on Linux - * version.h: *** empty log message *** +* Mon Jul 06 2009 N. Brouard (0a91e99) +- Imach for OS/X version 0.98k - * imach.c: Summary: 0.99r18 unlimited number of individuals - The number n which was limited to 20,000 cases is now unlimited, from firstobs to lastobs. If the number is too for the virtual memory, probably an error will occur. +* Mon Jul 06 2009 N. Brouard (e18b8b6) +- just nforces -2018-12-13 Brouard Nicolas +* Mon Jul 06 2009 N. Brouard (0ee4285) +- Many tings - * imach.c: Summary: Bug for young ages (<-30) will be in r17 +* Mon Jul 06 2009 N. Brouard (f072e93) +- *** empty log message *** -2018-12-05 Brouard Nicolas +* Sat Jun 20 2009 N. Brouard (7d0c071) +- Some dimensions resccaled - * Makefile: Summary: 0.99r16 +* Tue May 26 2009 N. Brouard (d0f0227) +- (Module): Max Covariate is now set to 20 instead of 8. A lot of cleaning with variables initialized to 0. Trying to make V2+V3*age+V1+V4 strb=V3*age+V1+V4 working better. -2018-05-02 Brouard Nicolas +* Fri Aug 31 2007 Agnès Lièvre (0edca47) +- Modification of the way of exiting when the covariate is not binary in order to see on the window the error message before exiting - * imach.c: Summary: Some bugs fixed +* Fri Jun 30 2006 N. Brouard (35b4a6e) +- 0.98i version -2018-05-02 Brouard Nicolas +* Fri Jun 30 2006 N. Brouard (30f7dfe) +- (Module): Clarifications on computing e.j - * imach.c: Summary: Bug for young ages (<-30) will be in r17 +* Fri Apr 28 2006 N. Brouard (c53c606) +- (Module): Yes the sum of survivors was wrong since imach-114 because nhstepm was no more computed in the age loop. Now we define nhstepma in the age loop. (Module): In order to speed up (in case of numerous covariates) we compute health expectancies (without variances) in a first step and then all the health expectancies with variances or standard deviation (needs data from the Hessian matrices) which slows the computation. In the future we should be able to stop the program is only health expectancies and graph are needed without standard deviations. -2018-05-02 Brouard Nicolas +* Fri Apr 28 2006 N. Brouard (c65c139) +- *** empty log message *** - * imach.c: Summary: Some bugs fixed +* Fri Apr 28 2006 N. Brouard (42320d5) +- Version 0.98h -2018-05-01 Brouard Nicolas +* Fri Apr 28 2006 N. Brouard (47be6d2) +- (Module): Yes the sum of survivors was wrong since imach-114 because nhstepm was no more computed in the age loop. Now we define nhstepma in the age loop. Version 0.98h - * imach.c: - Summary: Bug fixed by providing frequencies only for non missing covariates +* Tue Apr 04 2006 Agnès Lièvre (2c08079) +- *** empty log message *** -2018-04-27 Brouard Nicolas +* Tue Apr 04 2006 Agnès Lièvre (af18b99) +- Errors in calculation of health expectancies. Age was not initialized. Forecasting file added. - * imach.c: Summary: some minor bugs +* Wed Mar 22 2006 Agnès Lièvre (ec510d3) +- Parameters are printed with %lf instead of %f (more numbers after the comma). The log-likelihood is printed in the log file -2018-04-21 Brouard Nicolas +* Mon Mar 20 2006 N. Brouard (5914676) +- *** empty log message *** - * README.txt: *** empty log message *** +* Mon Mar 20 2006 N. Brouard (8671a33) +- * imach.c (Module): changed, corresponds to .htm file name. <head> headers where missing.* imach.c (Module): Weights can have a decimal point as for +English (a comma might work with a correct LC_NUMERIC environment, +otherwise the weight is truncated). +Modification of warning when the covariates values are not 0 or +1. +Version 0.98g - * imach.c: Summary: Some bugs fixed, valgrind tested -2018-04-20 Brouard Nicolas <brouard@ined.fr> +* Mon Mar 20 2006 N. Brouard <brouard@ined.fr> (191cd00) +- *** empty log message *** - * Makefile, README.txt, setup.iss: Summary: imach 0.99r16 +* Mon Mar 20 2006 N. Brouard <brouard@ined.fr> (f752e64) +- (Module): 0.98g - * imach.c: - Summary: Computing mean and stdeviation of fixed quantitative variables +* Mon Mar 20 2006 N. Brouard <brouard@ined.fr> (c3378c0) +- (Module): Weights can have a decimal point as for English (a comma might work with a correct LC_NUMERIC environment, otherwise the weight is truncated). Modification of warning when the covariates values are not 0 or 1. Version 0.98g -2018-04-19 Brouard Nicolas <brouard@ined.fr> +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (3b3eee6) +- *** empty log message *** - * imach.c: Summary: Some minor bugs fixed +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (bd69600) +- (Module): Version 0.98f - * version.h: *** empty log message *** +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e43958e) +- *** empty log message *** -2018-02-27 Brouard Nicolas <brouard@ined.fr> +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (dc19685) +- * imach.c (Module): Comments concerning covariates added* imach.c (Module): refinements in the computation of lli if +status=-2 in order to have more reliable computation if stepm is +not 1 month. Version 0.98f - * imach.c: *** empty log message *** - * imach.c: Summary: Adding second argument for quitting +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (b8d0388) +- Version 0.98f -2018-02-21 Brouard Nicolas <brouard@ined.fr> +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e5b3d31) +- *** empty log message *** - * Makefile, README.txt, imach.c: Summary: 0.99r15 - New Makefile with recent VirtualBox 5.26. Bug in sqrt negatve in imach.c +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (28ab760) +- (Module): Version 0.98f -2017-07-20 Brouard Nicolas <brouard@ined.fr> +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (3b00b06) +- Version 0.98f - * imach.c: Summary: temporary working +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a33f9d4) +- *** empty log message *** -2017-07-19 Brouard Nicolas <brouard@ined.fr> +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (5314cf0) +- (Module): Version 0.98f make _windows=1 imachcyg-setup - * imach.c: Summary: Bug for mobil_average=0 and prevforecast fixed(?) +* Thu Mar 16 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (5091af4) +- (Module): refinements in the computation of lli if status=-2 in order to have more reliable computation if stepm is not 1 month. Version 0.98f -2017-07-17 Brouard Nicolas <brouard@ined.fr> +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (8292169) +- 0.98e - * imach.c: Summary: BOM files can be read now +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (36ce383) +- *** empty log message *** -2017-06-30 Brouard Nicolas <brouard@ined.fr> +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (232aea1) +- Version 0.98e - * imach.c: Summary: Graphs improvements +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (10741d7) +- *** empty log message *** - * imach.c: Summary: Saito's color +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (a8382d0) +- *** empty log message *** -2017-06-29 Brouard Nicolas <brouard@ined.fr> +* Wed Mar 15 2006 N. Brouard <brouard@ined.fr> (7995164) +- (Module): Bug if status = -2, the loglikelihood was computed as likelihood omitting the logarithm. Version O.98e - * imach.c: Summary: Version 0.99r14 +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (f2244f5) +- ..\doc\data added to work! -2017-06-27 Brouard Nicolas <brouard@ined.fr> +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (fda0b8f) +- O.98d - * imach.c: Summary: More documentation on projections +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (d1df106) +- (Module): varevsij Comments added explaining the second table of variances if popbased=1 . (Module): Covariances of eij, ekl added, graphs fixed, new html link. (Module): Function pstamp added (Module): Version 0.98d - * imach.c: Summary: Color of backprojection changed from 6 to 5(yellow) +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (6a7710c) +- *** empty log message *** - * imach.c: Summary: Some bug with rint +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (a665589) +- *** empty log message *** -2017-05-24 Brouard Nicolas <brouard@ined.fr> +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (0dd17e4) +- *** empty log message *** - * imach.c: *** empty log message *** +* Tue Mar 14 2006 N. Brouard <brouard@ined.fr> (ce794f3) +- (Module): varevsij Comments added explaining the second table of variances if popbased=1 . (Module): Covariances of eij, ekl added, graphs fixed, new html link. (Module): Function pstamp added (Module): Version 0.98d -2017-05-23 Brouard Nicolas <brouard@ined.fr> +* Mon Mar 06 2006 N. Brouard <brouard@ined.fr> (a3d8b7d) +- *** empty log message *** - * imach.c: Summary: Code into subroutine, cleanings +* Mon Mar 06 2006 N. Brouard <brouard@ined.fr> (662eb5e) +- (Module): Variance-covariance wrong links and varian-covariance of ej. is needed (Saito). -2017-05-18 Brouard Nicolas <brouard@ined.fr> +* Mon Feb 27 2006 N. Brouard <brouard@ined.fr> (b448970) +- *** empty log message *** - * imach.c: - Summary: backprojection and confidence intervals of backprevalence +* Mon Feb 27 2006 N. Brouard <brouard@ined.fr> (d09c301) +- (Module): One freematrix added in mlikeli! 0.98c -2017-05-13 Brouard Nicolas <brouard@ined.fr> +* Sun Feb 26 2006 N. Brouard <brouard@ined.fr> (a8c8d1f) +- (Module): Some improvements in processing parameter filename with strsep. - * imach.c: Summary: temporary save for backprojection +* Fri Feb 24 2006 N. Brouard <brouard@ined.fr> (748ce5b) +- (Module): Memory leaks checks with valgrind and: datafile was not closed, some imatrix were not freed and on matrix allocation too. - * imach.c: Summary: Version 0.99r13 (improvements and bugs fixed) +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (7c311fb) +- *** empty log message *** -2017-04-26 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (abcbd79) +- (Module): IMACHSETUPVERSION added - * imach.c: Summary: imach 0.99r13 Some bugs fixed +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (c5f607b) +- * setup.iss.in (Module): IMACHSETUPVERSION added* noreg-setup.iss (Module): added to cvs tree - * imach.c: Summary: Labels in graphs -2017-04-24 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (f9ae079) +- (Module): IMACHSETUPVERSION added - * imach.c: Summary: to save +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (467133b) +- (Module): Inclusion because not in mingw32!!! -2017-04-18 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (12e30d5) +- (Module): Wiki link added - * imach.c: *** empty log message *** +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (09ab479) +- Too old -2017-04-05 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (de1db50) +- *** empty log message *** - * imach.c: Summary: Bug in E_ as well as in T_ fixed nres-1 vs k1-1 +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (1872e5e) +- * setup.iss.in (Module): IMACHSETUPVERSION added* noreg-setup.iss (Module): added to cvs tree -2017-04-04 Brouard Nicolas <brouard@ined.fr> - * imach.c: Summary: Gnuplot indexations fixed (humm) +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (c16aa44) +- Update to 0.98b - * imach.c: - Summary: Some errors to warnings only if date of death is unknown but status is death we could set to pi3 +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (dd6e23a) +- *** empty log message *** -2017-04-03 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (af4067c) +- (Module): IMACHSETUPVERSION added - * imach.c: Summary: Version 0.99r12 - Some cleanings, conformed with updated documentation. +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (8a9e602) +- (Module): added to cvs tree -2017-03-30 Brouard Nicolas <brouard@ined.fr> +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (8ce2f28) +- *** empty log message *** - * version.h: *** empty log message *** +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d0ef979) +- (Module): Parameter file for quick test - * version.h: Summary:0.99r11 +* Thu Feb 09 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (3349e46) +- (Module): Small file added for a quick test after installation -2017-03-29 Brouard Nicolas <brouard@ined.fr> +* Mon Jan 30 2006 N. Brouard <brouard@ined.fr> (97a831b) +- (Module, Module): Latest Makefile - * imach.c: Summary: Temp +* Mon Jan 30 2006 N. Brouard <brouard@ined.fr> (7215625) +- *** empty log message *** -2017-03-27 Brouard Nicolas <brouard@ined.fr> +* Mon Jan 30 2006 N. Brouard <brouard@ined.fr> (49dc103) +- (Module): Back to gnuplot.exe instead of wgnuplot.exe - * imach.c: Summary: Temporary +* Fri Jan 27 2006 N. Brouard <brouard@ined.fr> (2d97123) +- *** empty log message *** -2017-03-08 Brouard Nicolas <brouard@ined.fr> +* Fri Jan 27 2006 N. Brouard <brouard@ined.fr> (69be7b0) +- noreg added - * imach.c: Summary: IMaCh version 0.99r10 bugs in gnuplot fixed +* Fri Jan 27 2006 N. Brouard <brouard@ined.fr> (e8658aa) +- 0.98b - * imach.c: Summary: Fixing data parameter line +* Wed Jan 25 2006 N. Brouard <brouard@ined.fr> (2dc3d45) +- (Module): Lots of cleaning and bugs added (Gompertz) (Module): Comments can be added in data file. Missing date values can be a simple dot '.'. -2016-12-15 Brouard Nicolas <brouard@ined.fr> +* Wed Jan 25 2006 N. Brouard <brouard@ined.fr> (4d1da8b) +- (Module): Lots of cleaning and bugs added (Gompertz) - * imach.c: Summary: 0.99 in progress +* Tue Jan 24 2006 N. Brouard <brouard@ined.fr> (26eab25) +- (Module): Comments (lines starting with a #) are allowed in data. -2016-09-15 Brouard Nicolas <brouard@ined.fr> +* Thu Jan 19 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (9ef0a8b) +- Gnuplot problem appeared... To be fixed - * imach.c: *** empty log message *** +* Thu Jan 19 2006 N. Brouard <brouard@ined.fr> (311618e) +- Test existence of gnuplot in imach path - * imach.c: Summary: not working +* Thu Jan 19 2006 N. Brouard <brouard@ined.fr> (05830af) +- Some cleaning and links added in html output -2016-09-08 Brouard Nicolas <brouard@ined.fr> +* Thu Jan 05 2006 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a55a9ec) +- *** empty log message *** - * imach.c: Summary: continue +* Tue Oct 25 2005 N. Brouard <brouard@ined.fr> (d0de0ef) +- *** empty log message *** -2016-09-07 Brouard Nicolas <brouard@ined.fr> +* Tue Oct 25 2005 N. Brouard <brouard@ined.fr> (92464d3) +- (Module): Added Imach98.pmsp and howto crete a dmg - * imach.c: Summary: Starting values from frequencies +* Tue Oct 25 2005 N. Brouard <brouard@ined.fr> (688856a) +- (Module): Creates a dmg disk for MaC OS/X - * imach.c: *** empty log message *** +* Tue Oct 25 2005 N. Brouard <brouard@ined.fr> (5eb91f0) +- Version 0.98 MacOS/X Panther -2016-09-02 Brouard Nicolas <brouard@ined.fr> +* Tue Oct 25 2005 N. Brouard <brouard@ined.fr> (2d1911a) +- version 0.98 Mac OS/X Panther - * imach.c: *** empty log message *** +* Mon Oct 17 2005 N. Brouard <brouard@ined.fr> (458f3ea) +- Makefile for Mac OS/X -2016-08-30 Brouard Nicolas <brouard@ined.fr> +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (49dd509) +- unix2dos added - * imach.c: Summary: Fixing a lots +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (8f76288) +- *** empty log message *** -2016-08-29 Brouard Nicolas <brouard@ined.fr> +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (4640522) +- The files mypar.txt and data1.txt added - * imach.c: Summary: gnuplot problem in Back projection to fix +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (6f75650) +- make imachcyg and make imachcyg-setup.exe - * imach.c: Summary: Better +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (0d4ef28) +- Small dataset added -2016-08-26 Brouard Nicolas <brouard@ined.fr> +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (37de057) +- (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 - * imach.c: - Summary: Improvement in Powell output in order to copy and paste +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a1a2eba) +- (Module): sump fixed, loop imx fixed, and simplifications. - * imach.c: Summary: Starting tests of 0.99 +* Fri Sep 30 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a684200) +- *** empty log message *** - * imach.c: Summary: to valgrind +* Wed Jun 15 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (8507808) +- *** empty log message *** -2016-08-25 Brouard Nicolas <brouard@ined.fr> +* Wed Jun 15 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (beb077d) +- *** empty log message *** - * imach.c: *** empty log message *** +* Fri Jun 10 2005 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d9cc8ef) +- Documentation corrected by Carol -2016-08-23 Brouard Nicolas <brouard@ined.fr> +* Tue May 17 2005 N. Brouard <brouard@ined.fr> (3b2db5a) +- typo - * imach.c: *** empty log message *** +* Wed May 04 2005 N. Brouard <brouard@ined.fr> (1c8ab1f) +- Set version - * imach.c: Summary: not working +* Wed May 04 2005 N. Brouard <brouard@ined.fr> (736181d) +- *** empty log message *** -2016-08-22 Brouard Nicolas <brouard@ined.fr> +* Wed May 04 2005 N. Brouard <brouard@ined.fr> (f189035) +- Output of make setup.iss using setup.iss.in as a template. setup.iss can be compile with Inno Setup compiler to get the IMaCh setup. c:\Program Files\Inno Setup 4\Compile32.exe /cc setup.issIn fact we cross compile from Linux to get imach.exe +and are using wine under Linux to run Inno Setup : +wine "C:////Program Files////Inno Setup 4////Compil32.exe" /cc setup.iss - * imach.c: Summary: not working - * imach.c: Summary: Not working +* Wed May 04 2005 N. Brouard <brouard@ined.fr> (70b50b0) +- setup.iss.in is a template for imach Inno Setup Please do make setup.iss to get it. -2016-07-23 Brouard Nicolas <brouard@ined.fr> +* Wed May 04 2005 N. Brouard <brouard@ined.fr> (54bd406) +- Cross compiling from Linux with i586-mingw32-gcc Using Wine for Inno Setup Compiler (Versin 4.2.2) - * imach.c: Summary: Completing for func too +* Thu Dec 23 2004 M.H. Cazes <cazes@ined.fr> (2cbfc33) +- File data1.txt wasn't included in doc subdirectory! -2016-07-22 Brouard Nicolas <brouard@ined.fr> +* Wed Sep 15 2004 N. Brouard <brouard@ined.fr> (a54db40) +- Add the possibility to read data file including tab characters. - * imach.c: Summary: Fixing some arrays, still debugging +* Wed Sep 15 2004 N. Brouard <brouard@ined.fr> (e75803d) +- Fix on curr_time -2016-07-21 Brouard Nicolas <brouard@ined.fr> +* Mon Aug 02 2004 Agnès Lièvre <agnes.lievre@education.gouv.fr> (fcf85e9) +- *** empty log message *** - * imach.c: - Summary: 0.99 working (more or less) for Asian Workshop on multitate methods +* Mon Aug 02 2004 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d1155ec) +- *** empty log message *** -2016-07-12 Brouard Nicolas <brouard@ined.fr> +* Mon Aug 02 2004 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e1efd44) +- (Module): Documentation on pure mortality (mle=-3) added. - * imach.c: Summary: temp +* Mon Aug 02 2004 N. Brouard <brouard@ined.fr> (b037a47) +- *** empty log message *** - * imach.c: Summary: saving but not running +* Mon Aug 02 2004 N. Brouard <brouard@ined.fr> (f86477a) +- *** empty log message *** -2016-07-01 Brouard Nicolas <brouard@ined.fr> +* Mon Aug 02 2004 N. Brouard <brouard@ined.fr> (7473b81) +- Documentation on pure mortality analysus (i.e mle=-3) - * imach.c: Summary: Fixes +* Fri Jul 23 2004 N. Brouard <brouard@ined.fr> (755be42) +- *** empty log message *** -2016-02-19 Brouard Nicolas <brouard@ined.fr> +* Fri Jul 23 2004 N. Brouard <brouard@ined.fr> (71e826e) +- *** empty log message *** - * imach-0.98r.c: Summary: Kind of 0.98r? series, starting with r7 +* Fri Jul 23 2004 N. Brouard <brouard@ined.fr> (18f9a6e) +- *** empty log message *** - * setup.iss, Makefile, version.h: *** empty log message *** +* Fri Jul 23 2004 N. Brouard <brouard@ined.fr> (4d11a51) +- *** empty log message *** - * imach.c: Summary: temporary +* Fri Jul 23 2004 N. Brouard <brouard@ined.fr> (7e21bc3) +- MaC OS/X version added. -2016-02-17 Brouard Nicolas <brouard@ined.fr> +* Mon Jul 12 2004 N. Brouard <brouard@ined.fr> (846186f) +- Add version for Mac OS X. Just define UNIX in Makefile - * imach.c: Summary: Probably last 0.98 stable version 0.98r6 +* Tue Jun 22 2004 N. Brouard <brouard@ined.fr> (6b4cfd1) +- *** empty log message *** -2016-02-16 Brouard Nicolas <brouard@ined.fr> +* Tue Jun 22 2004 N. Brouard <brouard@ined.fr> (b32f6d2) +- Inno setup for users without privilege to access Windows registries - * imach.c: Summary: minor bug +* Tue Jun 22 2004 N. Brouard <brouard@ined.fr> (0228f5f) +- Adding the noreg setup for users who don't have privileges to modify Windows registries. - * imach.c: Summary: 0.99r2 +* Thu Jun 17 2004 N. Brouard <brouard@ined.fr> (3f7cb13) +- *** empty log message *** -2016-02-15 Brouard Nicolas <brouard@ined.fr> +* Thu Jun 17 2004 N. Brouard <brouard@ined.fr> (739fd1d) +- New iss with documentation. - * imach.c: *** empty log message *** +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (ea5877f) +- *** empty log message *** -2016-02-12 Brouard Nicolas <brouard@ined.fr> +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (0bf7906) +- *** empty log message *** - * imach.c: Summary: 0.99 Back projections +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (ca81423) +- *** empty log message *** -2015-12-23 Brouard Nicolas <brouard@ined.fr> +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (921cc29) +- *** empty log message *** - * imach.c: Summary: Experimental backcast +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (9a83979) +- *** empty log message *** -2015-12-18 Brouard Nicolas <brouard@ined.fr> +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (768c2f2) +- * doc/biaspar.htm (Repository): New add - * imach.c: Summary: 0.98r4 Warning and status=-2 +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (ee94234) +- *** empty log message *** - Version 0.98r4 is now: - - displaying an error when status is -1, date of interview unknown and date of death known; - - permitting a status -2 when the vital status is unknown at a known date of right truncation. - Older changes concerning s=-2, dating from 2005 have been supersed. +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (538a9b8) +- *** empty log message *** - * Makefile: *** empty log message *** +* Wed Jun 16 2004 N. Brouard <brouard@ined.fr> (d48d7c7) +- *** empty log message *** -2015-12-16 Brouard Nicolas <brouard@ined.fr> +* Sat Jun 05 2004 N. Brouard <brouard@ined.fr> (91f1e1b) +- Load gnuplot 4.0 - * Makefile: *** empty log message *** +* Sat Jun 05 2004 N. Brouard <brouard@ined.fr> (378aea6) +- *** empty log message *** - * imach.c: Summary: 0.98r4 working +* Mon May 24 2004 N. Brouard <brouard@ined.fr> (261c4c5) +- Some improvements in the iss file. - * Makefile: Summary: linuxrpm added +* Mon May 24 2004 N. Brouard <brouard@ined.fr> (989d43e) +- Agnes added a direct estimation of mortality (without the need of computing period prevalence and differential mortality). Thus here is version 0.97a which has been distributed to some people at REVES 16 in Brugge using an Inno setup.exe for PCs. Estimates of mortality using covariates is not done today. Estimating direct mortality is a very different process because it doesn't need interpolation because it is easy to get the lx from the force of the mortality mux in the simplest case as for a Gompertz (log mux = a + b*x . But we have been able to incorporate the new code within former imach program (0.96d) without deteriorating too much the understanding of the program.Gnuplot is now installed in the same directory (on Windows) as imach. +Thus the full path of gnuplot is executed in order to access the +current version. - * Makefile: *** empty log message *** - * imach.c: Summary: temporary not working +* Sun May 16 2004 N. Brouard <brouard@ined.fr> (f61d528) +- *** empty log message *** -2015-12-11 Brouard Nicolas <brouard@ined.fr> +* Sun May 16 2004 N. Brouard <brouard@ined.fr> (d9b5913) +- New version 0.97 . First attempt to estimate force of mortality directly from the data i.e. without the need of knowing the health state at each age, but using a Gompertz model: log u =a + b*age . This is the basic analysis of mortality and should be done before any other analysis, in order to test if the mortality estimated from the cross-longitudinal survey is different from the mortality estimated from other sources like vital statistic data.The same imach parameter file can be used but the option for mle should be -3. - * imach.c: Summary: 0.98r4 +Agn�s, who wrote this part of the code, tried to keep most of the +former routines in order to include the new code within the former code. -2015-12-08 Brouard Nicolas <brouard@ined.fr> +The output is very simple: only an estimate of the intercept and of +the slope with 95% confident intervals. - * Makefile: *** empty log message *** +Current limitations: +A) Even if you enter covariates, i.e. with the +model= V1+V2 equation for example, the programm does only estimate a unique global model without covariates. +B) There is no computation of Life Expectancy nor Life Table. -2015-11-21 Brouard Nicolas <brouard@ined.fr> - * Makefile: - Summary: VBoxManage change from execute --image to run --exe and --wait-exit doesn't exist any more +* Fri Feb 20 2004 Agnès Lièvre <agnes.lievre@education.gouv.fr> (926612a) +- Version 0.96d. Population forecasting command line is (temporarily) suppressed. - * imach.c: Summary: minor typo +* Fri Jul 25 2003 N. Brouard <brouard@ined.fr> (c6a8201) +- Inno setup for Imach (first version not fully tested) - * imach.c: Summary: 0.98r3 with some graph of projected cross-sectional +* Tue Jul 15 2003 N. Brouard <brouard@ined.fr> (7f6a0dd) +- * imach.c (Repository): Errors in subdirf, 2, 3 while printing tmpout is rewritten within the same printf. Workaround: many printfs. - Author: Nicolas Brouard +* Tue Jul 08 2003 N. Brouard <brouard@ined.fr> (1344bcc) +- * imach.c (Repository): (Repository): Using imachwizard code to output a more meaningful covariance matrix (cov(a12,c31) instead of numbers. -2015-11-18 Brouard Nicolas <brouard@ined.fr> +* Fri Jun 27 2003 N. Brouard <brouard@ined.fr> (70c3428) +- Just cleaning - * imach.c: Summary: Start working on projected prevalences +* Wed Jun 25 2003 N. Brouard <brouard@ined.fr> (b322824) +- *** empty log message *** -2015-11-17 Brouard Nicolas <brouard@ined.fr> +* Wed Jun 25 2003 N. Brouard <brouard@ined.fr> (469f699) +- (Module): On windows (cygwin) function asctime_r doesn't exist so I changed back to asctime which exists. (Module): Version 0.96b - * imach.c: Summary: Adding ftolpl parameter - Author: N Brouard +* Wed Jun 25 2003 N. Brouard <brouard@ined.fr> (9d7b667) +- (Module): On windows (cygwin) function asctime_r doesn't exist so I changed back to asctime which exists. - We had difficulties to get smoothed confidence intervals. It was due - to the period prevalence which wasn't computed accurately. The inner - parameter ftolpl is now an outer parameter of the .imach parameter - file after estepm. If ftolpl is small 1.e-4 and estepm too, - computation are long. +* Wed Jun 25 2003 N. Brouard <brouard@ined.fr> (80050d1) +- *** empty log message *** - * version.h: *** empty log message *** +* Wed Jun 25 2003 N. Brouard <brouard@ined.fr> (3942495) +- * imach.c (Repository): Duplicated warning errors corrected. (Repository): Elapsed time after each iteration is now output. It helps to forecast when convergence will be reached. Elapsed time is stamped in powell. We created a new html file for the graphs concerning matrix of covariance. It has extension -cov.htm. - * imach.c: Summary: temporary +* Tue Jun 24 2003 N. Brouard <brouard@ined.fr> (32db1f7) +- (Module): Some bugs corrected for windows. Also, when mle=-1 a template is output in file "or"mypar.txt with the design of the covariance matrix to be input. -2015-10-27 Brouard Nicolas <brouard@ined.fr> +* Tue Jun 24 2003 N. Brouard <brouard@ined.fr> (ed27c48) +- (Module): Some bugs corrected for windows. Also, when mle=-1 a template is output in file "or"mypar.txt with the design of the covariance matrix to be input. - * Makefile: *** empty log message *** +* Mon Jun 23 2003 N. Brouard <brouard@ined.fr> (67b558a) +- *** empty log message *** - * setup.iss.in: Summary: some new subdirs +* Mon Jun 23 2003 N. Brouard <brouard@ined.fr> (f0a63ac) +- * imach.c (Repository): Create a sub-directory where all the secondary files are. Only imach, htm, gp and r(imach) are on the main directory. Correct time and other things. - * imach.c: *** empty log message *** +* Wed Jun 18 2003 N. Brouard <brouard@ined.fr> (fcfe6b3) +- Version 0.96 - * setup.iss.in: - Summary: Adding gnuplot 5.1 with bin and etc for pango fonts +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (7bb15d3) +- *** empty log message *** -2015-10-24 Brouard Nicolas <brouard@ined.fr> +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (abe8407) +- *** empty log message *** - * imach.c: *** empty log message *** +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (c39e0b3) +- *** empty log message *** -2015-10-23 Brouard Nicolas <brouard@ined.fr> +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (cd68f57) +- * timeval.h (Module): Added included file to make use of gettimeofday working on win32 with cygwin. - * imach.c: - Summary: 0.98r3 some clarification for graphs on likelihood contributions +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (40e40cd) +- (Module): Change position of html and gnuplot routines and added routine fileappend. -2015-10-01 Brouard Nicolas <brouard@ined.fr> +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (2ccce6d) +- *** empty log message *** - * imach.c: Summary: Some new graphs of contribution to likelihood +* Tue Jun 17 2003 N. Brouard <brouard@ined.fr> (491f271) +- * imach.c (Repository): Check when date of death was earlier that current date of interview. It may happen when the death was just prior to the death. In this case, dh was negative and likelihood was wrong (infinity). We still send an "Error" but patch by assuming that the date of death was just one stepm after the interview. (Repository): Because some people have very long ID (first column) we changed int to long in num[] and we added a new lvector for memory allocation. But we also truncated to 8 characters (left truncation) (Repository): No more line truncation errors. -2015-09-30 Brouard Nicolas <brouard@ined.fr> +* Fri Jun 13 2003 N. Brouard <brouard@ined.fr> (b1295ca) +- * imach.c (Repository): Replace "freqsummary" at a correct place. It differs from routine "prevalence" which may be called many times. Probs is memory consuming and must be used with parcimony. Version 0.95a2 (should output exactly the same maximization than 0.8a2) - * Makefile: - Summary: Version read from version.h, itself read with cmake +* Tue Jun 10 2003 Agnès Lièvre <agnes.lievre@education.gouv.fr> (b119124) +- *** empty log message *** - * imach.c: Summary: looking at better estimation of the hessian +* Thu Jun 05 2003 N. Brouard <brouard@ined.fr> (fa45d7a) +- Add log in imach.c and fullversion number is now printed. - Also a better criteria for convergence to the period prevalence And - therefore adding the number of years needed to converge. (The - prevalence in any alive state shold sum to one +* Thu Jun 05 2003 N. Brouard <brouard@ined.fr> (bdd81a4) +- *** empty log message *** - * Makefile: *** empty log message *** +* Thu Jun 05 2003 N. Brouard <brouard@ined.fr> (b3e8331) +- Trying to add the true revision is the program and log -2015-09-22 Brouard Nicolas <brouard@ined.fr> +* Thu Jun 05 2003 N. Brouard <brouard@ined.fr> (5517589) +- *** empty log message *** - * imach.c: - Summary: Adding some overall graph on contribution to likelihood. Might change +* Tue May 27 2003 N. Brouard <brouard@ined.fr> (01f8299) +- minor changes -2015-09-15 Brouard Nicolas <brouard@ined.fr> +* Fri May 16 2003 N. Brouard <brouard@ined.fr> (d256a62) +- *** empty log message *** - * Makefile: *** empty log message *** +* Fri May 16 2003 N. Brouard <brouard@ined.fr> (2156ceb) +- (Module): Insert of a warning if the delay between two waves is negative. - * imach.c: Summary: 0.98r0 +* Fri May 16 2003 N. Brouard <brouard@ined.fr> (b07388a) +- *** empty log message *** - - Some new graphs like survival functions - - Some bugs fixed like model=1+age+V2. +* Fri May 16 2003 N. Brouard <brouard@ined.fr> (08022c0) +- (Module): - * ChangeLog, Makefile: Summary: 0.98r0 +* Sat May 03 2003 N. Brouard <brouard@ined.fr> (189abca) +- imach095 Windows 32 version - * CMakeLists.txt: Summary: Some tests for setup.iss +* Sat May 03 2003 N. Brouard <brouard@ined.fr> (0d8084a) +- *** empty log message *** -2015-09-15 Nicolas J Brouard <nbrouard@tugault.ined.fr> +* Sat May 03 2003 N. Brouard <brouard@ined.fr> (d35ef9a) +- Some cleaning - * (Module): 0.98r0 Some new graphs, some bugs fixed: model=1+age+V2. etc +* Fri May 02 2003 N. Brouard <brouard@ined.fr> (a2cf778) +- Check memory allocation through valgrind on Linux and libnjamd . So it is free of malloc bugs now! Version 0.95 -2015-08-18 Nicolas J Brouard <nbrouard@tugault.local> +* Wed Apr 09 2003 N. Brouard <brouard@ined.fr> (e709016) +- *** empty log message *** - * (Module): Adding error when the covariance matrix doesn't contain the exact number of lines required by the model line. +* Tue Apr 08 2003 Agnès Lièvre <agnes.lievre@education.gouv.fr> (88456b7) +- In freqsummary, the observed prevalence is now computed from all the waves and the bug in the forecasting routine is corrected. We can forecast prevalence if ncov=0. -2015-08-03 Nicolas J Brouard <nbrouard@tugault.ined.fr> +* Fri Mar 28 2003 N. Brouard <brouard@ined.fr> (4421903) +- (Module): In version up to 0.92 likelihood was computed as if date of death was unknown. Death was treated as any other health state: the date of the interview describes the actual state and not the date of a change in health state. The former idea was to consider that at each interview the state was recorded (healthy, disable or death) and IMaCh was corrected; but when we introduced the exact date of death then we should have modified the contribution of an exact death to the likelihood. This new contribution is smaller and very dependent of the step unit stepm. It is no more the probability to die between last interview and month of death but the probability to survive from last interview up to one month before death multiplied by the 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. Version 0.93 - * (Module): Changing Variance of one-step probabilities into Standard deviation (thanks to Yao-Chi Shih) +* Fri Mar 28 2003 N. Brouard <brouard@ined.fr> (b17892b) +- (Module): In version up to 0.92 likelihood was computed as if date of death was unknown. Death was treated as any other health state: the date of the interview describes the actual state and not the date of a change in health state. The former idea was to consider that at each interview the state was recorded (healthy, disable or death) and IMaCh was corrected; but when we introduced the exact date of death then we should have modified the contribution of an exact death to the likelihood. This new contribution is smaller and very dependent of the step unit stepm. It is no more the probability to die between last interview and month of death but the probability to survive from last interview up to one month before death multiplied by the 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. -2014-12-16 Nicolas J Brouard <nbrouard@tugault.local> +* Wed Feb 05 2003 N. Brouard <brouard@ined.fr> (33cee3c) +- Preforecast routine cleaned. Change of notation, comments added. Version 0.92 - * imach.c (Module): Merging 1.61 to 1.162 +* Tue Feb 04 2003 N. Brouard <brouard@ined.fr> (94f4af6) +- *** empty log message *** -2014-09-02 Nicolas J Brouard <nbrouard@njbrouard.ined.fr> +* Tue Feb 04 2003 Agnès Lièvre <agnes.lievre@education.gouv.fr> (1311092) +- Correction of initialisations in case of several death states. - * prevlim.h (Module): +* Tue Jan 28 2003 N. Brouard <brouard@ined.fr> (8619e24) +- Fixed probability of death over estepm months. We don't calculate the probability of death over a year anymore. Fix estepm as 12 and you will get it. -2014-01-26 Nicolas J Brouard <nbrouard@ledermann-2.local> +* Tue Jan 28 2003 N. Brouard <brouard@ined.fr> (428237b) +- I changed some comments - * imach.c (Module): Trying to merge old staffs together while being at Tokyo. Not tested... - (Module): Version 0.98nR Running ok, but output format still only works for three covariates. +* Wed Dec 11 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (b9a8d58) +- Correction of bug related to the covariates -2010-04-29 brouard <brouard@ined.fr> +* Thu Nov 21 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (bc90b1f) +- Extrapolation doesn't seem to work fine, so we decided to use interpolation only ie at the cost of an additional matrix product if the bias, bbh, is positive, in order to make it negative (interpolation). We keep other methods mle=4 no adjustment for bias, mle=3 inter-extra exponential, mle=2 inter-extra linear. - * imach.c (Module): Checking covariates for more complex models - than V1+V2. A lot of change to be done. Unstable. +* Wed Nov 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (fdddea1) +- Trying a linear interpolation extrapolation in the computing of likelihood for large stepm. -2010-04-26 brouard <brouard@ined.fr> +* Wed Nov 20 2002 N. Brouard <brouard@ined.fr> (964a040) +- just a sign error in mlikeli - * imach.c (Module): merging some libgsl code. Fixing computation - of likelione (using inter/intrapolation if mle = 0) in order to - get same likelihood as if mle=1. - Some cleaning of code and comments added. +* Tue Nov 19 2002 N. Brouard <brouard@ined.fr> (43cf7b3) +- mle=1 corrects bias mle=2 no correction -2009-10-29 brouard <brouard@ined.fr> +* Tue Nov 19 2002 N. Brouard <brouard@ined.fr> (e4f50c7) +- Allocation bug - * imach.c (Module): Now imach stops if date of birth, at least year of birth, is not given. Some cleaning of the code. +* Mon Nov 18 2002 N. Brouard <brouard@ined.fr> (ed7dad7) +- Major change: likelihood is modified in order to unbiased the duration between 2 waves which is rounded (biased) to the nearest multiple of stepm. Some cleaning of the code. Many allocations were not freed correctly. -2006-06-30 Brouard Nicolas <brouard@localhost> +* Fri Jul 26 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (3a31c8e) +- Comments added and corrections in routine moving average done. - * imach.c (Module): Clarifications on computing e.j +* Thu Jul 25 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d053e4c) +- *** empty log message *** -2006-04-28 Brouard Nicolas <brouard@localhost> +* Wed Jul 24 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (abb8dd8) +- *** empty log message *** - * imach.c (Module): Yes the sum of survivors was wrong since - imach-114 because nhstepm was no more computed in the age - loop. Now we define nhstepma in the age loop. - (Module): In order to speed up (in case of numerous covariates) we - compute health expectancies (without variances) in a first step - and then all the health expectancies with variances or standard - deviation (needs data from the Hessian matrices) which slows the - computation. - In the future we should be able to stop the program is only health - expectancies and graph are needed without standard deviations. +* Wed Jul 24 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d45eaaa) +- Bug in ***movingaverage -2006-04-04 LIEVRE Agnes <lievre@PC_00697.ined.fr> +* Wed Jul 24 2002 N. Brouard <brouard@ined.fr> (044d93e) +- mobilav can be 3, 5 or 7 instead of only 1 (which defaults to 5). - * imach.iss (Module): +* Wed Jul 24 2002 N. Brouard <brouard@ined.fr> (f5896ac) +- *** empty log message *** - * imach.c (Module): bugs in evsi + population file added in htm output file +* Tue Jul 23 2002 N. Brouard <brouard@ined.fr> (d7a4370) +- Moving average of observed prevalence moved -2006-03-22 LIEVRE Agnes <lievre@PC_00697.ined.fr> +* Fri Jul 19 2002 N. Brouard <brouard@ined.fr> (d9ab416) +- Some improvments - * imach.c (Module): +* Fri Jul 19 2002 N. Brouard <brouard@ined.fr> (baa504a) +- Some errors corrected in diagonalisation of covariance-matrice -2006-03-20 Brouard Nicolas <brouard@localhost> +* Wed Jun 26 2002 N. Brouard <brouard@ined.fr> (d947f1c) +- *** empty log message *** - * imach.c (Module): <title> changed, corresponds to .htm file - name. <head> headers where missing. +* Thu Jun 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (cb693e4) +- Changes in the htm file. - * Makefile (Module): 0.98g +* Mon Jun 10 2002 N. Brouard <brouard@ined.fr> (69b1cf5) +- version 0.8h - * imach.c (Module): Weights can have a decimal point as for - English (a comma might work with a correct LC_NUMERIC environment, - otherwise the weight is truncated). - Modification of warning when the covariates values are not 0 or - 1. - Version 0.98g +* Mon Jun 10 2002 N. Brouard <brouard@ined.fr> (67b2357) +- Many changes: (a) We look at covariance between step probabilities by drawing confidence interval ellipsoids of two step probabilities pij versus pkl. It is done by diagonalizing the inverse of the convariance matrix.(b) In order to write to the gnuplot file or even to the html file +without using to much memory we are now reopening ficgp and fichtm +with an "append" option each time we need them into the main program. +It is better than keeping matrices in memory until the end. -2006-03-16 LIEVRE Agnes <lievre@PC_00697.ined.fr> - * imach.c (Module): Comments concerning covariates added +* Thu May 30 2002 N. Brouard <brouard@ined.fr> (1645dce) +- (Module): Add correlation matrix of one-step probabilities and covariance matrix - * noreg-setup.iss (Module): Version 0.98f +* Fri May 24 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (571d916) +- The bug in printinghtm is corrected - * Makefile (Module): Version 0.98f make _windows=1 imachcyg-setup +* Fri May 24 2002 N. Brouard <brouard@ined.fr> (ca336cd) +- Change version number ot 0.8e - * imach.c (Module): refinements in the computation of lli if - status=-2 in order to have more reliable computation if stepm is - not 1 month. Version 0.98f +* Fri May 24 2002 N. Brouard <brouard@ined.fr> (997875c) +- Change of gif to png. Clarify some of the outputs. Add a new graph: pij*YEARM/stepm in order to get pseudo-incidence per year. -2006-03-15 Brouard Nicolas <brouard@localhost> +* Tue May 21 2002 N. Brouard <brouard@ined.fr> (6338615) +- Change gif images to png format because of gif copyright. Change wgnuplot to gnuplot Correct a small bug - * imach.c (Module): Bug if status = -2, the loglikelihood was - computed as likelihood omitting the logarithm. Version O.98e +* Tue May 07 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (ba5ae7e) +- Version 0.8a. Standard deviation of health expectancies eij. -2006-03-14 Brouard Nicolas <brouard@localhost> +* Fri Apr 19 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (66e5d5e) +- *** empty log message *** - * imach.c (Module): varevsij Comments added explaining the second - table of variances if popbased=1 . - (Module): Covariances of eij, ekl added, graphs fixed, new html link. - (Module): Function pstamp added - (Module): Version 0.98d +* Fri Apr 05 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (1b1e97b) +- *** empty log message *** -2006-03-06 Brouard Nicolas <brouard@localhost> +* Wed Apr 03 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (46ba219) +- The bug in printinghtml is corrected. - * imach.c (Module): Variance-covariance wrong links and - varian-covariance of ej. is needed (Saito). +* Fri Mar 29 2002 N. Brouard <brouard@ined.fr> (fa9d9d6) +- Changed version to 0.8b -2006-02-27 Brouard Nicolas <brouard@localhost> +* Fri Mar 29 2002 N. Brouard <brouard@ined.fr> (9bdccd3) +- Estepm added. We are calculating Life expectancy by interpolating the survival function pijx linearly every estepm month. Estepm should be higher than stepm. It is a new parameter (sorry). - * imach.c (Module): One freematrix added in mlikeli! +* Tue Mar 26 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (73ce116) +- Version used for article20.tex Changes in varevsij. -2006-02-26 Brouard Nicolas <brouard@localhost> +* Wed Mar 13 2002 N. Brouard <brouard@ined.fr> (380564d) +- CHANGE ncov to ncovcol There was a confusion with older ncov parameter. In fact it was the number of columns, between id and date of birth, which can be used for covariates. In the program we use ncovmodel for the real number of covariates. Version 0.8 ! - * imach.c (Module): Some improvements in processing parameter - filename with strsep. +* Tue Mar 12 2002 N. Brouard <brouard@ined.fr> (39e43f2) +- Some cleaning in esij and nhstepm -2006-02-24 Brouard Nicolas <brouard@localhost> +* Mon Mar 11 2002 N. Brouard <brouard@ined.fr> (4a7ebf2) +- Supress a bug in esij - * imach.c (Module): Memory leaks checks with valgrind and: - datafile was not closed, some imatrix were not freed and on matrix - allocation too. +* Sun Mar 10 2002 N. Brouard <brouard@ined.fr> (4bd3008) +- 0.71a cleaning done -2006-02-09 LIEVRE Agnes <lievre@PC_00697.ined.fr> +* Fri Mar 08 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (810a875) +- version 0.71 - * strsep.c (Module): Inclusion because not in mingw32!!! +* Fri Mar 08 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (276fcbf) +- Version 0.71 - * setup.iss.in (Module): IMACHSETUPVERSION added +* Fri Mar 08 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e235c72) +- *** empty log message *** - * noreg-setup.iss (Module): added to cvs tree +* Wed Mar 06 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (04f4b67) +- Output mle=0 in the Rparameter file so thart clicking on rparameterfil.imach will skip the optimization process. - * Makefile (Module): IMACHSETUPVERSION added +* Fri Mar 01 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (c609984) +- Some improvements in forecasting and the bug relating to agemax is corrected. -2006-01-30 BROUARD Nicolas <brouard@localhost> +* Thu Feb 28 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (67ebb6b) +- Some changes in population forecasting - * Makefile (Module, Module): Latest Makefile +* Wed Feb 27 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (5f71323) +- Add date in the freqsummary file. - * imach.c (Module): Back to gnuplot.exe instead of wgnuplot.exe +* Tue Feb 26 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d609b47) +- Cleaning of the main function: gnuplot and html file are now subroutines; the bug in the forecasting is corrected; the moving average statement moved to the last command line. -2006-01-27 BROUARD Nicolas <brouard@localhost> +* Fri Feb 22 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (2f4c363) +- *** empty log message *** - * noreg-setup.iss (Module): ADDED +* Fri Feb 22 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (65c42d0) +- Merge OK -2006-01-24 BROUARD Nicolas <brouard@localhost> +* Fri Feb 22 2002 N. Brouard <brouard@ined.fr> (e412aaf) +- First merge between Agn��s and Nicolas!! - * imach.c (Module): Comments (lines starting with a #) are allowed in data. +* Thu Feb 21 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (2da2b6e) +- Windows IMaCh icon added!!! -2005-10-25 Nicolas Brouard <brouard@dhcp171.recherche.ined.fr> +* Thu Feb 21 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (c348299) +- Error 108 if stepm is not equal to 1 (month) because forecasting is only possible with a former optimization with a step of one month. - * Makefile (Module): Added Imach98.pmsp and howto crete a dmg +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d5894d5) +- *** empty log message *** - * createdmg.sh (Module): Creates a dmg disk for MaC OS/X +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (82ec47f) +- New parameter file for version 0.7 -2005-09-30 <lievre@PC_00595> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (16f5416) +- Version 0.7 - * 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 +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (39773f6) +- ChangeLog added -2004-05-20 Brouard Nicolas <brouard@localhost> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a55f0c5) +- index.htm is now renamed by the parmater filename.htm - * imach.c (Repository): - Agnes added a direct estimation of mortality (without the need of - computing period prevalence and differential mortality). Thus here - is version 0.97a which has been distributed to some people at - REVES 16 in Brugge using an Inno setup.exe for PCs. Estimates of - mortality using covariates is not done today. Estimating direct - mortality is a very different process because it doesn't need - interpolation because it is easy to get the lx from the force of - the mortality mux in the simplest case as for a Gompertz (log mux - = a + b*x . But we have been able to incorporate the new code - within former imach program (0.96d) without deteriorating too much - the understanding of the program. +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e5d102f) +- Some changes -2003-06-25 <brouard@BROUARD> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d30aefb) +- Nothing - * imach.c (Module): On windows (cygwin) function asctime_r doesn't - exist so I changed back to asctime which exists. - (Module): Version 0.96b +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (ede97dd) +- Prevalence and forecasting -2003-06-24 <brouard@BROUARD> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (c2415a7) +- Forecasting and calculation of the mean date of interview - * imach.c (Module): Some bugs corrected for windows. Also, when - mle=-1 a template is output in file "or"mypar.txt with the design - of the covariance matrix to be input. +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (b0d860d) +- Forecasting -2003-06-25 Brouard Nicolas <brouard@homebrou> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a446788) +- Some bugs corrected - * imach.c (Repository): Duplicated warning errors corrected. - (Repository): Elapsed time after each iteration is now output. It - helps to forecast when convergence will be reached. Elapsed time - is stamped in powell. We created a new html file for the graphs - concerning matrix of covariance. It has extension -cov.htm. +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d896028) +- Version 0.7 hPijx are now computed for h=1 year instead of 2 years -2003-06-23 Brouard Nicolas <brouard@homebrou> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (0e66e49) +- Moving average on cross-sectional prevalences - * imach.c (Repository): Create a sub-directory where all the secondary files are. Only imach, htm, gp and r(imach) are on the main directory. Correct time and other things. +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (422d226) +- Forecasting -2003-06-18 Brouard Nicolas <brouard@homebrou> +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (6d9e669) +- Variance of one-step transitions added and forecasting of prevalences - * imach.c (Repository): Suppress abusive calls to append to file html (solution was to put fichtm as a global variable. Version 0.96 +* Wed Feb 20 2002 Agnès Lièvre <agnes.lievre@education.gouv.fr> (ccc91b7) +- Remise �� jour du serveur CVS peu de changements -2003-06-17 Brouard Nicolas <brouard@homebrou> +* Thu May 17 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (b465b4f) +- Updated to Windows2000: changes in the path name to execute wgnuplot. +* Wed May 09 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (649e42e) +- Changes in calculation spaces between two waves - * imach.c (Repository): Check when date of death was earlier that - current date of interview. It may happen when the death was just - prior to the death. In this case, dh was negative and likelihood - was wrong (infinity). We still send an "Error" but patch by - assuming that the date of death was just one stepm after the - interview. - (Repository): Because some people have very long ID (first column) - we changed int to long in num[] and we added a new lvector for - memory allocation. But we also truncated to 8 characters (left - truncation) +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (ac92831) +- Change of index.htm to parameterfile.htm Version 0.64b - (Repository): No more line truncation errors. +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (d22f91f) +- hanges in Makefile. Some cleaning in .gif and .txt files -2003-06-14 Brouard Nicolas <brouard@homebrou> +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (9d16f3c) +- Debug option added. - * imach.c (Repository): Add of a routine likelione (likelihood - only once) which prints on a text file - (ilk) the contributions to the likelihood for each - individual/wave. +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (856e300) +- Changes index.htm: title, model, ... -2003-06-13 Brouard Nicolas <brouard@homebrou> - * imach.c (Repository): Replace "freqsummary" at a correct - place. It differs from routine "prevalence" which may be called - many times. Probs is memory consuming and must be used with - parcimony. +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (937626b) +- Add age*V1 -2003-06-17 <brouard@BROUARD> +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (1c3d8f8) +- some changes index.htm Version16. - * timeval.h (Module): Added included file to make use of - gettimeofday working on win32 with cygwin. +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (a02fe69) +- suppressing cygwinpath. split directory instead. version 15 -2003-05-16 Brouard Nicolas <brouard@brouard> - * imach.c (Module): Insert of a warning if the delay between two - waves is negative. +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (578a2fc) +- *** empty log message *** - * imach.c (Module): +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (0616e35) +- version 13 -2003-05-03 <brouard@BROUARD> +* Wed May 02 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (e7f03bd) +- hello.c removed - * imach.c: Some cleaning +* Tue Mar 13 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (80d4498) +- Version Rostock: covariable + graphique proba elementaire -2003-03-28 <brouard@BROUARD> - * imach.c (Module): In version up to 0.92 likelihood was computed - as if date of death was unknown. Death was treated as any other - health state: the date of the interview describes the actual state - and not the date of a change in health state. The former idea was - to consider that at each interview the state was recorded - (healthy, disable or death) and IMaCh was corrected; but when we - introduced the exact date of death then we should have modified - the contribution of an exact death to the likelihood. This new - contribution is smaller and very dependent of the step unit - stepm. It is no more the probability to die between last interview - and month of death but the probability to survive from last - interview up to one month before death multiplied by the - 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. +* Tue Mar 13 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (2327bfb) +- Version Rostock: ajout covariable commande model= -2002-05-30 <brouard@BROUARD> +* Tue Mar 13 2001 Agnès Lièvre <agnes.lievre@education.gouv.fr> (2673df5) +- Version Rostock: covariables + graphique proba elementaires - * imach.c (Module): Add correlation matrix of one-step - probabilities and covariance matrix +* Thu Dec 28 2000 N. Brouard <brouard@ined.fr> (74d3bec) +- Import de imach064 diff --git a/src/Makefile b/src/Makefile index 9aeca25..16557eb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -175,10 +175,15 @@ imachopt.o : imach.c version.h $(CCOPT) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c # $(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c +ChangeLog: + LANG=C git log --date=format:"%a %b %d %Y" --pretty="tformat:* %ad %an <%ae> (%h)%n- %s%b%n" >ChangeLog +# git log --pretty="tformat:* %cd %an <%ae> (%h)%n- %s%b%n" | perl -lap00e "~s/(\d\{2]:){2}\d{2} (\d{4}) [+-]\d{4}/$2/g">ChangeLog -imachrpm : imachopt.o +imachrpm : imachopt.o ChangeLog pwd - (cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\ + mkdir -p ../build && mkdir -p ../build/Output + pwd + (cd ../build && rm -rf gnulinux && mkdir gnulinux && cd gnulinux ;\ pwd ;\ cmake ../..;\ cmake --build . ; \ @@ -186,8 +191,9 @@ imachrpm : imachopt.o cpack --debug --verbose -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM;\ cp imach-$(VERSION)-*.rpm ../Output/ ;) -imachsrcrpm : imachopt.o +imachsrcrpm : imachopt.o ChangeLog pwd + mkdir -p ../build && mkdir -p ../build/Output (cd ../build && rm -rf gnulinux && mkdir gnulinux && cd gnulinux ;\ pwd ;\ cmake ../..;\ -- 2.43.0