From noreply at r-forge.r-project.org  Sun Dec  1 21:11:17 2013
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Sun,  1 Dec 2013 21:11:17 +0100 (CET)
Subject: [Gsdesign-commits] r363 - in pkg/gsDesign: . R man
Message-ID: <20131201201117.9D999184CD6@r-forge.r-project.org>

Author: keaven
Date: 2013-12-01 21:11:17 +0100 (Sun, 01 Dec 2013)
New Revision: 363

Modified:
   pkg/gsDesign/DESCRIPTION
   pkg/gsDesign/R/ssrCP.R
   pkg/gsDesign/man/ssrCP.Rd
Log:
Vignette update; correction to Power.ssrCP

Modified: pkg/gsDesign/DESCRIPTION
===================================================================
--- pkg/gsDesign/DESCRIPTION	2013-11-11 01:06:51 UTC (rev 362)
+++ pkg/gsDesign/DESCRIPTION	2013-12-01 20:11:17 UTC (rev 363)
@@ -1,5 +1,5 @@
 Package: gsDesign
-Version: 2.8-6
+Version: 2.8-7
 Title: Group Sequential Design
 Author: Keaven Anderson 
 Maintainer: Keaven Anderson <keaven_anderson at merck.com>

Modified: pkg/gsDesign/R/ssrCP.R
===================================================================
--- pkg/gsDesign/R/ssrCP.R	2013-11-11 01:06:51 UTC (rev 362)
+++ pkg/gsDesign/R/ssrCP.R	2013-12-01 20:11:17 UTC (rev 363)
@@ -28,13 +28,11 @@
                       target))
 }
 
-
-
 ssrCP <- function(z1, theta=NULL, maxinc=2, overrun=0, 
                   beta = x$beta, cpadj=c(.5,1-beta), 
-                  x=gsDesign(k=2, timing=.5, beta=beta),
+                  x=gsDesign(k=2, timing=.5),
                   z2=z2NC,...){
-  if (class(x)!="gsDesign") 
+  if (class(x)!="gsDesign")
     stop("x must be passed as an object of class gsDesign")
   if (2 != x$k) 
     stop("input group sequential design must have 2 stages (k=2)")
@@ -272,7 +270,7 @@
             grid$gridwgts *
             pnorm(x$z2fn(grid$z, x=x$x, n2=n2) - 
                     theta[i] * sqrt(n2), lower.tail=FALSE))
-  }else changepoint3 <- x$x$lower$bound[1]
+  }else changepoint3 <- changepoint # changed from x$x$lower$bound[1], 20131201, K Anderson
   # finally, integrate en over area where conditional power is in  
   # range where we wish to increase to desired conditional power
   grid <- normalGrid(mu=(changepoint3+changepoint2)/2, 

Modified: pkg/gsDesign/man/ssrCP.Rd
===================================================================
--- pkg/gsDesign/man/ssrCP.Rd	2013-11-11 01:06:51 UTC (rev 362)
+++ pkg/gsDesign/man/ssrCP.Rd	2013-12-01 20:11:17 UTC (rev 363)
@@ -20,7 +20,7 @@
 }
 \usage{
 ssrCP(z1, theta=NULL, maxinc=2, overrun=0, beta = x$beta, cpadj=c(.5,1-beta), 
-      x=gsDesign(k=2, timing=.5, beta=beta), z2=z2NC,...)
+      x=gsDesign(k=2, timing=.5), z2=z2NC,...)
 \method{plot}{ssrCP}(x, z1ticks=NULL, mar=c(7, 4, 4, 4)+.1, 
       ylab="Adapted sample size", xlaboffset=-.2, lty=1, col=1,...)
 Power.ssrCP(x, theta=NULL, delta=NULL, r=18)            
@@ -194,7 +194,5 @@
         xlab(expression(delta)) + ylab("Expected sample size")
 # plot power by design and effect size
 ggplot(data=y3,aes(x=delta,y=Power,col=CP.effect.size))+geom_line() + xlab(expression(delta))
-
-
 }
 \keyword{design}


From noreply at r-forge.r-project.org  Thu Dec  5 23:31:08 2013
From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org)
Date: Thu,  5 Dec 2013 23:31:08 +0100 (CET)
Subject: [Gsdesign-commits] r364 - pkg/gsDesign
Message-ID: <20131205223108.35115185EFE@r-forge.r-project.org>

Author: keaven
Date: 2013-12-05 23:31:07 +0100 (Thu, 05 Dec 2013)
New Revision: 364

Modified:
   pkg/gsDesign/DESCRIPTION
Log:
Updated Depends to note R >=3.0.0 is required (only to support vignettes, which were written using knitr; otherwise, v2 R will work fine).

Modified: pkg/gsDesign/DESCRIPTION
===================================================================
--- pkg/gsDesign/DESCRIPTION	2013-12-01 20:11:17 UTC (rev 363)
+++ pkg/gsDesign/DESCRIPTION	2013-12-05 22:31:07 UTC (rev 364)
@@ -3,7 +3,7 @@
 Title: Group Sequential Design
 Author: Keaven Anderson 
 Maintainer: Keaven Anderson <keaven_anderson at merck.com>
-Depends: ggplot2, xtable, stringr, RUnit, plyr
+Depends: R (>= 3.0.0), ggplot2, xtable, stringr, RUnit, plyr
 Suggests: knitr
 VignetteBuilder: knitr 
 Description: gsDesign is a package that derives group sequential designs and describes their properties.