version 1.2-1

DESCRIPTION

@@ -1,16 +1,16 @@
+Encoding: latin1
 Package: DTDA
 Type: Package
 Title: Doubly truncated data analysis
-Version: 1.2-0
-Date: 2009-07-02
-Author: Carla Moreira, Jacobo de U\eqn{\mbox{\textasciitilde}}{~}na-
-        \eqn{\mbox{\textasciitilde}}{'}Alvarez and Rosa Crujeiras
+Version: 1.2-1
+Date: 2009-12-10
+Author: Carla Moreira, Jacobo de U�a-�lvarez and Rosa Crujeiras
 Maintainer: Carla Moreira <carlamgmm@gmail.com>
 Description: This package implements different algorithms for analyzing
         randomly truncated data, one-sided and two-sided (i.e. doubly)
         truncated data.
 License: GPL-2
 LazyLoad: yes
-Packaged: Thu Nov 5 11:18:29 2009; Usuario
+Packaged: Thu Dec 10 15:06:21 2009; Usuario
 Repository: CRAN
-Date/Publication: 2009-11-05 19:43:19
+Date/Publication: 2009-12-10 20:35:55

R/efron.petrosian.R

@@ -121,10 +121,6 @@ cat("Confidence bands cannot be computed","\n")
 
 for (b in 1:B){
 
-if(b==1) cat("Resample B",b,"\n")
-r<-floor(B/4)*floor(b/floor(B/4))-b
-if(abs(r)==0|b==B) cat("Resample B",b,"\n")
-
 indb<-sample(ind,nrow(C),replace=TRUE)
 M1b<-C[indb,]
 M2b<-matrix(0,nrow=nrow(M1b),ncol=ncol(M1b))
@@ -206,10 +202,6 @@ cat("Confidence bands cannot be computed","\n")
 
 for (b in 1:B){
 
-if(b==1) cat("Resample B",b,"\n")
-r<-floor(B/4)*floor(b/floor(B/4))-b
-if(abs(r)==0|b==B) cat("Resample B",b,"\n")
-
 indb<-sample(ind,nrow(C),replace=TRUE)
 M1b<-C[indb,]
 M2b<-matrix(0,nrow=nrow(M1b),ncol=ncol(M1b))
@@ -268,7 +260,6 @@ for(i in 1:nrow(C)){
 
 Sobb<-1-FF0b+fb
 Sobb[Sobb<1e-12]<-0
-Sobb[Sobb<1e-12]<-0
 FF0b[FF0b<1e-12]<-0
 
 

R/lynden.R

@@ -233,10 +233,6 @@ cat("Confidence bands cannot be computed","\n")
 
 for (b in 1:B){
 
-if(b==1) cat("Resample B",b,"\n")
-r<-floor(B/4)*floor(b/floor(B/4))-b
-if(abs(r)==0|b==B) cat("Resample B",b,"\n")
-
 indb<-sample(ind,nrow(C),replace=TRUE)
 M1b<-C[indb,]
 M2b<-matrix(0,nrow=nrow(M1b),ncol=ncol(M1b))
@@ -385,10 +381,6 @@ cat("Confidence bands cannot be computed","\n")
 
 for (b in 1:B){
 
-if(b==1) cat("Resample B",b,"\n")
-r<-floor(B/4)*floor(b/floor(B/4))-b
-if(abs(r)==0|b==B) cat("Resample B",b,"\n")
-
 
 indb<-sample(ind,nrow(C),replace=TRUE)
 M1b<-C[indb,]
@@ -1033,7 +1025,7 @@ summary<-cbind("time"=x,"n.event"=mult4,"density"=f,"cumulative.df"=FF,"survival
 colnames(summary)<-c("time","n.event","density", "cumulative.df", "survival", "hazard")
 rownames(summary)<-rep("",times=length(x))
 print(summary,digits=5, justify="left")
-return(invisible(list(n.iterations=iter, B=B, alpha=alpha,time=x, n.event=mult4, density=as.vector(f), cumulative.df=FF, survival=
+return(invisible(list(n.iterations=iter, events=events, B=B, alpha=alpha,time=x, n.event=mult4, density=as.vector(f), cumulative.df=FF, survival=
 as.vector(Sob), truncation.probs=as.vector(F0), hazard=as.vector(h), NJ=as.vector(NJ), upper.df=upperF,lower.df=lowerF,upper.Sob=upperS,
 lower.Sob=lowerS)))