[Distr-commits] r1289 - in branches/distr-2.8/pkg/distrEx: R man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Aug 19 01:23:21 CEST 2018
Author: ruckdeschel
Date: 2018-08-19 01:23:21 +0200 (Sun, 19 Aug 2018)
New Revision: 1289
Modified:
branches/distr-2.8/pkg/distrEx/R/DiagnUtils.R
branches/distr-2.8/pkg/distrEx/man/AsymTotalVarDist.Rd
branches/distr-2.8/pkg/distrEx/man/CvMDist.Rd
branches/distr-2.8/pkg/distrEx/man/E.Rd
branches/distr-2.8/pkg/distrEx/man/HellingerDist.Rd
branches/distr-2.8/pkg/distrEx/man/OAsymTotalVarDist.Rd
branches/distr-2.8/pkg/distrEx/man/TotalVarDist.Rd
branches/distr-2.8/pkg/distrEx/man/distrExIntegrate.Rd
Log:
[distrEx] branch 2.8 some bugfixes w.r.t. the last commit
Modified: branches/distr-2.8/pkg/distrEx/R/DiagnUtils.R
===================================================================
--- branches/distr-2.8/pkg/distrEx/R/DiagnUtils.R 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/R/DiagnUtils.R 2018-08-18 23:23:21 UTC (rev 1289)
@@ -124,9 +124,9 @@
############################################################################
-print.DiagnosticClass <- function(x, what, withNonShows = FALSE, ...){
+print.DiagnosticClass <- function(x, what, withNonShows = FALSE, xname, ...){
if(missing(what)) what <- .showallNamesDiagnosticList(x)
- xn <- paste(deparse(substitute(x)))
+ xn <- if(missing(xname)) paste(deparse(substitute(x))) else xname
Diagtitle <- gettext("Diagnostic Information to Integrations in Object ")
underl <- paste(rep("=",nchar(Diagtitle)+3+nchar(xn)),collapse="")
cat("\n", underl,"\n", Diagtitle, "\"", xn,"\"\n", underl, "\n\n", sep="")
@@ -144,7 +144,15 @@
if(names(diaglistsShow)[item]=="call"){
cat("Calls: \n")
print(names(diaglistsShow[[item]]),...)
- }else print(diaglistsShow[[item]], ...)
+ }else{
+ toShow <- diaglistsShow[[item]]
+ clItem <- class(toShow)
+ if("DiagnosticClass" %in% clItem){
+ if(length(clItem) == 1) class(toShow) <- "list"
+ class(toShow) <- clItem[clItem != "DiagnosticClass"]
+ }
+ print(toShow, ...)
+ }
cat("\n")
}
if(withNonShows){
@@ -174,6 +182,7 @@
showDiagnostic <- function(x, what, withNonShows = FALSE, ...){
diagn <- attr(x,"diagnostic")
+ xn <- paste(deparse(substitute(x)))
diagnKStep <- attr(x,"kStepDiagnostic")
if(!is.null(diagnKStep)){
if(is.null(diagn)){
@@ -186,7 +195,7 @@
}
if(is.null(diagn)) return(invisible(NULL))
if(missing(what)) what <- .showallNamesDiagnosticList(diagn)
- res <- print(diagn, what = what, withNonShows=withNonShows, ...)
+ res <- print(diagn, what = what, withNonShows=withNonShows, xname=xn, ...)
return(invisible(res))
}
Modified: branches/distr-2.8/pkg/distrEx/man/AsymTotalVarDist.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/AsymTotalVarDist.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/AsymTotalVarDist.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -130,8 +130,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
\value{ Asymmetric Total variation distance of \code{e1} and \code{e2} }
\section{Methods}{
Modified: branches/distr-2.8/pkg/distrEx/man/CvMDist.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/CvMDist.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/CvMDist.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -49,8 +49,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
\references{
Rieder, H. (1994) \emph{Robust Asymptotic Statistics}. New York: Springer.
Modified: branches/distr-2.8/pkg/distrEx/man/E.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/E.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/E.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -293,8 +293,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
Modified: branches/distr-2.8/pkg/distrEx/man/HellingerDist.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/HellingerDist.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/HellingerDist.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -113,8 +113,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
\value{ Hellinger distance of \code{e1} and \code{e2} }
\section{Methods}{
Modified: branches/distr-2.8/pkg/distrEx/man/OAsymTotalVarDist.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/OAsymTotalVarDist.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/OAsymTotalVarDist.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -125,8 +125,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
\value{ OAsymmetric Total variation distance of \code{e1} and \code{e2} }
\section{Methods}{
Modified: branches/distr-2.8/pkg/distrEx/man/TotalVarDist.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/TotalVarDist.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/TotalVarDist.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -113,8 +113,8 @@
Diagnostics on the involved integrations are available if argument
\code{diagnostic} is \code{TRUE}. Then there is attribute \code{diagnostic}
attached to the return value, which may be inspected
- and accessed through \code{\link[distrExIntegrate]{showDiagnostic}} and
- \code{\link[distrExIntegrate]{getDiagnostic}}.
+ and accessed through \code{\link[distrEx:distrExIntegrate]{showDiagnostic}} and
+ \code{\link[distrEx:distrExIntegrate]{getDiagnostic}}.
}
\value{ Total variation distance of \code{e1} and \code{e2} }
\section{Methods}{
Modified: branches/distr-2.8/pkg/distrEx/man/distrExIntegrate.Rd
===================================================================
--- branches/distr-2.8/pkg/distrEx/man/distrExIntegrate.Rd 2018-08-18 21:17:30 UTC (rev 1288)
+++ branches/distr-2.8/pkg/distrEx/man/distrExIntegrate.Rd 2018-08-18 23:23:21 UTC (rev 1289)
@@ -16,7 +16,7 @@
distr, order, ..., diagnostic = FALSE)
showDiagnostic(x, what, withNonShows = FALSE, ...)
getDiagnostic(x, what, reorganized=TRUE)
-\method{print}{DiagnosticClass}(x, what, withNonShows = FALSE, ...)
+\method{print}{DiagnosticClass}(x, what, withNonShows = FALSE, xname, ...)
}
\arguments{
@@ -53,6 +53,7 @@
distinction is made according to the list item name. If
\code{withNonShows==TRUE} one also attempts to show the selected items
of the second kind, otherwise they are not shown (but returned). }
+ \item{xname}{ an optional name for the diagnostic object to be shown. }
\item{reorganized}{should the diagnostic information be reorganized
(using internal function \code{\link{.reorganizeDiagnosticList}}? }
}
More information about the Distr-commits
mailing list