CVS log for imach096d/src/imach.c
Up to [Local Repository] / imach096d / src
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
Revision 1.97: download - view: text, markup, annotated - select for diffs
Fri Feb 20 13:25:42 2004 UTC (20 years, 6 months ago) by lievre
Branches: MAIN
CVS tags: HEAD
Diff to: previous 1.96: preferred, unified
Changes since revision 1.96: +11 -6
lines
Version 0.96d. Population forecasting command line is (temporarily)
suppressed.
Revision 1.96: download - view: text, markup, annotated - select for diffs
Tue Jul 15 15:38:55 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.95: preferred, unified
Changes since revision 1.95: +51 -36
lines
* imach.c (Repository): Errors in subdirf, 2, 3 while printing tmpout is
rewritten within the same printf. Workaround: many printfs.
Revision 1.95: download - view: text, markup, annotated - select for diffs
Tue Jul 8 07:54:34 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.94: preferred, unified
Changes since revision 1.94: +122 -50
lines
* imach.c (Repository):
(Repository): Using imachwizard code to output a more meaningful covariance
matrix (cov(a12,c31) instead of numbers.
Revision 1.94: download - view: text, markup, annotated - select for diffs
Fri Jun 27 13:00:02 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.93: preferred, unified
Changes since revision 1.93: +54 -80
lines
Just cleaning
Revision 1.93: download - view: text, markup, annotated - select for diffs
Wed Jun 25 16:33:55 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.92: preferred, unified
Changes since revision 1.92: +8 -4
lines
(Module): On windows (cygwin) function asctime_r doesn't
exist so I changed back to asctime which exists.
(Module): Version 0.96b
Revision 1.92: download - view: text, markup, annotated - select for diffs
Wed Jun 25 16:30:45 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.91: preferred, unified
Changes since revision 1.91: +14 -6
lines
(Module): On windows (cygwin) function asctime_r doesn't
exist so I changed back to asctime which exists.
Revision 1.91: download - view: text, markup, annotated - select for diffs
Wed Jun 25 15:30:29 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.90: preferred, unified
Changes since revision 1.90: +134 -56
lines
* 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.
Revision 1.90: download - view: text, markup, annotated - select for diffs
Tue Jun 24 12:34:15 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.89: preferred, unified
Changes since revision 1.89: +9 -4
lines
(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.
Revision 1.89: download - view: text, markup, annotated - select for diffs
Tue Jun 24 12:30:52 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.88: preferred, unified
Changes since revision 1.88: +16 -13
lines
(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.
Revision 1.88: download - view: text, markup, annotated - select for diffs
Mon Jun 23 17:54:56 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.87: preferred, unified
Changes since revision 1.87: +325 -143
lines
* 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.
Revision 1.87: download - view: text, markup, annotated - select for diffs
Wed Jun 18 12:26:01 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.86: preferred, unified
Changes since revision 1.86: +84 -65
lines
Version 0.96
Revision 1.86: download - view: text, markup, annotated - select for diffs
Tue Jun 17 20:04:08 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.85: preferred, unified
Changes since revision 1.85: +101 -51
lines
(Module): Change position of html and gnuplot routines and added
routine fileappend.
Revision 1.85: download - view: text, markup, annotated - select for diffs
Tue Jun 17 13:12:43 2003 UTC (21 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.84: preferred, unified
Changes since revision 1.84: +334 -104
lines
* 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.
Revision 1.84: download - view: text, markup, annotated - select for diffs
Fri Jun 13 21:44:43 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.83: preferred, unified
Changes since revision 1.83: +65 -20
lines
* 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)
Revision 1.41.2.2: download - view: text, markup, annotated - select for diffs
Fri Jun 13 07:45:28 2003 UTC (21 years, 3 months ago) by brouard
Branches: Version-0-8a-jackson-revised
Diff to: previous 1.41.2.1: preferred, unified; branchpoint 1.41: preferred, unified; next MAIN 1.42: preferred, unified
Changes since revision 1.41.2.1: +39 -5
lines
We decided to release, in June 2003, a version 0.8a1 (May 2002) of
former version 0.8a to correct a bug highlighted by Chris Jackson.
It can be useful until version 0.9x will be released.
In version 0.8a, likelihood was computed as if date of death was unknown. Death
was treated as any other health state, i.e the date of the interview
describes the actual state and not the date of a change in health
state.
It means that in the early version of IMaCh we were considering that
at each interview the current state was recorded (healthy, disable or
death). And IMaCh was correct. But, when we introduced the exact date
of death then we should have modified the contribution of an exact
(more precise) date of 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
(which is the way version 0.8a of IMaCh was doing) 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.
Revision 1.41.2.1: download - view: text, markup, annotated - select for diffs
Thu Jun 12 10:43:20 2003 UTC (21 years, 3 months ago) by brouard
Branches: Version-0-8a-jackson-revised
Diff to: previous 1.41: preferred, unified
Changes since revision 1.41: +7 -15
lines
Minor changes to run version 0.8a on Linux. Bad ifdef linux.
Revision 1.83: download - view: text, markup, annotated - select for diffs
Tue Jun 10 13:39:11 2003 UTC (21 years, 3 months ago) by lievre
Branches: MAIN
Diff to: previous 1.82: preferred, unified
Changes since revision 1.82: +9 -6
lines
*** empty log message ***
Revision 1.82: download - view: text, markup, annotated - select for diffs
Thu Jun 5 15:57:20 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.81: preferred, unified
Changes since revision 1.81: +8 -13
lines
Add log in imach.c and fullversion number is now printed.
Revision 1.81: download - view: text, markup, annotated - select for diffs
Thu Jun 5 15:41:51 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.80: preferred, unified
Changes since revision 1.80: +10 -6
lines
*** empty log message ***
Revision 1.80: download - view: text, markup, annotated - select for diffs
Thu Jun 5 15:34:14 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.79: preferred, unified
Changes since revision 1.79: +10 -3
lines
Trying to add the true revision is the program and log
Revision 1.79: download - view: text, markup, annotated - select for diffs
Thu Jun 5 15:17:23 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.78: preferred, unified
Changes since revision 1.78: +4 -2
lines
*** empty log message ***
Revision 1.78: download - view: text, markup, annotated - select for diffs
Tue May 27 17:26:53 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.77: preferred, unified
Changes since revision 1.77: +3 -3
lines
minor changes
Revision 1.77: download - view: text, markup, annotated - select for diffs
Fri May 16 16:49:47 2003 UTC (21 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.76: preferred, unified
Changes since revision 1.76: +14 -13
lines
(Module): Insert of a warning if the delay between two waves is
negative.
Revision 1.76: download - view: text, markup, annotated - select for diffs
Fri May 16 10:44:42 2003 UTC (21 years, 4 months ago) by brouard
Branches: MAIN
Diff to: previous 1.75: preferred, unified
Changes since revision 1.75: +66 -23
lines
(Module):
Revision 1.75: download - view: text, markup, annotated - select for diffs
Sat May 3 01:18:24 2003 UTC (21 years, 4 months ago) by brouard
Branches: MAIN
Diff to: previous 1.74: preferred, unified
Changes since revision 1.74: +16 -13
lines
Some cleaning
Revision 1.74: download - view: text, markup, annotated - select for diffs
Fri May 2 18:51:41 2003 UTC (21 years, 4 months ago) by brouard
Branches: MAIN
Diff to: previous 1.73: preferred, unified
Changes since revision 1.73: +157 -105
lines
Check memory allocation through valgrind on Linux and libnjamd .
So it is free of malloc bugs now!
Version 0.95
Revision 1.73: download - view: text, markup, annotated - select for diffs
Tue Apr 8 14:06:50 2003 UTC (21 years, 5 months ago) by lievre
Branches: MAIN
Diff to: previous 1.72: preferred, unified
Changes since revision 1.72: +38 -38
lines
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.
Revision 1.72: download - view: text, markup, annotated - select for diffs
Fri Mar 28 13:33:56 2003 UTC (21 years, 5 months ago) by brouard
Branches: MAIN
Diff to: previous 1.71: preferred, unified
Changes since revision 1.71: +2 -2
lines
(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
Revision 1.71: download - view: text, markup, annotated - select for diffs
Fri Mar 28 13:32:54 2003 UTC (21 years, 5 months ago) by brouard
Branches: MAIN
Diff to: previous 1.70: preferred, unified
Changes since revision 1.70: +54 -15
lines
(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.
Revision 1.70: download - view: text, markup, annotated - select for diffs
Wed Feb 5 12:40:38 2003 UTC (21 years, 7 months ago) by brouard
Branches: MAIN
Diff to: previous 1.69: preferred, unified
Changes since revision 1.69: +53 -61
lines
Preforecast routine cleaned. Change of notation, comments added.
Version 0.92
Revision 1.69: download - view: text, markup, annotated - select for diffs
Tue Feb 4 20:55:29 2003 UTC (21 years, 7 months ago) by brouard
Branches: MAIN
Diff to: previous 1.68: preferred, unified
Changes since revision 1.68: +113 -97
lines
*** empty log message ***
Revision 1.68: download - view: text, markup, annotated - select for diffs
Tue Feb 4 12:40:59 2003 UTC (21 years, 7 months ago) by lievre
Branches: MAIN
Diff to: previous 1.67: preferred, unified
Changes since revision 1.67: +42 -26
lines
Correction of initialisations in case of several death states.
Revision 1.67: download - view: text, markup, annotated - select for diffs
Tue Jan 28 17:41:19 2003 UTC (21 years, 7 months ago) by brouard
Branches: MAIN
Diff to: previous 1.66: preferred, unified
Changes since revision 1.66: +9 -6
lines
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.
Revision 1.66: download - view: text, markup, annotated - select for diffs
Tue Jan 28 17:23:35 2003 UTC (21 years, 7 months ago) by brouard
Branches: MAIN
Diff to: previous 1.65: preferred, unified
Changes since revision 1.65: +32 -20
lines
I changed some comments
Revision 1.65: download - view: text, markup, annotated - select for diffs
Wed Dec 11 16:58:19 2002 UTC (21 years, 9 months ago) by lievre
Branches: MAIN
Diff to: previous 1.64: preferred, unified
Changes since revision 1.64: +5 -4
lines
Correction of bug related to the covariates
Revision 1.64: download - view: text, markup, annotated - select for diffs
Thu Nov 21 08:46:21 2002 UTC (21 years, 9 months ago) by lievre
Branches: MAIN
Diff to: previous 1.63: preferred, unified
Changes since revision 1.63: +136 -26
lines
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.
Revision 1.63: download - view: text, markup, annotated - select for diffs
Wed Nov 20 17:35:59 2002 UTC (21 years, 9 months ago) by lievre
Branches: MAIN
Diff to: previous 1.62: preferred, unified
Changes since revision 1.62: +6 -2
lines
Trying a linear interpolation extrapolation in the computing of
likelihood for large stepm.
Revision 1.62: download - view: text, markup, annotated - select for diffs
Wed Nov 20 07:56:21 2002 UTC (21 years, 9 months ago) by brouard
Branches: MAIN
Diff to: previous 1.61: preferred, unified
Changes since revision 1.61: +2 -2
lines
just a sign error in mlikeli
Revision 1.61: download - view: text, markup, annotated - select for diffs
Tue Nov 19 14:08:13 2002 UTC (21 years, 9 months ago) by brouard
Branches: MAIN
Diff to: previous 1.60: preferred, unified
Changes since revision 1.60: +80 -51
lines
mle=1 corrects bias
mle=2 no correction
Revision 1.60: download - view: text, markup, annotated - select for diffs
Tue Nov 19 00:17:38 2002 UTC (21 years, 9 months ago) by brouard
Branches: MAIN
Diff to: previous 1.59: preferred, unified
Changes since revision 1.59: +6 -6
lines
Allocation bug
Revision 1.59: download - view: text, markup, annotated - select for diffs
Mon Nov 18 23:01:13 2002 UTC (21 years, 9 months ago) by brouard
Branches: MAIN
Diff to: previous 1.58: preferred, unified
Changes since revision 1.58: +493 -461
lines
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.
Revision 1.58: download - view: text, markup, annotated - select for diffs
Fri Jul 26 12:29:55 2002 UTC (22 years, 1 month ago) by lievre
Branches: MAIN
Diff to: previous 1.57: preferred, unified
Changes since revision 1.57: +59 -36
lines
Comments added and corrections in routine moving average done.
Revision 1.57: download - view: text, markup, annotated - select for diffs
Thu Jul 25 07:37:44 2002 UTC (22 years, 1 month ago) by lievre
Branches: MAIN
Diff to: previous 1.56: preferred, unified
Changes since revision 1.56: +3 -3
lines
*** empty log message ***
Revision 1.56: download - view: text, markup, annotated - select for diffs
Wed Jul 24 17:28:25 2002 UTC (22 years, 1 month ago) by lievre
Branches: MAIN
Diff to: previous 1.55: preferred, unified
Changes since revision 1.55: +2 -9
lines
*** empty log message ***
Revision 1.55: download - view: text, markup, annotated - select for diffs
Wed Jul 24 17:00:55 2002 UTC (22 years, 1 month ago) by lievre
Branches: MAIN
Diff to: previous 1.54: preferred, unified
Changes since revision 1.54: +17 -9
lines
Bug in ***movingaverage
Revision 1.54: download - view: text, markup, annotated - select for diffs
Wed Jul 24 09:07:45 2002 UTC (22 years, 1 month ago) by brouard
Branches: MAIN
Diff to: previous 1.53: preferred, unified
Changes since revision 1.53: +93 -63
lines
mobilav can be 3, 5 or 7 instead of only 1 (which defaults to 5).
Revision 1.53: download - view: text, markup, annotated - select for diffs
Tue Jul 23 23:59:37 2002 UTC (22 years, 1 month ago) by brouard
Branches: MAIN
Diff to: previous 1.52: preferred, unified
Changes since revision 1.52: +4127 -4101
lines
Moving average of observed prevalence moved
Revision 1.52: download - view: text, markup, annotated - select for diffs
Fri Jul 19 18:49:30 2002 UTC (22 years, 1 month ago) by brouard
Branches: MAIN
Diff to: previous 1.51: preferred, unified
Changes since revision 1.51: +8 -4
lines
Some improvments
Revision 1.51: download - view: text, markup, annotated - select for diffs
Fri Jul 19 12:22:25 2002 UTC (22 years, 1 month ago) by brouard
Branches: MAIN
Diff to: previous 1.50: preferred, unified
Changes since revision 1.50: +39 -45
lines
Some errors corrected in diagonalisation of covariance-matrice
Revision 1.50: download - view: text, markup, annotated - select for diffs
Wed Jun 26 23:25:02 2002 UTC (22 years, 2 months ago) by brouard
Branches: MAIN
Diff to: previous 1.49: preferred, unified
Changes since revision 1.49: +554 -191
lines
*** empty log message ***
Revision 1.49: download - view: text, markup, annotated - select for diffs
Thu Jun 20 14:03:39 2002 UTC (22 years, 2 months ago) by lievre
Branches: MAIN
Diff to: previous 1.48: preferred, unified
Changes since revision 1.48: +51 -40
lines
Changes in the htm file.
Revision 1.48: download - view: text, markup, annotated - select for diffs
Mon Jun 10 13:12:49 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.47: preferred, unified
Changes since revision 1.47: +2 -2
lines
version 0.8h
Revision 1.47: download - view: text, markup, annotated - select for diffs
Mon Jun 10 13:12:01 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.46: preferred, unified
Changes since revision 1.46: +194 -83
lines
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.
Revision 1.46: download - view: text, markup, annotated - select for diffs
Thu May 30 17:44:35 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.45: preferred, unified
Changes since revision 1.45: +65 -25
lines
(Module): Add correlation matrix of one-step
probabilities and covariance matrix
Revision 1.45: download - view: text, markup, annotated - select for diffs
Fri May 24 16:34:18 2002 UTC (22 years, 3 months ago) by lievre
Branches: MAIN
Diff to: previous 1.44: preferred, unified
Changes since revision 1.44: +19 -18
lines
The bug in printinghtm is corrected
Revision 1.44: download - view: text, markup, annotated - select for diffs
Fri May 24 13:01:48 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.43: preferred, unified
Changes since revision 1.43: +2 -2
lines
Change version number ot 0.8e
Revision 1.43: download - view: text, markup, annotated - select for diffs
Fri May 24 13:00:54 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.42: preferred, unified
Changes since revision 1.42: +81 -62
lines
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.
Revision 1.42: download - view: text, markup, annotated - select for diffs
Tue May 21 18:44:41 2002 UTC (22 years, 3 months ago) by brouard
Branches: MAIN
Diff to: previous 1.41: preferred, unified
Changes since revision 1.41: +95 -91
lines
Change gif images to png format because of gif copyright.
Change wgnuplot to gnuplot
Correct a small bug
Revision 1.41: download - view: text, markup, annotated - select for diffs
Tue May 7 15:53:01 2002 UTC (22 years, 4 months ago) by lievre
Branches: MAIN
CVS tags: Version-0-8a
Branch point for: Version-0-8a-jackson-revised
Diff to: previous 1.40: preferred, unified
Changes since revision 1.40: +149 -25
lines
Version 0.8a. Standard deviation of health expectancies eij.
Revision 1.40: download - view: text, markup, annotated - select for diffs
Fri Apr 19 13:46:19 2002 UTC (22 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.39: preferred, unified
Changes since revision 1.39: +3 -3
lines
*** empty log message ***
Revision 1.39: download - view: text, markup, annotated - select for diffs
Fri Apr 5 15:45:00 2002 UTC (22 years, 5 months ago) by lievre
Branches: MAIN
Diff to: previous 1.38: preferred, unified
Changes since revision 1.38: +90 -70
lines
*** empty log message ***
Revision 1.38: download - view: text, markup, annotated - select for diffs
Wed Apr 3 12:19:36 2002 UTC (22 years, 5 months ago) by lievre
Branches: MAIN
Diff to: previous 1.37: preferred, unified
Changes since revision 1.37: +4 -4
lines
The bug in printinghtml is corrected.
Revision 1.37: download - view: text, markup, annotated - select for diffs
Fri Mar 29 15:31:59 2002 UTC (22 years, 5 months ago) by brouard
Branches: MAIN
Diff to: previous 1.36: preferred, unified
Changes since revision 1.36: +3 -3
lines
Changed version to 0.8b
Revision 1.36: download - view: text, markup, annotated - select for diffs
Fri Mar 29 15:27:27 2002 UTC (22 years, 5 months ago) by brouard
Branches: MAIN
Diff to: previous 1.35: preferred, unified
Changes since revision 1.35: +44 -26
lines
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).
Revision 1.35: download - view: text, markup, annotated - select for diffs
Tue Mar 26 17:08:39 2002 UTC (22 years, 5 months ago) by lievre
Branches: MAIN
Diff to: previous 1.34: preferred, unified
Changes since revision 1.34: +226 -195
lines
Version used for article20.tex Changes in varevsij.
Revision 1.34: download - view: text, markup, annotated - select for diffs
Wed Mar 13 17:19:16 2002 UTC (22 years, 6 months ago) by brouard
Branches: MAIN
Diff to: previous 1.33: preferred, unified
Changes since revision 1.33: +19 -19
lines
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 !
Revision 1.33: download - view: text, markup, annotated - select for diffs
Tue Mar 12 22:13:38 2002 UTC (22 years, 6 months ago) by brouard
Branches: MAIN
Diff to: previous 1.32: preferred, unified
Changes since revision 1.32: +8 -10
lines
Some cleaning in esij and nhstepm
Revision 1.32: download - view: text, markup, annotated - select for diffs
Mon Mar 11 14:17:15 2002 UTC (22 years, 6 months ago) by brouard
Branches: MAIN
Diff to: previous 1.31: preferred, unified
Changes since revision 1.31: +9 -9
lines
Supress a bug in esij
Revision 1.31: download - view: text, markup, annotated - select for diffs
Sun Mar 10 13:43:02 2002 UTC (22 years, 6 months ago) by brouard
Branches: MAIN
Diff to: previous 1.30: preferred, unified
Changes since revision 1.30: +26 -19
lines
0.71a cleaning done
Revision 1.30: download - view: text, markup, annotated - select for diffs
Fri Mar 8 16:17:18 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.29: preferred, unified
Changes since revision 1.29: +14 -17
lines
Version 0.71
Revision 1.29: download - view: text, markup, annotated - select for diffs
Wed Mar 6 19:02:50 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.28: preferred, unified
Changes since revision 1.28: +26 -15
lines
Output mle=0 in the Rparameter file so thart clicking on
rparameterfil.imach will skip the optimization process.
Revision 1.28: download - view: text, markup, annotated - select for diffs
Fri Mar 1 17:56:23 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.27: preferred, unified
Changes since revision 1.27: +62 -59
lines
Some improvements in forecasting and the bug relating to agemax is
corrected.
Revision 1.27: download - view: text, markup, annotated - select for diffs
Thu Feb 28 17:49:07 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.26: preferred, unified
Changes since revision 1.26: +283 -153
lines
Some changes in population forecasting
Revision 1.26: download - view: text, markup, annotated - select for diffs
Wed Feb 27 15:42:00 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.25: preferred, unified
Changes since revision 1.25: +63 -61
lines
Add date in the freqsummary file.
Revision 1.25: download - view: text, markup, annotated - select for diffs
Tue Feb 26 17:11:54 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.24: preferred, unified
Changes since revision 1.24: +305 -281
lines
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.
Revision 1.24: download - view: text, markup, annotated - select for diffs
Fri Feb 22 18:10:15 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.23: preferred, unified
Changes since revision 1.23: +2 -2
lines
*** empty log message ***
Revision 1.23: download - view: text, markup, annotated - select for diffs
Fri Feb 22 18:08:30 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.22: preferred, unified
Changes since revision 1.22: +5 -5
lines
Merge OK
Revision 1.22: download - view: text, markup, annotated - select for diffs
Fri Feb 22 17:54:20 2002 UTC (22 years, 6 months ago) by brouard
Branches: MAIN
Diff to: previous 1.21: preferred, unified
Changes since revision 1.21: +106 -62
lines
First merge between Agnès and Nicolas!!
Revision 1.21: download - view: text, markup, annotated - select for diffs
Thu Feb 21 18:42:24 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.20: preferred, unified
Changes since revision 1.20: +22 -8
lines
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.
Revision 1.20: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:22:01 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.19: preferred, unified
Changes since revision 1.19: +12 -10
lines
Prevalence and forecasting
Revision 1.19: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:19:10 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.18: preferred, unified
Changes since revision 1.18: +132 -156
lines
Forecasting and calculation of the mean date of interview
Revision 1.18: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:17:09 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.17: preferred, unified
Changes since revision 1.17: +98 -36
lines
Forecasting
Revision 1.17: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:15:02 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.16: preferred, unified
Changes since revision 1.16: +17 -20
lines
Some bugs corrected
Revision 1.16: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:12:32 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.15: preferred, unified
Changes since revision 1.15: +74 -23
lines
Version 0.7
hPijx are now computed for h=1 year instead of 2 years
Revision 1.15: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:08:52 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.14: preferred, unified
Changes since revision 1.14: +105 -35
lines
Moving average on cross-sectional prevalences
Revision 1.14: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:05:44 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.13: preferred, unified
Changes since revision 1.13: +85 -40
lines
Forecasting
Revision 1.13: download - view: text, markup, annotated - select for diffs
Wed Feb 20 17:02:08 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.12: preferred, unified
Changes since revision 1.12: +226 -13
lines
Variance of one-step transitions added and forecasting of prevalences
Revision 1.12: download - view: text, markup, annotated - select for diffs
Wed Feb 20 16:57:00 2002 UTC (22 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.11: preferred, unified
Changes since revision 1.11: +43 -21
lines
Remise à jour du serveur CVS peu de changements
Revision 1.11: download - view: text, markup, annotated - select for diffs
Thu May 17 16:07:14 2001 UTC (23 years, 3 months ago) by lievre
Branches: MAIN
Diff to: previous 1.10: preferred, unified
Changes since revision 1.10: +10 -8
lines
Updated to Windows2000: changes in the path name to execute wgnuplot.
Revision 1.10: download - view: text, markup, annotated - select for diffs
Wed May 9 14:25:42 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.9: preferred, unified
Changes since revision 1.9: +5 -4
lines
Changes in calculation spaces between two waves
Revision 1.9: download - view: text, markup, annotated - select for diffs
Wed May 2 18:44:18 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.8: preferred, unified
Changes since revision 1.8: +7 -5
lines
Change of index.htm to parameterfile.htm
Version 0.64b
Revision 1.8: download - view: text, markup, annotated - select for diffs
Wed May 2 17:54:31 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.7: preferred, unified
Changes since revision 1.7: +120 -132
lines
Changes index.htm: title, model, ...
Revision 1.7: download - view: text, markup, annotated - select for diffs
Wed May 2 17:50:24 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.6: preferred, unified
Changes since revision 1.6: +158 -84
lines
Add age*V1
Revision 1.6: download - view: text, markup, annotated - select for diffs
Wed May 2 17:47:10 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.5: preferred, unified
Changes since revision 1.5: +103 -56
lines
some changes index.htm
Version16.
Revision 1.5: download - view: text, markup, annotated - select for diffs
Wed May 2 17:42:45 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.4: preferred, unified
Changes since revision 1.4: +89 -51
lines
suppressing cygwinpath. split directory instead.
version 15
Revision 1.4: download - view: text, markup, annotated - select for diffs
Wed May 2 17:34:41 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.3: preferred, unified
Changes since revision 1.3: +12 -4
lines
*** empty log message ***
Revision 1.3: download - view: text, markup, annotated - select for diffs
Wed May 2 17:21:42 2001 UTC (23 years, 4 months ago) by lievre
Branches: MAIN
Diff to: previous 1.2: preferred, unified
Changes since revision 1.2: +38 -43
lines
version 13
Revision 1.2: download - view: text, markup, annotated - select for diffs
Tue Mar 13 18:10:26 2001 UTC (23 years, 6 months ago) by lievre
Branches: MAIN
Diff to: previous 1.1: preferred, unified
Changes since revision 1.1: +2538 -2215
lines
Version Rostock: covariables + graphique proba elementaires
Revision 1.1.1.1 (vendor branch): download - view: text, markup, annotated - select for diffs
Thu Dec 28 18:49:56 2000 UTC (23 years, 8 months ago) by brouard
Branches: lievre
CVS tags: start
Diff to: previous 1.1: preferred, unified
Changes since revision 1.1: +0 -0
lines
Import de imach064
Revision 1.1: download - view: text, markup, annotated - select for diffs
Thu Dec 28 18:49:56 2000 UTC (23 years, 8 months ago) by brouard
Branches: MAIN
Initial revision
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>