[Gsdesign-commits] r246 - in pkg: gsDesign/R gsDesignGUIReview/osx

[noreply at r-forge.r-project.org]

Author: keaven
Date: 2009-12-28 22:00:25 +0100 (Mon, 28 Dec 2009)
New Revision: 246

Added:
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.tar.gz
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.zip
Modified:
   pkg/gsDesign/R/gsDesign.R
   pkg/gsDesign/R/gsqplot.R
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.tar.gz
   pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.zip
Log:
2.2-2

Modified: pkg/gsDesign/R/gsDesign.R
===================================================================
--- pkg/gsDesign/R/gsDesign.R	2009-12-27 18:53:52 UTC (rev 245)
+++ pkg/gsDesign/R/gsDesign.R	2009-12-28 21:00:25 UTC (rev 246)
@@ -120,13 +120,14 @@
 
 "gsDesign"<-function(k=3, test.type=4, alpha=0.025, beta=0.1, astar=0,  
         delta=0, n.fix=1, timing=1, sfu=sfHSD, sfupar=-4,
-        sfl=sfHSD, sflpar=-2, tol=0.000001, r=18, n.I=0, maxn.IPlan=0) 
+        sfl=sfHSD, sflpar=-2, tol=0.000001, r=18, n.I=0, maxn.IPlan=0, nFixSurv=0) 
 {
     # Derive a group sequential design and return in a gsDesign structure
     
     # set up class variable x for gsDesign being requested
     x <- list(k=k, test.type=test.type, alpha=alpha, beta=beta, astar=astar,
-            delta=delta, n.fix=n.fix, timing=timing, tol=tol, r=r, n.I=n.I, maxn.IPlan=maxn.IPlan)
+            delta=delta, n.fix=n.fix, timing=timing, tol=tol, r=r, n.I=n.I, maxn.IPlan=maxn.IPlan,
+            nFixSurv=nFixSurv, nSurv=0)
     
     class(x) <- "gsDesign"
     
@@ -194,13 +195,15 @@
     }
     
     # call appropriate calculation routine according to test.type
-    switch(x$test.type,
+    x <- switch(x$test.type,
             gsDType1(x),
             gsDType2and5(x),
             gsDType3(x),
             gsDType4(x),
             gsDType2and5(x),
             gsDType6(x))
+    if (x$nFixSurv > 0) x$nSurv <- ceiling(x$nFixSurv * x$n.I[x$k] / n.fix / 2) * 2
+    x
 }
 
 "gsProbability" <- function(k=0, theta, n.I, a, b, r=18, d=NULL)

Modified: pkg/gsDesign/R/gsqplot.R
===================================================================
--- pkg/gsDesign/R/gsqplot.R	2009-12-27 18:53:52 UTC (rev 245)
+++ pkg/gsDesign/R/gsqplot.R	2009-12-28 21:00:25 UTC (rev 246)
@@ -98,6 +98,7 @@
 {  if (length(lty)==1) lty <- array(lty, 2)
    if (length(col)==1) col <- array(col, 2)
    if (length(lwd)==1) lwd <- array(lwd, 2)
+   if (length(dgt)==1) dgt <- array(dgt, 2)
    if(x$n.fix == 1) 
    {   nround <- 3 
        ntx <- "r="
@@ -113,11 +114,13 @@
    }
    z <- fn(z=c(x$upper$bound,x$lower$bound), i=c(1:x$k, 1:x$k), x=x,
                ratio=ratio, delta0=delta0, delta=delta)
+   Ztxt <- as.character(c(round(z[1:(x$k-1)],dgt[1]), round(z[x$k],max(dgt)), 
+                          round(z[(x$k+1):(2*x$k-1)], dgt[2]), round(z[2*x$k],max(dgt))))
    y <- data.frame(
            N=as.numeric(c(x$n.I,x$n.I)), 
            Z=as.numeric(z), 
            Bound=c(array("Upper", x$k), array("Lower", x$k)),
-           Ztxt=as.character(round(z, dgt)))
+           Ztxt=Ztxt)
    if (!is.numeric(ylim))
    {   ylim <- range(y$Z)
        ylim[1] <- ylim[1]  -.1 * (ylim[2] - ylim[1])

Modified: pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.tar.gz
===================================================================
(Binary files differ)

Modified: pkg/gsDesignGUIReview/osx/gsDesign_2.2-1.zip
===================================================================
(Binary files differ)

Added: pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.tar.gz
===================================================================
(Binary files differ)


Property changes on: pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.zip
===================================================================
(Binary files differ)


Property changes on: pkg/gsDesignGUIReview/osx/gsDesign_2.2-2.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream