diff --git a/DESCRIPTION b/DESCRIPTION index ad497d9..2eae05f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,10 @@ Package: cmprsk -Version: 2.2-2 -Date: 2011-jun-19 +Version: 2.2-3 +Date: 2012-feb-7 Title: Subdistribution Analysis of Competing Risks Author: Bob Gray Maintainer: Bob Gray -Depends: R (>= 2.6.0), survival +Depends: R (>= 2.14.0), survival Description: Estimation, testing and regression modeling of subdistribution functions in competing risks, as described in Gray (1988), A class of K-sample tests for comparing the @@ -14,6 +14,6 @@ Description: Estimation, testing and regression modeling of JASA, 94:496-509. License: GPL (>= 2) URL: http://www.r-project.org, http://biowww.dfci.harvard.edu/~gray -Packaged: 2012-10-29 08:58:24 UTC; ripley +Packaged: 2012-04-06 20:25:46 UTC; Bob Repository: CRAN -Date/Publication: 2012-10-29 08:58:24 +Date/Publication: 2012-12-11 07:55:39 diff --git a/MD5 b/MD5 index f1f5e52..58bcb04 100644 --- a/MD5 +++ b/MD5 @@ -1,8 +1,7 @@ 94d55d512a9ba36caa9b7df079bae19f *COPYING -84302a9391b677cfb0f6ff5699f7d616 *DESCRIPTION -16237d09798c445d2d9977d4cfc53a8b *NAMESPACE +ca0bfdb4a1ec146f2b16438252d66a1b *DESCRIPTION +7dbbd1eee406d9d570a8783c459a496b *NAMESPACE 367a39dbc17a7f783b93bd52d6c0634b *R/cmprsk.R -5400da8209f30265572bec54d4082a4e *R/zzz.R 1e02586d70cbaf25caa18ab5be4f637a *man/crr.Rd 8e35bb36130364553fcd0d80d18283c1 *man/cuminc.Rd 6fa0c161e6dd9b2b9db731b70b2fa3bf *man/plot.cuminc.Rd diff --git a/NAMESPACE b/NAMESPACE index f79454d..9466972 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,10 +1,18 @@ -# Default NAMESPACE created by R -# Remove the previous line if you edit this file - # Export all names -exportPattern(".") - +# exportPattern(".") +useDynLib(cmprsk) +#export("crr","summary.crr","print.summary.crr","predict.crr", +# "plot.predict.crr","print.crr","cuminc","print.cuminc","timepoints", +# "plot.cuminc") +export("crr","cuminc","timepoints") # Import all packages listed as Imports or Depends import( survival ) +S3method(summary,crr) +S3method(print,crr) +S3method(print,summary.crr) +S3method(predict,crr) +S3method(print,cuminc) +S3method(plot,cuminc) +S3method(plot,predict.crr) diff --git a/R/zzz.R b/R/zzz.R deleted file mode 100644 index 2e7269e..0000000 --- a/R/zzz.R +++ /dev/null @@ -1,4 +0,0 @@ -.First.lib <- function(a,b) { - require(survival) - library.dynam('cmprsk',b,a) -}