rename

stla · Apr 29, 2017 · 4d4ab44 · 4d4ab44
1 parent 874e14d
commit 4d4ab44
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 183 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: OwenQ
 Type: Package
 Title: Owen Q-function
-Version: 0.2.0
+Version: 0.2.1
 Date: 2017-04-28
 Author: Stéphane Laurent
 Maintainer: Stéphane Laurent <laurent_step@yahoo.fr>

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,16 +1,16 @@
 # Generated by roxygen2: do not edit by hand
 
-export(OwenCDF1)
-export(OwenCDF2)
-export(OwenCDF3)
-export(OwenCDF4)
 export(OwenQ1)
 export(OwenQ2)
 export(OwenT)
-export(pOwen1)
-export(pOwen2)
-export(pOwen3)
-export(pOwen4)
+export(powen1)
+export(powen2)
+export(powen3)
+export(powen4)
+export(psbt1)
+export(psbt2)
+export(psbt3)
+export(psbt4)
 export(ptOwen)
 importFrom(Rcpp,evalCpp)
 importFrom(stats,pgamma)

diff --git a/R/pOwen.R b/R/pOwen.R
@@ -3,16 +3,16 @@
 #' when the noncentrality parameters satisfy \eqn{\delta_1>\delta_2} and
 #' the number of degrees of freedom is integer.
 #' \itemize{
-#' \item \code{pOwen1} evaluates \eqn{P(T_1\le t_1, T_2 \le t_2)}
+#' \item \code{powen1} evaluates \eqn{P(T_1\le t_1, T_2 \le t_2)}
 #' (Owen's equality 8)
-#' \item \code{pOwen2} evaluates \eqn{P(T_1\le t_1, T_2 \ge t_2)}
+#' \item \code{powen2} evaluates \eqn{P(T_1\le t_1, T_2 \ge t_2)}
 #' (Owen's equality 9)
-#' \item \code{pOwen3} evaluates \eqn{P(T_1\ge t_1, T_2 \ge t_2)}
+#' \item \code{powen3} evaluates \eqn{P(T_1\ge t_1, T_2 \ge t_2)}
 #' (Owen's equality 10)
-#' \item \code{pOwen4} evaluates \eqn{P(T_1\ge t_1, T_2 \le t_2)}
+#' \item \code{powen4} evaluates \eqn{P(T_1\ge t_1, T_2 \le t_2)}
 #' (Owen's equality 11)
 #' }
-#' @name pOwen
+#' @name powen
 #' @param nu integer greater than \eqn{1}, the number of degrees of freedom;
 #' infinite allowed
 #' @param t1,t2 two finite numbers, positive or negative
@@ -34,20 +34,20 @@
 #' @examples
 #' nu=5; t1=2; t2=1; delta1=3; delta2=2
 #' # Wolfram integration gives 0.1394458271284726
-#' ( p1 <- pOwen1(nu, t1, t2, delta1, delta2) )
+#' ( p1 <- powen1(nu, t1, t2, delta1, delta2) )
 #' # Wolfram integration gives 0.0353568969628651
-#' ( p2 <- pOwen2(nu, t1, t2, delta1, delta2) )
+#' ( p2 <- powen2(nu, t1, t2, delta1, delta2) )
 #' # Wolfram integration gives 0.806507459306199
-#' ( p3 <- pOwen3(nu, t1, t2, delta1, delta2) )
+#' ( p3 <- powen3(nu, t1, t2, delta1, delta2) )
 #' # Wolfram integration gives 0.018689824158
-#' ( p4 <- pOwen4(nu, t1, t2, delta1, delta2) )
+#' ( p4 <- powen4(nu, t1, t2, delta1, delta2) )
 #' # the sum should be 1
 #' p1+p2+p3+p4
 NULL
 
-#' @rdname pOwen
+#' @rdname powen
 #' @export
-pOwen1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+powen1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   J <- length(delta1)
   if(J != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
@@ -82,9 +82,9 @@ pOwen1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   RcppOwenCDF1(nu, t1, t2, delta1, delta2, jmax, cutpoint)
 }
 
-#' @rdname pOwen
+#' @rdname powen
 #' @export
-pOwen2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+powen2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   J <- length(delta1)
   if(J != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
@@ -116,9 +116,9 @@ pOwen2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   RcppOwenCDF2(nu, t1, t2, delta1, delta2, jmax, cutpoint)
 }
 
-#' @rdname pOwen
+#' @rdname powen
 #' @export
-pOwen3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+powen3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   J <- length(delta1)
   if(J != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
@@ -162,9 +162,9 @@ pOwen3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   RcppOwenCDF3(nu, t1, t2, delta1, delta2, jmax, cutpoint)
 }
 
-#' @rdname pOwen
+#' @rdname powen
 #' @export
-pOwen4 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+powen4 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   J <- length(delta1)
   if(J != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")

diff --git a/R/OwenCDF.R → R/psbt.R b/R/OwenCDF.R → R/psbt.R
@@ -2,12 +2,12 @@
 #' @description Evaluates the Owen cumulative distribution function
 #' for an integer number of degrees of freedom.
 #' \itemize{
-#' \item \code{OwenCDF1} evaluates \eqn{P(T_1\le t_1, T_2 \le t_2)}
-#' \item \code{OwenCDF2} evaluates \eqn{P(T_1\le t_1, T_2 \ge t_2)}
-#' \item \code{OwenCDf3} evaluates \eqn{P(T_1\ge t_1, T_2 \ge t_2)}
-#' \item \code{OwenCDf4} evaluates \eqn{P(T_1\ge t_1, T_2 \le t_2)}
+#' \item \code{psbt1} evaluates \eqn{P(T_1\le t_1, T_2 \le t_2)}
+#' \item \code{psbt2} evaluates \eqn{P(T_1\le t_1, T_2 \ge t_2)}
+#' \item \code{psbt3} evaluates \eqn{P(T_1\ge t_1, T_2 \ge t_2)}
+#' \item \code{psbt4} evaluates \eqn{P(T_1\ge t_1, T_2 \le t_2)}
 #' }
-#' @name OwenCDF
+#' @name psbt
 #' @param nu integer greater than \eqn{1}, the number of degrees of freedom;
 #' infinite allowed
 #' @param t1,t2 two finite numbers, positive or negative
@@ -25,25 +25,25 @@
 #' \emph{Biometrika} \bold{52}, 437-446.
 #' @examples
 #' nu=5; t1=1; t2=2; delta1=2; delta2=3
-#' ( p1 <- OwenCDF1(nu, t1, t2, delta1, delta2) )
-#' ( p2 <- OwenCDF2(nu, t1, t2, delta1, delta2) )
-#' ( p3 <- OwenCDF3(nu, t1, t2, delta1, delta2) )
-#' ( p4 <- OwenCDF4(nu, t1, t2, delta1, delta2) )
+#' ( p1 <- psbt1(nu, t1, t2, delta1, delta2) )
+#' ( p2 <- psbt2(nu, t1, t2, delta1, delta2) )
+#' ( p3 <- psbt3(nu, t1, t2, delta1, delta2) )
+#' ( p4 <- psbt4(nu, t1, t2, delta1, delta2) )
 #' # the sum should be 1
 #' p1+p2+p3+p4
 NULL
 
-#' @rdname OwenCDF
+#' @rdname psbt
 #' @export
-OwenCDF1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+psbt1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   L <- length(delta1)
   if(L != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
   }
   out <- numeric(L)
   higher <- (delta1 > delta2) | is.infinite(delta1) | is.infinite(delta2)
   if(J <- length(whigher <- which(higher))){
-    out[whigher] <- pOwen1(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
+    out[whigher] <- powen1(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
   }
   if(J < L){
     equal <- delta1==delta2
@@ -62,17 +62,17 @@ OwenCDF1 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   return(out)
 }
 
-#' @rdname OwenCDF
+#' @rdname psbt
 #' @export
-OwenCDF2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+psbt2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   L <- length(delta1)
   if(L != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
   }
   out <- numeric(L)
   higher <- (delta1 > delta2) | is.infinite(delta1) | is.infinite(delta2)
   if(J <- length(whigher <- which(higher))){
-    out[whigher] <- pOwen2(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
+    out[whigher] <- powen2(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
   }
   if(J < L){
     equal <- delta1==delta2
@@ -94,17 +94,17 @@ OwenCDF2 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   return(out)
 }
 
-#' @rdname OwenCDF
+#' @rdname psbt
 #' @export
-OwenCDF3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+psbt3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   L <- length(delta1)
   if(L != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
   }
   out <- numeric(L)
   higher <- (delta1 > delta2) | is.infinite(delta1) | is.infinite(delta2)
   if(J <- length(whigher <- which(higher))){
-    out[whigher] <- pOwen3(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
+    out[whigher] <- powen3(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
   }
   if(J < L){
     equal <- delta1==delta2
@@ -123,17 +123,17 @@ OwenCDF3 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   return(out)
 }
 
-#' @rdname OwenCDF
+#' @rdname psbt
 #' @export
-OwenCDF4 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
+psbt4 <- function(nu, t1, t2, delta1, delta2, jmax=50L, cutpoint=8){
   L <- length(delta1)
   if(L != length(delta2)){
     stop("`delta1` and `delta2` must have the same length.")
   }
   out <- numeric(L)
   higher <- (delta1 > delta2) | is.infinite(delta1) | is.infinite(delta2)
   if(J <- length(whigher <- which(higher))){
-    out[whigher] <- pOwen4(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
+    out[whigher] <- powen4(nu, t1, t2, delta1[whigher], delta2[whigher], jmax, cutpoint)
   }
   if(J < L){
     equal <- delta1==delta2