version 1.6, 2003/06/17 20:16:05
|
version 1.33, 2010/04/30 18:19:29
|
Line 1
|
Line 1
|
2003-06-17 Brouard Nicolas <brouard@homebrou>
|
2010-04-29 brouard <brouard@ined.fr>
|
|
|
* imach.c (Repository): Check when date of death was earlier that
|
* imach.c (Module): Checking covariates for more complex models
|
current date of interview. It may happen when the death was just
|
than V1+V2. A lot of change to be done. Unstable.
|
prior to the death. In this case, dh was negative and likelihood
|
|
was wrong (infinity). We still send an "Error" but patch by
|
2010-04-26 brouard <brouard@ined.fr>
|
assuming that the date of death was just one stepm after the
|
|
interview.
|
* imach.c (Module): merging some libgsl code. Fixing computation
|
(Repository): Because some people have very long ID (first column)
|
of likelione (using inter/intrapolation if mle = 0) in order to
|
we changed int to long in num[] and we added a new lvector for
|
get same likelihood as if mle=1.
|
memory allocation. But we also truncated to 8 characters (left
|
Some cleaning of code and comments added.
|
truncation)
|
|
(Repository): No more line truncation errors.
|
2009-10-29 brouard <brouard@ined.fr>
|
|
|
2003-06-14 Brouard Nicolas <brouard@homebrou>
|
* imach.c (Module): Now imach stops if date of birth, at least year of birth, is not given. Some cleaning of the code.
|
|
|
* imach.c (Repository): Add of a routine likelione (likelihood
|
2006-06-30 Brouard Nicolas <brouard@localhost>
|
only once) which prints on a text file
|
|
(ilk) the contributions to the likelihood for each
|
* imach.c (Module): Clarifications on computing e.j
|
individual/wave.
|
|
|
2006-04-28 Brouard Nicolas <brouard@localhost>
|
2003-06-13 Brouard Nicolas <brouard@homebrou>
|
|
|
* imach.c (Module): Yes the sum of survivors was wrong since
|
* imach.c (Repository): Replace "freqsummary" at a correct
|
imach-114 because nhstepm was no more computed in the age
|
place. It differs from routine "prevalence" which may be called
|
loop. Now we define nhstepma in the age loop.
|
many times. Probs is memory consuming and must be used with
|
(Module): In order to speed up (in case of numerous covariates) we
|
parcimony.
|
compute health expectancies (without variances) in a first step
|
|
and then all the health expectancies with variances or standard
|
2003-06-17 <brouard@BROUARD>
|
deviation (needs data from the Hessian matrices) which slows the
|
|
computation.
|
* timeval.h (Module): Added included file to make use of
|
In the future we should be able to stop the program is only health
|
gettimeofday working on win32 with cygwin.
|
expectancies and graph are needed without standard deviations.
|
|
|
2003-05-16 Brouard Nicolas <brouard@brouard>
|
2006-04-04 LIEVRE Agnes <lievre@PC_00697.ined.fr>
|
|
|
* imach.c (Module): Insert of a warning if the delay between two
|
* imach.iss (Module):
|
waves is negative.
|
|
|
* imach.c (Module): bugs in evsi + population file added in htm output file
|
* imach.c (Module):
|
|
|
2006-03-22 LIEVRE Agnes <lievre@PC_00697.ined.fr>
|
2003-05-03 <brouard@BROUARD>
|
|
|
* imach.c (Module):
|
* imach.c: Some cleaning
|
|
2003-03-28 <brouard@BROUARD>
|
2006-03-20 Brouard Nicolas <brouard@localhost>
|
|
|
* imach.c (Module): In version up to 0.92 likelihood was computed
|
* imach.c (Module): <title> changed, corresponds to .htm file
|
as if date of death was unknown. Death was treated as any other
|
name. <head> headers where missing.
|
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
|
* Makefile (Module): 0.98g
|
to consider that at each interview the state was recorded
|
|
(healthy, disable or death) and IMaCh was corrected; but when we
|
* imach.c (Module): Weights can have a decimal point as for
|
introduced the exact date of death then we should have modified
|
English (a comma might work with a correct LC_NUMERIC environment,
|
the contribution of an exact death to the likelihood. This new
|
otherwise the weight is truncated).
|
contribution is smaller and very dependent of the step unit
|
Modification of warning when the covariates values are not 0 or
|
stepm. It is no more the probability to die between last interview
|
1.
|
and month of death but the probability to survive from last
|
Version 0.98g
|
interview up to one month before death multiplied by the
|
|
probability to die within a month. Thanks to Chris
|
2006-03-16 LIEVRE Agnes <lievre@PC_00697.ined.fr>
|
Jackson for correcting this bug. Former versions increased
|
|
mortality artificially. The bad side is that we add another loop
|
* imach.c (Module): Comments concerning covariates added
|
which slows down the processing. The difference can be up to 10%
|
|
lower mortality.
|
* noreg-setup.iss (Module): Version 0.98f
|
|
|
2002-05-30 <brouard@BROUARD>
|
* Makefile (Module): Version 0.98f make _windows=1 imachcyg-setup
|
|
|
*
|
* imach.c (Module): refinements in the computation of lli if
|
|
status=-2 in order to have more reliable computation if stepm is
|
* imach.c (Module): Add correlation matrix of one-step
|
not 1 month. Version 0.98f
|
probabilities and covariance matrix
|
|
|
2006-03-15 Brouard Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): Bug if status = -2, the loglikelihood was
|
|
computed as likelihood omitting the logarithm. Version O.98e
|
|
|
|
2006-03-14 Brouard Nicolas <brouard@localhost>
|
|
|
|
* 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
|
|
|
|
2006-03-06 Brouard Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): Variance-covariance wrong links and
|
|
varian-covariance of ej. is needed (Saito).
|
|
|
|
2006-02-27 Brouard Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): One freematrix added in mlikeli!
|
|
|
|
2006-02-26 Brouard Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): Some improvements in processing parameter
|
|
filename with strsep.
|
|
|
|
2006-02-24 Brouard Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): Memory leaks checks with valgrind and:
|
|
datafile was not closed, some imatrix were not freed and on matrix
|
|
allocation too.
|
|
|
|
2006-02-09 LIEVRE Agnes <lievre@PC_00697.ined.fr>
|
|
|
|
* strsep.c (Module): Inclusion because not in mingw32!!!
|
|
|
|
* setup.iss.in (Module): IMACHSETUPVERSION added
|
|
|
|
* noreg-setup.iss (Module): added to cvs tree
|
|
|
|
* Makefile (Module): IMACHSETUPVERSION added
|
|
|
|
2006-01-30 BROUARD Nicolas <brouard@localhost>
|
|
|
|
* Makefile (Module, Module): Latest Makefile
|
|
|
|
* imach.c (Module): Back to gnuplot.exe instead of wgnuplot.exe
|
|
|
|
2006-01-27 BROUARD Nicolas <brouard@localhost>
|
|
|
|
* noreg-setup.iss (Module): ADDED
|
|
|
|
2006-01-24 BROUARD Nicolas <brouard@localhost>
|
|
|
|
* imach.c (Module): Comments (lines starting with a #) are allowed in data.
|
|
|
|
2005-10-25 Nicolas Brouard <brouard@dhcp171.recherche.ined.fr>
|
|
|
|
* Makefile (Module): Added Imach98.pmsp and howto crete a dmg
|
|
|
|
* createdmg.sh (Module): Creates a dmg disk for MaC OS/X
|
|
|
|
2005-09-30 <lievre@PC_00595>
|
|
|
|
* imach.c (Module): sump fixed, loop imx fixed, and simplifications.
|
|
(Module): If the status is missing at the last wave but we know
|
|
that the person is alive, then we can code his/her status as -2
|
|
(instead of missing=-1 in earlier versions) and his/her
|
|
contributions to the likelihood is 1 - Prob of dying from last
|
|
health status (= 1-p13= p11+p12 in the easiest case of somebody in
|
|
the healthy state at last known wave). Version is 0.98
|
|
|
|
2004-05-20 Brouard Nicolas <brouard@localhost>
|
|
|
|
* 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.
|
|
|
|
2003-06-25 <brouard@BROUARD>
|
|
|
|
* imach.c (Module): On windows (cygwin) function asctime_r doesn't
|
|
exist so I changed back to asctime which exists.
|
|
(Module): Version 0.96b
|
|
|
|
2003-06-24 <brouard@BROUARD>
|
|
|
|
* 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.
|
|
|
|
2003-06-25 Brouard Nicolas <brouard@homebrou>
|
|
|
|
* 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.
|
|
|
|
2003-06-23 Brouard Nicolas <brouard@homebrou>
|
|
|
|
* 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.
|
|
|
|
2003-06-18 Brouard Nicolas <brouard@homebrou>
|
|
|
|
* imach.c (Repository): Suppress abusive calls to append to file html (solution was to put fichtm as a global variable. Version 0.96
|
|
|
|
2003-06-17 Brouard Nicolas <brouard@homebrou>
|
|
|
|
|
|
* 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.
|
|
|
|
2003-06-14 Brouard Nicolas <brouard@homebrou>
|
|
|
|
* 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.
|
|
|
|
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.
|
|
|
|
2003-06-17 <brouard@BROUARD>
|
|
|
|
* timeval.h (Module): Added included file to make use of
|
|
gettimeofday working on win32 with cygwin.
|
|
|
|
2003-05-16 Brouard Nicolas <brouard@brouard>
|
|
* imach.c (Module): Insert of a warning if the delay between two
|
|
waves is negative.
|
|
|
|
* imach.c (Module):
|
|
|
|
2003-05-03 <brouard@BROUARD>
|
|
|
|
* imach.c: Some cleaning
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
2002-05-30 <brouard@BROUARD>
|
|
|
|
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
|
|
|
|
* imach.c (Module): Add correlation matrix of one-step
|
|
|
|
|
|
probabilities and covariance matrix
|
|
|
|
|
|
|
|
|
|
|