version 2.2-7

DESCRIPTION

@@ -1,20 +1,19 @@
 Package: cmprsk
-Version: 2.2-6
-Date: 2013-apr-17
+Version: 2.2-7
+Date: 2014-jun-17
 Title: Subdistribution Analysis of Competing Risks
 Author: Bob Gray <[email protected]>
 Maintainer: Bob Gray <[email protected]>
 Depends: R (>= 2.15.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
-        cumulative incidence of a competing risk, Ann. Stat.
-        16:1141-1154, and Fine JP and Gray RJ (1999), A proportional
-        hazards model for the subdistribution of a competing risk,
-        JASA, 94:496-509.
+ subdistribution functions in competing risks, as described in Gray
+ (1988), A class of K-sample tests for comparing the cumulative
+ incidence of a competing risk, Ann. Stat. 16:1141-1154, and Fine JP and
+ Gray RJ (1999), A proportional hazards model for the subdistribution
+ of a competing risk, JASA, 94:496-509.
 License: GPL (>= 2)
 URL: http://www.r-project.org
-Packaged: 2013-04-17 18:06:00 UTC; gray
+Packaged: 2014-06-17 18:45:38 UTC; gray
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2013-04-17 23:17:24
+Date/Publication: 2014-06-17 23:16:43

MD5

@@ -1,8 +1,8 @@
 94d55d512a9ba36caa9b7df079bae19f *COPYING
-33d4335de460833d3032bf9508595b79 *DESCRIPTION
-927d1859a098df74df62c590a7ca4420 *NAMESPACE
-6b46c8de1c465658a929acd823fa01f7 *R/cmprsk.R
-12dc51bada87db905ec036e62b8cd44a *man/crr.Rd
+024326158b9ee181904ce0688bb35ad0 *DESCRIPTION
+25e59606a24d9d76dd829a09d9a90c54 *NAMESPACE
+3e0e744d860b0ba3098fbcc8238e053e *R/cmprsk.R
+ab1f8f638eba7c7a13db3225977589a3 *man/crr.Rd
 8e35bb36130364553fcd0d80d18283c1 *man/cuminc.Rd
 9aa901885ef9cb0653c5ad154cb08735 *man/extract.cuminc.Rd
 6fa0c161e6dd9b2b9db731b70b2fa3bf *man/plot.cuminc.Rd

NAMESPACE

@@ -1,10 +1,10 @@
 # Export all names
 # 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")
+export("crr","summary.crr","print.summary.crr","predict.crr",
+  "plot.predict.crr","print.crr","cuminc","print.cuminc","timepoints",
+  "plot.cuminc","[.cuminc")
+#export("crr","cuminc","timepoints")
 # Import all packages listed as Imports or Depends
 import(
   survival

R/cmprsk.R

@@ -171,17 +171,11 @@ function(ftime,fstatus,cov1,cov2,tf,cengroup,failcode=1,cencode=0,
                 as.integer(ncg),as.integer(cengroup),as.double(b),
                 double(ndf*np),double(np),double(np),PACKAGE = "cmprsk")[[15]]
     r <- t(matrix(r,nrow=np))
-    bj <- .Fortran('crrfit',as.double(ftime),as.integer(fstatus),
-                as.integer(length(ftime)),as.double(cov1),as.integer(np-npt),
-                as.integer(np),as.double(cov2),as.integer(npt),
-                as.double(tfs),as.integer(ndf),as.double(uuu),
-                as.integer(ncg),as.integer(cengroup),as.double(b),
-                double(ndf),double(np),PACKAGE = "cmprsk")[[15]]
 ##
   } else {
     v <- h <- h0 <- matrix(NA,np,np)
     r <- NULL
-    bj <- NULL
+#    bj <- NULL
   }
   nobs <- length(ftime)
   b0 <- rep(0,length(b))
@@ -191,6 +185,12 @@ function(ftime,fstatus,cov1,cov2,tf,cengroup,failcode=1,cencode=0,
                   as.double(tfs),as.integer(ndf),as.double(uuu),
                   as.integer(ncg),as.integer(cengroup),as.double(b0),
                   double(1),double(np),PACKAGE = "cmprsk")[[15]]
+  bj <- .Fortran('crrfit',as.double(ftime),as.integer(fstatus),
+                  as.integer(length(ftime)),as.double(cov1),as.integer(np-npt),
+                  as.integer(np),as.double(cov2),as.integer(npt),
+                  as.double(tfs),as.integer(ndf),as.double(uuu),
+                  as.integer(ncg),as.integer(cengroup),as.double(b),
+                  double(ndf),double(np),PACKAGE = "cmprsk")[[15]]
   if (nc1>0) {
     x1 <- paste(cov1.name, 1:nc1, sep="")
     if(is.null(cov1.vars)) cov1.vars <- x1

man/crr.Rd

@@ -65,8 +65,8 @@ scores and var at \code{init}, but performs no iterations)
   initial values of regression parameters (default=all 0)
 }
 \item{variance}{
-  If \code{FALSE}, then suppresses computation of the variance estimate,
-  residuals and underlying hazard 
+  If \code{FALSE}, then suppresses computation of the variance estimate
+  and residuals 
 }
 }
 \value{
@@ -134,7 +134,7 @@ ordinary survival models.  Plotting the jth column of res against the
 vector of unique failure times checks for lack of fit over time in the
 corresponding covariate (column of cov1).
 
-If \code{variance=FALSE}, then \code{predict.crr} cannot be used and
+If \code{variance=FALSE}, then %\code{predict.crr} cannot be used and
 some of the functionality in \code{summary.crr} and \code{print.crr}
 will be lost.  This option can be useful in situations where crr is
 called repeatedly for point estimates, but standard errors are not