[Distr-commits] r695 - branches/distr-2.4/pkg/distr/R branches/distr-2.4/pkg/distr/demo branches/distr-2.4/pkg/distrDoc/inst/doc branches/distr-2.4/pkg/distrMod/R branches/distr-2.4/pkg/distrSim/R branches/distr-2.4/pkg/distrTEst/R branches/distr-2.4/pkg/distrTeach/R pkg/distr/R pkg/distr/demo pkg/distrDoc/inst/doc pkg/distrEx/src pkg/distrMod/R pkg/distrSim/R pkg/distrTEst/R pkg/distrTeach/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Dec 2 16:05:49 CET 2010
Author: ruckdeschel
Date: 2010-12-02 16:05:48 +0100 (Thu, 02 Dec 2010)
New Revision: 695
Modified:
branches/distr-2.4/pkg/distr/R/plot-methods.R
branches/distr-2.4/pkg/distr/R/plot-methods_LebDec.R
branches/distr-2.4/pkg/distr/R/qqplot.R
branches/distr-2.4/pkg/distr/demo/NormApprox.R
branches/distr-2.4/pkg/distrDoc/inst/doc/distr.Rnw
branches/distr-2.4/pkg/distrMod/R/AllPlot.R
branches/distr-2.4/pkg/distrMod/R/qqplot.R
branches/distr-2.4/pkg/distrSim/R/plot-methods.R
branches/distr-2.4/pkg/distrTEst/R/plot-methods.R
branches/distr-2.4/pkg/distrTeach/R/illustCLT.R
branches/distr-2.4/pkg/distrTeach/R/illustLLN.R
pkg/distr/R/plot-methods.R
pkg/distr/R/plot-methods_LebDec.R
pkg/distr/R/qqplot.R
pkg/distr/demo/NormApprox.R
pkg/distrDoc/inst/doc/distr.Rnw
pkg/distrEx/src/distrEx.dll
pkg/distrMod/R/AllPlot.R
pkg/distrMod/R/qqplot.R
pkg/distrSim/R/plot-methods.R
pkg/distrTEst/R/plot-methods.R
pkg/distrTeach/R/illustCLT.R
pkg/distrTeach/R/illustLLN.R
Log:
added argument no.readonly = TRUE to assignments of form opar <- par()
Modified: branches/distr-2.4/pkg/distr/R/plot-methods.R
===================================================================
--- branches/distr-2.4/pkg/distr/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distr/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -67,9 +67,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) on.exit(par(omar))
+ if(mfColRow) on.exit(par(omar, no.readonly = TRUE))
mainL <- FALSE
subL <- FALSE
@@ -128,9 +128,9 @@
}
if(mfColRow)
- opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.d <- if (inner)
@@ -367,9 +367,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) on.exit(par(omar))
+ if(mfColRow) on.exit(par(omar, no.readonly = TRUE))
mainL <- FALSE
subL <- FALSE
@@ -429,9 +429,9 @@
}
if(mfColRow)
- opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.d <- if (inner)
Modified: branches/distr-2.4/pkg/distr/R/plot-methods_LebDec.R
===================================================================
--- branches/distr-2.4/pkg/distr/R/plot-methods_LebDec.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distr/R/plot-methods_LebDec.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -154,9 +154,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) (on.exit(par(omar)))
+ if(mfColRow) (on.exit(par(omar, no.readonly = TRUE)))
mainL <- FALSE
subL <- FALSE
@@ -215,7 +215,7 @@
}
if(mfColRow){
- opar <- par("mfrow", mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par("mfrow", mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
## common:
com.drw <- (1:2)[( (1:2) %in%to.draw )]
disc.drw <-(1:3)[( (3:5) %in%to.draw )]
@@ -246,7 +246,7 @@
}
if(nrw.drw >0 ) layout(matrix(ma.drw, byrow=TRUE, nrow=nrw.drw))
}else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.p <- if (inner)
Modified: branches/distr-2.4/pkg/distr/R/qqplot.R
===================================================================
--- branches/distr-2.4/pkg/distr/R/qqplot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distr/R/qqplot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -69,9 +69,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- opar <- par("mfrow")
+ opar <- par("mfrow", no.readonly = TRUE)
if(mfColRow) on.exit(do.call(par, list(mfrow=opar)))
- if(mfColRow) opar1 <- par(mfrow = c(1,1))
+ if(mfColRow) opar1 <- par(mfrow = c(1,1), no.readonly = TRUE)
ret <- do.call(stats::qqplot, args=mcl)
Modified: branches/distr-2.4/pkg/distr/demo/NormApprox.R
===================================================================
--- branches/distr-2.4/pkg/distr/demo/NormApprox.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distr/demo/NormApprox.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -11,7 +11,7 @@
x <- seq(-4,4,0.001)
-opar <- par(mfrow = c(2,1))
+opar <- par(mfrow = c(2,1), no.readonly = TRUE)
plot(x, d(NormApprox)(x),
type = "l",
Modified: branches/distr-2.4/pkg/distrDoc/inst/doc/distr.Rnw
===================================================================
--- branches/distr-2.4/pkg/distrDoc/inst/doc/distr.Rnw 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrDoc/inst/doc/distr.Rnw 2010-12-02 15:05:48 UTC (rev 695)
@@ -2894,7 +2894,7 @@
x <- seq(-4,4,0.001)
-opar <- par()
+opar <- par(no.readonly = TRUE)
par(mfrow = c(2,1))
plot(x, d(NormApprox)(x),
Modified: branches/distr-2.4/pkg/distrMod/R/AllPlot.R
===================================================================
--- branches/distr-2.4/pkg/distrMod/R/AllPlot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrMod/R/AllPlot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -210,9 +210,9 @@
o.warn <- options("warn")
options(warn = -1)
on.exit(options(warn=o.warn))
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
- on.exit(par(opar))
+ on.exit(par(opar, no.readonly = TRUE))
if (!withSweave)
devNew()
@@ -221,8 +221,8 @@
if(mfColRow)
parArgs <- list(mfrow = c(nrows, ncols))
- omar <- par("mar")
- parArgs <- c(parArgs,list(mar = c(bmar,omar[2],tmar,omar[4])))
+ omar <- par("mar", no.readonly = TRUE)
+ parArgs <- c(parArgs,list(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE))
dots$ylim <- NULL
do.call(par,args=parArgs)
Modified: branches/distr-2.4/pkg/distrMod/R/qqplot.R
===================================================================
--- branches/distr-2.4/pkg/distrMod/R/qqplot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrMod/R/qqplot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -159,10 +159,10 @@
if (!withSweave){
devNew(width = width, height = height)
}
- opar <- par("mfrow")
- if(mfColRow) on.exit(do.call(par, list(mfrow=opar)))
+ opar <- par("mfrow", no.readonly = TRUE)
+ if(mfColRow) on.exit(do.call(par, list(mfrow=opar, no.readonly = TRUE)))
- if(mfColRow) opar1 <- par(mfrow = c(1,1))
+ if(mfColRow) opar1 <- par(mfrow = c(1,1), no.readonly = TRUE)
ret <- do.call(stats::qqplot, args=mcl)
Modified: branches/distr-2.4/pkg/distrSim/R/plot-methods.R
===================================================================
--- branches/distr-2.4/pkg/distrSim/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrSim/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -39,7 +39,7 @@
lobs0, ldim0, lrun0))
# get(getOption("device"))()
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
Modified: branches/distr-2.4/pkg/distrTEst/R/plot-methods.R
===================================================================
--- branches/distr-2.4/pkg/distrTEst/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrTEst/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -115,7 +115,7 @@
ylim0[,c2*c1+(1:c3)] <- ylim1[,1:c3]
options("warn" = o.warn) }
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
par(mfrow=c(resdim0,1))
Modified: branches/distr-2.4/pkg/distrTeach/R/illustCLT.R
===================================================================
--- branches/distr-2.4/pkg/distrTeach/R/illustCLT.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrTeach/R/illustCLT.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -45,7 +45,7 @@
x <- seq(-5,5,0.01)
dTn <- d(Tn)(supp)
ymax <- max(1/sqrt(2*pi), dTn)
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
dw <- min(diff(supp))
@@ -94,7 +94,7 @@
x <- seq(-5,5,0.01)
dTn <- d(Tn)(x)
ymax <- max(1/sqrt(2*pi), dTn)
- oldmar <- par("mar")
+ oldmar <- par("mar",no.readonly = TRUE)
par(mfrow = c(1,2), mar = c(5.1,4.1,4.,2.1))
plot(x, d(Tn)(x), ylim = c(0, ymax), type = "l",
ylab = gettext("densities"), main ="", lwd = 4)
Modified: branches/distr-2.4/pkg/distrTeach/R/illustLLN.R
===================================================================
--- branches/distr-2.4/pkg/distrTeach/R/illustLLN.R 2010-12-02 13:41:24 UTC (rev 694)
+++ branches/distr-2.4/pkg/distrTeach/R/illustLLN.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -70,7 +70,7 @@
da <- matrix(NA,m,length(n))
- omar <- par()
+ omar <- par(no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
on.exit(par(omar))
## getting the parameter
Modified: pkg/distr/R/plot-methods.R
===================================================================
--- pkg/distr/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distr/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -67,9 +67,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) on.exit(par(omar))
+ if(mfColRow) on.exit(par(omar, no.readonly = TRUE))
mainL <- FALSE
subL <- FALSE
@@ -128,9 +128,9 @@
}
if(mfColRow)
- opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.d <- if (inner)
@@ -367,9 +367,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) on.exit(par(omar))
+ if(mfColRow) on.exit(par(omar, no.readonly = TRUE))
mainL <- FALSE
subL <- FALSE
@@ -429,9 +429,9 @@
}
if(mfColRow)
- opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mfrow = c(1,l.draw), mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.d <- if (inner)
Modified: pkg/distr/R/plot-methods_LebDec.R
===================================================================
--- pkg/distr/R/plot-methods_LebDec.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distr/R/plot-methods_LebDec.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -154,9 +154,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- omar <- par("mar")
+ omar <- par("mar", no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
- if(mfColRow) (on.exit(par(omar)))
+ if(mfColRow) (on.exit(par(omar, no.readonly = TRUE)))
mainL <- FALSE
subL <- FALSE
@@ -215,7 +215,7 @@
}
if(mfColRow){
- opar <- par("mfrow", mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par("mfrow", mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
## common:
com.drw <- (1:2)[( (1:2) %in%to.draw )]
disc.drw <-(1:3)[( (3:5) %in%to.draw )]
@@ -246,7 +246,7 @@
}
if(nrw.drw >0 ) layout(matrix(ma.drw, byrow=TRUE, nrow=nrw.drw))
}else
- opar <- par(mar = c(bmar,omar[2],tmar,omar[4]))
+ opar <- par(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE)
if(is.logical(inner)){
inner.p <- if (inner)
Modified: pkg/distr/R/qqplot.R
===================================================================
--- pkg/distr/R/qqplot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distr/R/qqplot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -69,9 +69,9 @@
if (!withSweave){
devNew(width = width, height = height)
}
- opar <- par("mfrow")
+ opar <- par("mfrow", no.readonly = TRUE)
if(mfColRow) on.exit(do.call(par, list(mfrow=opar)))
- if(mfColRow) opar1 <- par(mfrow = c(1,1))
+ if(mfColRow) opar1 <- par(mfrow = c(1,1), no.readonly = TRUE)
ret <- do.call(stats::qqplot, args=mcl)
Modified: pkg/distr/demo/NormApprox.R
===================================================================
--- pkg/distr/demo/NormApprox.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distr/demo/NormApprox.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -11,7 +11,7 @@
x <- seq(-4,4,0.001)
-opar <- par(mfrow = c(2,1))
+opar <- par(mfrow = c(2,1), no.readonly = TRUE)
plot(x, d(NormApprox)(x),
type = "l",
Modified: pkg/distrDoc/inst/doc/distr.Rnw
===================================================================
--- pkg/distrDoc/inst/doc/distr.Rnw 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrDoc/inst/doc/distr.Rnw 2010-12-02 15:05:48 UTC (rev 695)
@@ -2894,7 +2894,7 @@
x <- seq(-4,4,0.001)
-opar <- par()
+opar <- par(no.readonly = TRUE)
par(mfrow = c(2,1))
plot(x, d(NormApprox)(x),
Modified: pkg/distrEx/src/distrEx.dll
===================================================================
(Binary files differ)
Modified: pkg/distrMod/R/AllPlot.R
===================================================================
--- pkg/distrMod/R/AllPlot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrMod/R/AllPlot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -210,9 +210,9 @@
o.warn <- options("warn")
options(warn = -1)
on.exit(options(warn=o.warn))
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
- on.exit(par(opar))
+ on.exit(par(opar, no.readonly = TRUE))
if (!withSweave)
devNew()
@@ -221,8 +221,8 @@
if(mfColRow)
parArgs <- list(mfrow = c(nrows, ncols))
- omar <- par("mar")
- parArgs <- c(parArgs,list(mar = c(bmar,omar[2],tmar,omar[4])))
+ omar <- par("mar", no.readonly = TRUE)
+ parArgs <- c(parArgs,list(mar = c(bmar,omar[2],tmar,omar[4]), no.readonly = TRUE))
dots$ylim <- NULL
do.call(par,args=parArgs)
Modified: pkg/distrMod/R/qqplot.R
===================================================================
--- pkg/distrMod/R/qqplot.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrMod/R/qqplot.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -159,10 +159,10 @@
if (!withSweave){
devNew(width = width, height = height)
}
- opar <- par("mfrow")
- if(mfColRow) on.exit(do.call(par, list(mfrow=opar)))
+ opar <- par("mfrow", no.readonly = TRUE)
+ if(mfColRow) on.exit(do.call(par, list(mfrow=opar, no.readonly = TRUE)))
- if(mfColRow) opar1 <- par(mfrow = c(1,1))
+ if(mfColRow) opar1 <- par(mfrow = c(1,1), no.readonly = TRUE)
ret <- do.call(stats::qqplot, args=mcl)
Modified: pkg/distrSim/R/plot-methods.R
===================================================================
--- pkg/distrSim/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrSim/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -39,7 +39,7 @@
lobs0, ldim0, lrun0))
# get(getOption("device"))()
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
Modified: pkg/distrTEst/R/plot-methods.R
===================================================================
--- pkg/distrTEst/R/plot-methods.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrTEst/R/plot-methods.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -115,7 +115,7 @@
ylim0[,c2*c1+(1:c3)] <- ylim1[,1:c3]
options("warn" = o.warn) }
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
par(mfrow=c(resdim0,1))
Modified: pkg/distrTeach/R/illustCLT.R
===================================================================
--- pkg/distrTeach/R/illustCLT.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrTeach/R/illustCLT.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -45,7 +45,7 @@
x <- seq(-5,5,0.01)
dTn <- d(Tn)(supp)
ymax <- max(1/sqrt(2*pi), dTn)
- opar <- par()
+ opar <- par(no.readonly = TRUE)
opar$cin <- opar$cra <- opar$csi <- opar$cxy <- opar$din <- NULL
on.exit(par(opar))
dw <- min(diff(supp))
@@ -94,7 +94,7 @@
x <- seq(-5,5,0.01)
dTn <- d(Tn)(x)
ymax <- max(1/sqrt(2*pi), dTn)
- oldmar <- par("mar")
+ oldmar <- par("mar",no.readonly = TRUE)
par(mfrow = c(1,2), mar = c(5.1,4.1,4.,2.1))
plot(x, d(Tn)(x), ylim = c(0, ymax), type = "l",
ylab = gettext("densities"), main ="", lwd = 4)
Modified: pkg/distrTeach/R/illustLLN.R
===================================================================
--- pkg/distrTeach/R/illustLLN.R 2010-12-02 13:41:24 UTC (rev 694)
+++ pkg/distrTeach/R/illustLLN.R 2010-12-02 15:05:48 UTC (rev 695)
@@ -70,7 +70,7 @@
da <- matrix(NA,m,length(n))
- omar <- par()
+ omar <- par(no.readonly = TRUE)
omar$cin <- omar$cra <- omar$csi <- omar$cxy <- omar$din <- NULL
on.exit(par(omar))
## getting the parameter
More information about the Distr-commits
mailing list