[Distr-commits] r228 - in branches/distr-2.0/pkg: distr/R distr/chm distr/man distrDoc/R distrTEst/R distrTEst/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Aug 2 19:03:57 CEST 2008
Author: ruckdeschel
Date: 2008-08-02 19:03:57 +0200 (Sat, 02 Aug 2008)
New Revision: 228
Added:
branches/distr-2.0/pkg/distrDoc/R/distrDoc.R
Removed:
branches/distr-2.0/pkg/distr/R/01.R
branches/distr-2.0/pkg/distr/R/99.R
branches/distr-2.0/pkg/distrDoc/R/99.r
branches/distr-2.0/pkg/distrTEst/R/01.r
Modified:
branches/distr-2.0/pkg/distr/R/AllClasses.R
branches/distr-2.0/pkg/distr/R/ContDistribution.R
branches/distr-2.0/pkg/distr/R/DiscreteDistribution.R
branches/distr-2.0/pkg/distr/R/UnivarLebDecDistribution.R
branches/distr-2.0/pkg/distr/R/flat.R
branches/distr-2.0/pkg/distr/chm/00Index.html
branches/distr-2.0/pkg/distr/chm/ContDistribution-class.html
branches/distr-2.0/pkg/distr/chm/DiscreteDistribution-class.html
branches/distr-2.0/pkg/distr/chm/Distr.chm
branches/distr-2.0/pkg/distr/chm/Distr.toc
branches/distr-2.0/pkg/distr/chm/UnivarLebDecDistribution-class.html
branches/distr-2.0/pkg/distr/chm/internals.html
branches/distr-2.0/pkg/distr/man/ContDistribution-class.Rd
branches/distr-2.0/pkg/distr/man/DiscreteDistribution-class.Rd
branches/distr-2.0/pkg/distr/man/UnivarLebDecDistribution-class.Rd
branches/distr-2.0/pkg/distrTEst/R/AllClasses.R
branches/distr-2.0/pkg/distrTEst/man/distrTEstOptions.Rd
Log:
+Rearranged 01.R, 99.R files in a more standard way
(i.e. .onLoad, .onAttach in AllClass(es).R, distrXXXoptions() in distrXXXOptions.R)
for distr we need the definition of distroptions() earlier, so renamed it
to 0distrOptions.R;
+had problem with Diethelm Wuertz's fXXX packages, because he defined
log(x, base) as S3 default; now log-S4-methods of distr have this argument, too.
Deleted: branches/distr-2.0/pkg/distr/R/01.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/01.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/01.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,29 +0,0 @@
-.onLoad <- function(lib, pkg) { # extended 03-28-06: P.R.
- require("methods", character = TRUE, quietly = TRUE)
-}
-
-distroptions <- function(...) {
- if (nargs() == 0) return(.distroptions)
- current <- .distroptions
- temp <- list(...)
- if (length(temp) == 1 && is.null(names(temp))) {
- arg <- temp[[1]]
- switch(mode(arg),
- list = temp <- arg,
- character = return(.distroptions[arg]),
- stop("invalid argument: ", sQuote(arg)))
- }
- if (length(temp) == 0) return(current)
- n <- names(temp)
- if (is.null(n)) stop("options must be given by name")
- changed <- current[n]
- current[n] <- temp
- env <- if (sys.parent() == 0) asNamespace("distr") else parent.frame()
- assign(".distroptions", current, envir = env)
- invisible(current)
-}
-
-getdistrOption<-function(x)distroptions(x)[[1]]
-
-###must happen between load and attach
-
Deleted: branches/distr-2.0/pkg/distr/R/99.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/99.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/99.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,44 +0,0 @@
-.distroptions <- list(
- DefaultNrGridPoints = 2^12,
- DistrResolution = 1e-6,
- TruncQuantile = 1e-5,
- DefaultNrFFTGridPointsExponent = 12,
- RtoDPQ.e = 5,
- # new Warning-items P.R. 28.03.06
- WarningArith = TRUE,
- WarningSim = TRUE,
- ## new Items from 2.0:
- withgaps = TRUE,
- simplifyD = TRUE,
- DistrCollapse = TRUE
- )
-
-.OkTyp <- c("DiscreteDistribution","AbscontDistribution",
- "UnivarLebDecDistribution", "UnivarMixingDistribution")
-
-
-
-.onAttach <- function(library, pkg)
-{
- unlockBinding(".distroptions", asNamespace("distr"))
- msga <- gettext(
- "Attention: Arithmetics on distribution objects are understood as\n"
- )
- msgb <- gettext(
- "operations on corresponding random variables (r.v.s); see distrARITH().\n"
- )
- msgc <- gettext(
- "Some functions from package 'stats' are intentionally masked\n---see distrMASK().\n"
- )
- msgd <- gettext(
- "Note that global options are controlled by distroptions()\n---c.f. ?\"distroptions\"."
- )
-buildStartupMessage(pkg = "distr", msga, msgb, msgc, msgd, library = library,
- packageHelp = TRUE,
-# MANUAL = "http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
- VIGNETTE = gettext(
-"Package \"distrDoc\" provides a vignette to this package as well as\nto several extension packages; try vignette(\"distr\")."
- )
- )
- invisible()
-}
Modified: branches/distr-2.0/pkg/distr/R/AllClasses.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/AllClasses.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/AllClasses.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,3 +1,39 @@
+############# preparations ################
+# (.onload, .onattach ...)
+.onLoad <- function(lib, pkg) { # extended 03-28-06: P.R.
+ require("methods", character = TRUE, quietly = TRUE)
+}
+
+
+
+.onAttach <- function(library, pkg)
+{
+ unlockBinding(".distroptions", asNamespace("distr"))
+## global variable needed for flat.R
+## unlockBinding(".OkTyp", asNamespace("distr"))
+ msga <- gettext(
+ "Attention: Arithmetics on distribution objects are understood as\n"
+ )
+ msgb <- gettext(
+ "operations on corresponding random variables (r.v.s); see distrARITH().\n"
+ )
+ msgc <- gettext(
+ "Some functions from package 'stats' are intentionally masked\n---see distrMASK().\n"
+ )
+ msgd <- gettext(
+ "Note that global options are controlled by distroptions()\n---c.f. ?\"distroptions\"."
+ )
+buildStartupMessage(pkg = "distr", msga, msgb, msgc, msgd, library = library,
+ packageHelp = TRUE,
+# MANUAL = "http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
+ VIGNETTE = gettext(
+"Package \"distrDoc\" provides a vignette to this package as well as\nto several extension packages; try vignette(\"distr\")."
+ )
+ )
+ invisible()
+}
+
+
################################
##
## Optional..-classes
Modified: branches/distr-2.0/pkg/distr/R/ContDistribution.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/ContDistribution.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/ContDistribution.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -381,17 +381,18 @@
if (getRversion()>='2.6.0'){
setMethod("log", "AbscontDistribution",
- function(x) {
+ function(x, base = exp(1)) {
xs <- as.character(deparse(match.call(
call = sys.call(sys.parent(1)))$x))
ep <- getdistrOption("TruncQuantile")
+ basl <- log(base)
if(p(x)(0)>ep)
stop(gettextf("log(%s) is not well-defined with positive probability ", xs))
- else return(.logm.c(x))})
+ else return(.logm.c(x)/basl)})
setMethod("log10", "AbscontDistribution",
- function(x) log(x=x)/log(x=10))
+ function(x) log(x = x, base = 10))
setMethod("sign", "AbscontDistribution",
function(x){
Modified: branches/distr-2.0/pkg/distr/R/DiscreteDistribution.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/DiscreteDistribution.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/DiscreteDistribution.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -346,25 +346,28 @@
if (getRversion()>='2.6.0'){
setMethod("log", "DiscreteDistribution",
- function(x) {
+ function(x, base = exp(1)) {
xs <- as.character(deparse(match.call(
call = sys.call(sys.parent(1)))$x))
ep <- getdistrOption("TruncQuantile")
+ basl <- log(base)
if(p(x)(0)>ep)
stop(gettextf("log(%s) is not well-defined with positive probability ", xs))
- else return(.logm.d(x))})
+ else return(.logm.d(x)/basl)})
setMethod("log", "Dirac",
- function(x){ xs <- as.character(deparse(match.call(
+ function(x, base = exp(1)){
+ xs <- as.character(deparse(match.call(
call = sys.call(sys.parent(1)))$x))
loc <- location(x)
ep <- getdistrOption("TruncQuantile")
+ basl <- log(base)
if(loc < ep)
stop(gettextf("log(%s) is not well-defined with positive probability ", xs))
- Dirac(log(loc))})
+ Dirac(log(loc)/basl)})
setMethod("log10", "DiscreteDistribution",
- function(x) log(x = x)/log(x = 10))
+ function(x) log(x = x, base = 10))
setMethod("sign", "DiscreteDistribution",
function(x){
Modified: branches/distr-2.0/pkg/distr/R/UnivarLebDecDistribution.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/UnivarLebDecDistribution.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/UnivarLebDecDistribution.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -341,27 +341,28 @@
setMethod("log", "UnivarLebDecDistribution",
- function(x){
+ function(x, base = exp(1)){
xs <- as.character(deparse(match.call(
call = sys.call(sys.parent(1)))$x))
ep <- getdistrOption("TruncQuantile")
+ basl <- log(base)
if(p(x)(0)>ep)
stop(gettextf("log(%s) is not well-defined with positive probability ", xs))
if(acWeight(x)>1-getdistrOption("TruncQuantile"))
{x <- force(acPart(x))
- return(as(log(x),"UnivarLebDecDistribution"))}
+ return(as(log(x, base = base),"UnivarLebDecDistribution"))}
if(acWeight(x) < getdistrOption("TruncQuantile"))
{x <- force(discretePart(x))
- return(as(log(x),"UnivarLebDecDistribution"))}
+ return(as(log(x, base = base),"UnivarLebDecDistribution"))}
return(UnivarLebDecDistribution(
- discretePart = log(discretePart(x)),
- acPart = log(acPart(x)),
+ discretePart = log(discretePart(x), base = base),
+ acPart = log(acPart(x), base = base),
discreteWeight = discreteWeight(x),
acWeight = acWeight(x)))})
setMethod("log10", "UnivarLebDecDistribution",
- function(x) log(x=x)/log(x=10))
+ function(x) log(x = x, base = 10))
setMethod("sign", "UnivarLebDecDistribution",
function(x){
Modified: branches/distr-2.0/pkg/distr/R/flat.R
===================================================================
--- branches/distr-2.0/pkg/distr/R/flat.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/R/flat.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,3 +1,5 @@
+.OkTyp.flat.LCD <- c("DiscreteDistribution", "AbscontDistribution",
+ "UnivarLebDecDistribution", "UnivarMixingDistribution")
flat.LCD <- function(..., mixCoeff = NULL, withgaps = getdistrOption("withgaps")){
ldots <- list(...)
@@ -84,10 +86,11 @@
flat.mix <- function(object){
mixDistr <- object at mixDistr
mixCoeff <- object at mixCoeff
- isOkTyp <- function(x) any(as.logical(lapply(.OkTyp, function(y) is(x,y))))
+ isOkTyp <- function(x) any(as.logical(lapply(.OkTyp.flat.LCD,
+ function(y) is(x,y))))
if(!all(as.logical(lapply(mixDistr, isOkTyp))))
stop(gettextf("all list elements must be of one of the following classes\n"),
- paste("'",.OkTyp,"'", sep ="", collapse=", "))
+ paste("'",.OkTyp.flat.LCD,"'", sep ="", collapse=", "))
mixDistr2 <- mixDistr
for(i in seq(length(mixDistr)))
{if ( is(mixDistr[[i]],"UnivarMixingDistribution") &&
Modified: branches/distr-2.0/pkg/distr/chm/00Index.html
===================================================================
--- branches/distr-2.0/pkg/distr/chm/00Index.html 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/00Index.html 2008-08-02 17:03:57 UTC (rev 228)
@@ -1419,6 +1419,8 @@
<td>Methods for Functions print/show in Package ‘distr’ </td></tr>
<tr><td width="25%"><a href="Math-methods.html">sign,AbscontDistribution-method</a></td>
<td>Methods for Functions from group ‘Math’ in Package ‘distr’ </td></tr>
+<tr><td width="25%"><a href="UnivarLebDecDistribution-class.html">sign,AcDcLcDistribution-method</a></td>
+<td>Class "UnivarLebDecDistribution"</td></tr>
<tr><td width="25%"><a href="Math-methods.html">sign,DiscreteDistribution-method</a></td>
<td>Methods for Functions from group ‘Math’ in Package ‘distr’ </td></tr>
<tr><td width="25%"><a href="UnivarLebDecDistribution-class.html">sign,UnivarLebDecDistribution-method</a></td>
Modified: branches/distr-2.0/pkg/distr/chm/ContDistribution-class.html
===================================================================
--- branches/distr-2.0/pkg/distr/chm/ContDistribution-class.html 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/ContDistribution-class.html 2008-08-02 17:03:57 UTC (rev 228)
@@ -75,7 +75,8 @@
<code>abs</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>abs(x)</code>.}
<code>exp</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>exp(x)</code>.}
<code>sign</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>sign(x)</code>.}
-<code>log</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>log(x)</code>.}
+<code>log</code>{<code>signature(x = "AbscontDistribution")</code>: (with optional further argument <code>base</code>,
+defaulting to <code>exp(1)</code>) exact image distribution of <code>log(x)</code>.}
<code>log10</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>log10(x)</code>.}
<code>gamma</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>gamma(x)</code>.}
<code>lgamma</code>{<code>signature(x = "AbscontDistribution")</code>: exact image distribution of <code>lgamma(x)</code>.}
Modified: branches/distr-2.0/pkg/distr/chm/DiscreteDistribution-class.html
===================================================================
--- branches/distr-2.0/pkg/distr/chm/DiscreteDistribution-class.html 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/DiscreteDistribution-class.html 2008-08-02 17:03:57 UTC (rev 228)
@@ -66,7 +66,8 @@
<code>abs</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>abs(x)</code>.}
<code>exp</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>exp(x)</code>.}
<code>sign</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>sign(x)</code>.}
-<code>log</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>log(x)</code>.}
+<code>log</code>{<code>signature(x = "DiscreteDistribution")</code>: (with optional further argument <code>base</code>,
+defaulting to <code>exp(1)</code>) exact image distribution of <code>log(x)</code>.}
<code>log10</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>log10(x)</code>.}
<code>gamma</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>gamma(x)</code>.}
<code>lgamma</code>{<code>signature(x = "DiscreteDistribution")</code>: exact image distribution of <code>lgamma(x)</code>.}
Modified: branches/distr-2.0/pkg/distr/chm/Distr.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.0/pkg/distr/chm/Distr.toc
===================================================================
--- branches/distr-2.0/pkg/distr/chm/Distr.toc 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/Distr.toc 2008-08-02 17:03:57 UTC (rev 228)
@@ -2930,6 +2930,10 @@
<param name="Local" value="Math-methods.html">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+<param name="Name" value="sign,AcDcLcDistribution-method">
+<param name="Local" value="UnivarLebDecDistribution-class.html">
+</OBJECT>
+<LI> <OBJECT type="text/sitemap">
<param name="Name" value="sign,DiscreteDistribution-method">
<param name="Local" value="Math-methods.html">
</OBJECT>
Modified: branches/distr-2.0/pkg/distr/chm/UnivarLebDecDistribution-class.html
===================================================================
--- branches/distr-2.0/pkg/distr/chm/UnivarLebDecDistribution-class.html 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/UnivarLebDecDistribution-class.html 2008-08-02 17:03:57 UTC (rev 228)
@@ -67,6 +67,7 @@
<param name="keyword" value="R: ^,AcDcLcDistribution,Dirac-method">
<param name="keyword" value="R: exp,UnivarLebDecDistribution-method">
<param name="keyword" value="R: sign,UnivarLebDecDistribution-method">
+<param name="keyword" value="R: sign,AcDcLcDistribution-method">
<param name="keyword" value=" Class 'UnivarLebDecDistribution'">
</object>
@@ -159,7 +160,9 @@
<code>abs</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: exact image distribution of <code>abs(x)</code>.}
<code>exp</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: exact image distribution of <code>exp(x)</code>.}
<code>sign</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: exact image distribution of <code>sign(x)</code>.}
-<code>log</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: exact image distribution of <code>log(x)</code>.}
+<code>sign</code>{<code>signature(x = "AcDcLcDistribution")</code>: exact image distribution of <code>sign(x)</code>.}
+<code>log</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: (with optional further argument <code>base</code>,
+defaulting to <code>exp(1)</code>) exact image distribution of <code>log(x)</code>.}
<code>log10</code>{<code>signature(x = "UnivarLebDecDistribution")</code>: exact image distribution of <code>log10(x)</code>.}
<dt>-</dt><dd><code>signature(e1 = "UnivarLebDecDistribution")</code>: application of `-' to this distribution</dd>
<dt>*</dt><dd><code>signature(e1 = "UnivarLebDecDistribution", e2 = "numeric")</code>: multiplication of this distribution
@@ -250,7 +253,6 @@
<code><a href="UnivarMixingDistribution-class.html">UnivarMixingDistribution-class</a></code>
<code><a href="DiscreteDistribution-class.html">DiscreteDistribution-class</a></code>
<code><a href="ContDistribution-class.html">AbscontDistribution-class</a></code>
-<code><a href="UnivarLebDecDistribution-class.html">AcDcLcDistribution-class</a></code>
<code><a href="simplifyD-methods.html">simplifyD</a></code>
<code><a href="flat.LCD.html">flat.LCD</a></code>
</p>
Modified: branches/distr-2.0/pkg/distr/chm/internals.html
===================================================================
--- branches/distr-2.0/pkg/distr/chm/internals.html 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/chm/internals.html 2008-08-02 17:03:57 UTC (rev 228)
@@ -448,7 +448,7 @@
</p>
<p>
<code>.csimpsum</code> is used internally in <code>.makePNew</code> to produce
-a prime function out of function evaluations by means of vectorized
+a primitive function out of function evaluations by means of vectorized
Simpson quadrature method, returning already the function values
of the prime function on a grid; it is to mimick the behaviour
of <code>cumsum</code>. <code>.primefun</code> is similar but more flexible and
Modified: branches/distr-2.0/pkg/distr/man/ContDistribution-class.Rd
===================================================================
--- branches/distr-2.0/pkg/distr/man/ContDistribution-class.Rd 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/man/ContDistribution-class.Rd 2008-08-02 17:03:57 UTC (rev 228)
@@ -49,7 +49,8 @@
\code{abs}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{abs(x)}.}
\code{exp}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{exp(x)}.}
\code{sign}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{sign(x)}.}
- \code{log}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{log(x)}.}
+ \code{log}{\code{signature(x = "AbscontDistribution")}: (with optional further argument \code{base},
+ defaulting to \code{exp(1)}) exact image distribution of \code{log(x)}.}
\code{log10}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{log10(x)}.}
\code{gamma}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{gamma(x)}.}
\code{lgamma}{\code{signature(x = "AbscontDistribution")}: exact image distribution of \code{lgamma(x)}.}
Modified: branches/distr-2.0/pkg/distr/man/DiscreteDistribution-class.Rd
===================================================================
--- branches/distr-2.0/pkg/distr/man/DiscreteDistribution-class.Rd 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/man/DiscreteDistribution-class.Rd 2008-08-02 17:03:57 UTC (rev 228)
@@ -41,7 +41,8 @@
\code{abs}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{abs(x)}.}
\code{exp}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{exp(x)}.}
\code{sign}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{sign(x)}.}
- \code{log}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{log(x)}.}
+ \code{log}{\code{signature(x = "DiscreteDistribution")}: (with optional further argument \code{base},
+ defaulting to \code{exp(1)}) exact image distribution of \code{log(x)}.}
\code{log10}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{log10(x)}.}
\code{gamma}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{gamma(x)}.}
\code{lgamma}{\code{signature(x = "DiscreteDistribution")}: exact image distribution of \code{lgamma(x)}.}
Modified: branches/distr-2.0/pkg/distr/man/UnivarLebDecDistribution-class.Rd
===================================================================
--- branches/distr-2.0/pkg/distr/man/UnivarLebDecDistribution-class.Rd 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distr/man/UnivarLebDecDistribution-class.Rd 2008-08-02 17:03:57 UTC (rev 228)
@@ -135,7 +135,8 @@
\code{exp}{\code{signature(x = "UnivarLebDecDistribution")}: exact image distribution of \code{exp(x)}.}
\code{sign}{\code{signature(x = "UnivarLebDecDistribution")}: exact image distribution of \code{sign(x)}.}
\code{sign}{\code{signature(x = "AcDcLcDistribution")}: exact image distribution of \code{sign(x)}.}
- \code{log}{\code{signature(x = "UnivarLebDecDistribution")}: exact image distribution of \code{log(x)}.}
+ \code{log}{\code{signature(x = "UnivarLebDecDistribution")}: (with optional further argument \code{base},
+ defaulting to \code{exp(1)}) exact image distribution of \code{log(x)}.}
\code{log10}{\code{signature(x = "UnivarLebDecDistribution")}: exact image distribution of \code{log10(x)}.}
\item{-}{\code{signature(e1 = "UnivarLebDecDistribution")}: application of `-' to this distribution}
\item{*}{\code{signature(e1 = "UnivarLebDecDistribution", e2 = "numeric")}: multiplication of this distribution
Deleted: branches/distr-2.0/pkg/distrDoc/R/99.r
===================================================================
--- branches/distr-2.0/pkg/distrDoc/R/99.r 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distrDoc/R/99.r 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,15 +0,0 @@
-.First.lib <- function(libname, pkgname)
-{
- if (.Platform$OS.type == "windows" && require("Biobase")
- && interactive() && .Platform$GUI == "Rgui")
- addVigs2WinMenu("distrDoc")
-
-buildStartupMessage(pkg="distrDoc", library=libname,
- packageHelp=TRUE, # MANUAL="http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
- VIGNETTE=gettext("This package provides a vignette to package \"distr\"\nand to several related packages; try vignette(\"distr\")."))
- invisible()
-}
-
-### just to have it -- not to export it
-#setClass("Integer", contains ="numeric",
-# validity = function(object) all(.isInteger(object)))
Copied: branches/distr-2.0/pkg/distrDoc/R/distrDoc.R (from rev 226, branches/distr-2.0/pkg/distrDoc/R/99.r)
===================================================================
--- branches/distr-2.0/pkg/distrDoc/R/distrDoc.R (rev 0)
+++ branches/distr-2.0/pkg/distrDoc/R/distrDoc.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -0,0 +1,15 @@
+.First.lib <- function(libname, pkgname)
+{
+ if (.Platform$OS.type == "windows" && require("Biobase")
+ && interactive() && .Platform$GUI == "Rgui")
+ addVigs2WinMenu("distrDoc")
+
+buildStartupMessage(pkg="distrDoc", library=libname,
+ packageHelp=TRUE, # MANUAL="http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
+ VIGNETTE=gettext("This package provides a vignette to package \"distr\"\nand to several related packages; try vignette(\"distr\")."))
+ invisible()
+}
+
+### just to have it -- not to export it
+#setClass("Integer", contains ="numeric",
+# validity = function(object) all(.isInteger(object)))
Property changes on: branches/distr-2.0/pkg/distrDoc/R/distrDoc.R
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: branches/distr-2.0/pkg/distrTEst/R/01.r
===================================================================
--- branches/distr-2.0/pkg/distrTEst/R/01.r 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distrTEst/R/01.r 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,20 +0,0 @@
-.onLoad <- function(lib, pkg){
- require("methods", character = TRUE, quietly = TRUE)
-}
-
-.distrTEstoptions <- list(
- MaxNumberofPlottedEvaluationDims = 6,
- MaxNumberofPlottedEvaluations = 6,
- MaxNumberofSummarizedEvaluations = 15,
- MaxNumberofPrintedEvaluations = 15)
-
-
-.onAttach <- function(library, pkg)
-{
- unlockBinding(".distrTEstoptions", asNamespace("distrTEst"))
-buildStartupMessage(pkg="distrTEst", packageHelp=TRUE, library=library,
-# MANUAL="http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
-VIGNETTE = gettext("Package \"distrDoc\" provides a vignette to this package as well as\nto several related packages; try vignette(\"distr\")."))
-###
- invisible()
-}
Modified: branches/distr-2.0/pkg/distrTEst/R/AllClasses.R
===================================================================
--- branches/distr-2.0/pkg/distrTEst/R/AllClasses.R 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distrTEst/R/AllClasses.R 2008-08-02 17:03:57 UTC (rev 228)
@@ -1,3 +1,19 @@
+.onLoad <- function(lib, pkg){
+ require("methods", character = TRUE, quietly = TRUE)
+}
+
+
+.onAttach <- function(library, pkg)
+{
+ unlockBinding(".distrTEstoptions", asNamespace("distrTEst"))
+buildStartupMessage(pkg="distrTEst", packageHelp=TRUE, library=library,
+# MANUAL="http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf",
+VIGNETTE = gettext("Package \"distrDoc\" provides a vignette to this package as well as\nto several related packages; try vignette(\"distr\")."))
+###
+ invisible()
+}
+
+
## Slots in Evaluation
## name - name of Dataclass object, which was called by evaluate
Modified: branches/distr-2.0/pkg/distrTEst/man/distrTEstOptions.Rd
===================================================================
--- branches/distr-2.0/pkg/distrTEst/man/distrTEstOptions.Rd 2008-08-01 18:54:44 UTC (rev 227)
+++ branches/distr-2.0/pkg/distrTEst/man/distrTEstOptions.Rd 2008-08-02 17:03:57 UTC (rev 228)
@@ -23,7 +23,7 @@
}
\details{Invoking \code{distrTEstoptions()} with no arguments returns a list with the current values of the options.
To access the value of a single option, one should use \code{getdistrTEstOption("MaxNumberofSummarizedEvaluations")},
- e.g., rather than \code{distroptions("MaxNumberofSummarizedEvaluations")} which is a \emph{list} of length one.}
+ e.g., rather than \code{distrTEstoptions("MaxNumberofSummarizedEvaluations")} which is a \emph{list} of length one.}
\value{
\code{distrTEstoptions()} returns a list of the global options of \pkg{distrTEst}. \cr
\code{distrTEstoptions("MaxNumberofSummarizedEvaluations")} returns the global option \code{MaxNumberofSummarizedEvaluations} as a list of length 1. \cr
More information about the Distr-commits
mailing list