diff options
| author | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2005-03-17 17:16:00 +0000 |
|---|---|---|
| committer | ranke <ranke@d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc> | 2005-03-17 17:16:00 +0000 |
| commit | bf1d3b82134f6a5e108ba6bbbe8eb578b69b9264 (patch) | |
| tree | 71b2ee0b7b497350363641cc87b6b8e960181029 | |
| parent | 6d0fa52837e7f2220846203b07e2dbc3d6846253 (diff) | |
The filename generation from substance names in drplot was changed. Now,
parentheses () are not substituted any more. Only whitespace is substituted
by "_".
git-svn-id: http://kriemhild.uft.uni-bremen.de/svn/drfit@20 d1b72e20-2ee0-0310-a1c4-ad5adbbefcdc
| -rw-r--r-- | DESCRIPTION | 4 | ||||
| -rw-r--r-- | R/drfit.R | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/DESCRIPTION b/DESCRIPTION index b5fed66..569a2a8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: drfit -Version: 0.03-19 -Date: 2005-03-14 +Version: 0.03-20 +Date: 2005-03-17 Title: Dose-response data evaluation Author: Johannes Ranke <jranke@uni-bremen.de> Maintainer: Johannes Ranke <jranke@uni-bremen.de> @@ -200,8 +200,8 @@ drfit <- function(data, startlogEC50 = NA, chooseone=TRUE, f[[ri]] <- NA } } - results <- data.frame(rsubstance,rn, rlhd, mtype, logEC50, stderrlogEC50, unit, sigma) - names(results) <- c("Substance","n", "lhd","mtype","logEC50","std","unit","sigma") + results <- data.frame(rsubstance, rn, rlld, rlhd, mtype, logEC50, stderrlogEC50, unit, sigma) + names(results) <- c("Substance","n","lld","lhd","mtype","logEC50","std","unit","sigma") if (lognorm || logis) { results$slope <- slope } @@ -284,6 +284,7 @@ drplot <- function(drresults, data, dtype = "std", alpha = 0.95, splitted <- split(data,data$substance) n <- 0 if (bw) colors <- rep("black",length(dsubstances)) + # Loop over the substances in the data for (i in dsubstances) { n <- n + 1 tmp <- splitted[[i]] @@ -293,13 +294,13 @@ drplot <- function(drresults, data, dtype = "std", alpha = 0.95, if (!overlay) { if (postscript) { - filename = paste(path,fileprefix,sub(" ","_",gsub("([\(\) ])", "", i)),".eps",sep="") + filename = paste(path,fileprefix,sub(" ","_",i),".eps",sep="") postscript(file=filename, paper="special",width=7,height=7,horizontal=FALSE,pointsize=12) cat("Created File: ",filename,"\n") } if (png) { - filename = paste(path,fileprefix,sub(" ","_",gsub("([\(\) ])", "", i)),".png",sep="") + filename = paste(path,fileprefix,sub(" ","_",i),".png",sep="") png(filename=filename, width=500, height=500,pointsize=12) cat("Created File: ",filename,"\n") |