Commit c1b98027 authored by Rauschenberger's avatar Rauschenberger
Browse files

automation

parent 92c56696
...@@ -842,7 +842,7 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){ ...@@ -842,7 +842,7 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){
p <- nrow(map$genes) p <- nrow(map$genes)
# permutations # permutations
if(FALSE){ if(FALSE){ # old
min <- 5 min <- 5
max <- p/0.05+1 max <- p/0.05+1
limit <- ceiling(0.05*max/p) limit <- ceiling(0.05*max/p)
...@@ -852,7 +852,7 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){ ...@@ -852,7 +852,7 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){
steps <- c(min,diff(unique(round(base^(seq(from=from,to=to,length.out=20)))))) steps <- c(min,diff(unique(round(base^(seq(from=from,to=to,length.out=20))))))
} }
if(TRUE){ if(FALSE){ # new
max <- p/0.05+1 max <- p/0.05+1
limit <- ceiling(0.05*max/p) limit <- ceiling(0.05*max/p)
steps <- diff(limit^seq(from=1,to=log(max)/log(limit),length.out=pmin(p,steps))) # was (p,20) steps <- diff(limit^seq(from=1,to=log(max)/log(limit),length.out=pmin(p,steps))) # was (p,20)
...@@ -861,6 +861,10 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){ ...@@ -861,6 +861,10 @@ test.multiple <- function(Y,X,map,rho=c(0,0.5,1),spec=1,steps=20){
steps[length(steps)] <- max-sum(steps[-length(steps)]) steps[length(steps)] <- max-sum(steps[-length(steps)])
} }
if(TRUE){ # temporary trial, delete this!
max <- limit <- steps <- 100
}
if(max != sum(steps)){stop("Invalid combination?",call.=FALSE)} if(max != sum(steps)){stop("Invalid combination?",call.=FALSE)}
if(spec==1){ if(spec==1){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment