[Robast-commits] r1063 - branches/robast-1.1/pkg/ROptEst branches/robast-1.1/pkg/ROptEst/R branches/robast-1.1/pkg/ROptEst/man branches/robast-1.2/pkg/ROptEst branches/robast-1.2/pkg/ROptEst/R branches/robast-1.2/pkg/ROptEst/man pkg/ROptEst pkg/ROptEst/R pkg/ROptEst/man pkg/RobExtremes/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Jul 29 01:09:11 CEST 2018
Author: ruckdeschel
Date: 2018-07-29 01:09:11 +0200 (Sun, 29 Jul 2018)
New Revision: 1063
Modified:
branches/robast-1.1/pkg/ROptEst/DESCRIPTION
branches/robast-1.1/pkg/ROptEst/NAMESPACE
branches/robast-1.1/pkg/ROptEst/R/comparePlot.R
branches/robast-1.1/pkg/ROptEst/man/0ROptEst-package.Rd
branches/robast-1.2/pkg/ROptEst/DESCRIPTION
branches/robast-1.2/pkg/ROptEst/NAMESPACE
branches/robast-1.2/pkg/ROptEst/R/comparePlot.R
branches/robast-1.2/pkg/ROptEst/man/0ROptEst-package.Rd
pkg/ROptEst/DESCRIPTION
pkg/ROptEst/NAMESPACE
pkg/ROptEst/R/comparePlot.R
pkg/ROptEst/man/0ROptEst-package.Rd
pkg/RobExtremes/man/0RobExtremes-package.Rd
Log:
[ROptEst] (simultaneous in trunk, branch 1.1, and branch 1.2):
+ updated DESCRIPTION / NAMESPACE file as to imports (now use dev.list() to check if to open a new device)
fixed several bugs:
+ in 0ROptEst-package.Rd: updated Import field, added Encoding field
+ in example to plot(IC),infoPlot: added seed for reproducibility, expanded argument list
+ in NAMESPACE: added dev.list() into imports from grDevices
+ AllPlot, comparePlot, infoPlot:
* in comparePlot: if return.Order now only return matched list items obj1..obj4
Modified: branches/robast-1.1/pkg/ROptEst/DESCRIPTION
===================================================================
--- branches/robast-1.1/pkg/ROptEst/DESCRIPTION 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.1/pkg/ROptEst/DESCRIPTION 2018-07-28 23:09:11 UTC (rev 1063)
@@ -6,7 +6,7 @@
classes and methods.
Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
RandVar(>= 0.9.2), RobAStBase(>= 1.0)
-Imports: startupmsg, MASS, stats, graphics, utils
+Imports: startupmsg, MASS, stats, graphics, utils, grDevices
Suggests: RobLox
Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"),
email="Matthias.Kohl at stamats.de"), person("Mykhailo", "Pupashenko", role="ctb",
Modified: branches/robast-1.1/pkg/ROptEst/NAMESPACE
===================================================================
--- branches/robast-1.1/pkg/ROptEst/NAMESPACE 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.1/pkg/ROptEst/NAMESPACE 2018-07-28 23:09:11 UTC (rev 1063)
@@ -5,6 +5,7 @@
import("distrMod")
import("RobAStBase")
importFrom("startupmsg", "buildStartupMessage", "infoShow")
+importFrom("grDevices", "dev.list")
importFrom("graphics", "abline", "axis", "box", "par",
"points", "text", "matlines", "matpoints", "mtext",
"title")
Modified: branches/robast-1.1/pkg/ROptEst/R/comparePlot.R
===================================================================
--- branches/robast-1.1/pkg/ROptEst/R/comparePlot.R 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.1/pkg/ROptEst/R/comparePlot.R 2018-07-28 23:09:11 UTC (rev 1063)
@@ -88,6 +88,7 @@
ret$dots <- ret$args <- ret$call <- NULL
plotInfo <- c(plotInfo, ret)
class(plotInfo) <- c("plotInfo","DiagnInfo")
-
+ if(return.Order){ whichRet <- names(plotInfo) %in% c("obj1","obj2","obj3","obj4")
+ return(plotInfo[whichRet])}
return(invisible(plotInfo))
})
Modified: branches/robast-1.1/pkg/ROptEst/man/0ROptEst-package.Rd
===================================================================
--- branches/robast-1.1/pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.1/pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 23:09:11 UTC (rev 1063)
@@ -16,12 +16,13 @@
Date: \tab 2018-07-16 \cr
Depends: \tab R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
RandVar(>= 0.9.2), RobAStBase(>= 1.0) \cr
-Suggests: \tab RobLox, MASS \cr
-Imports: \tab startupmsg \cr
+Suggests: \tab RobLox\cr
+Imports: \tab startupmsg, MASS, stats, graphics, utils, grDevices \cr
ByteCompile: \tab yes \cr
+Encoding: \tab latin1 \cr
License: \tab LGPL-3 \cr
URL: \tab http://robast.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 940 \cr
+VCS/SVNRevision: \tab 1058 \cr
}
}
\author{
Modified: branches/robast-1.2/pkg/ROptEst/DESCRIPTION
===================================================================
--- branches/robast-1.2/pkg/ROptEst/DESCRIPTION 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.2/pkg/ROptEst/DESCRIPTION 2018-07-28 23:09:11 UTC (rev 1063)
@@ -4,7 +4,7 @@
Title: Optimally Robust Estimation
Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods.
Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2), RobAStBase(>= 1.0)
-Imports: startupmsg, MASS, stats, graphics, utils
+Imports: startupmsg, MASS, stats, graphics, utils, grDevices
Suggests: RobLox
Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"), email="Matthias.Kohl at stamats.de"), person("Mykhailo", "Pupashenko", role="ctb",
comment="contributed wrapper functions for diagnostic plots"), person("Gerald", "Kroisandt", role="ctb", comment="contributed
Modified: branches/robast-1.2/pkg/ROptEst/NAMESPACE
===================================================================
--- branches/robast-1.2/pkg/ROptEst/NAMESPACE 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.2/pkg/ROptEst/NAMESPACE 2018-07-28 23:09:11 UTC (rev 1063)
@@ -5,6 +5,7 @@
import("distrMod")
import("RobAStBase")
importFrom("startupmsg", "buildStartupMessage", "infoShow")
+importFrom("grDevices", "dev.list")
importFrom("graphics", "abline", "axis", "box", "par",
"points", "text", "matlines", "matpoints", "mtext",
"title")
Modified: branches/robast-1.2/pkg/ROptEst/R/comparePlot.R
===================================================================
--- branches/robast-1.2/pkg/ROptEst/R/comparePlot.R 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.2/pkg/ROptEst/R/comparePlot.R 2018-07-28 23:09:11 UTC (rev 1063)
@@ -88,6 +88,7 @@
ret$dots <- ret$args <- ret$call <- NULL
plotInfo <- c(plotInfo, ret)
class(plotInfo) <- c("plotInfo","DiagnInfo")
-
+ if(return.Order){ whichRet <- names(plotInfo) %in% c("obj1","obj2","obj3","obj4")
+ return(plotInfo[whichRet])}
return(invisible(plotInfo))
})
Modified: branches/robast-1.2/pkg/ROptEst/man/0ROptEst-package.Rd
===================================================================
--- branches/robast-1.2/pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 22:55:06 UTC (rev 1062)
+++ branches/robast-1.2/pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 23:09:11 UTC (rev 1063)
@@ -14,11 +14,12 @@
Package: \tab ROptEst \cr
Version: \tab 1.2.0 \cr
Date: \tab 2018-07-25 \cr
-Depends: \tab R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
+Depends: \tab R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
RandVar(>= 0.9.2), RobAStBase(>= 1.0) \cr
-Suggests: \tab RobLox, MASS \cr
-Imports: \tab startupmsg \cr
+Suggests: \tab RobLox\cr
+Imports: \tab startupmsg, MASS, stats, graphics, utils, grDevices \cr
ByteCompile: \tab yes \cr
+Encoding: \tab latin1 \cr
License: \tab LGPL-3 \cr
URL: \tab http://robast.r-forge.r-project.org/\cr
VCS/SVNRevision: \tab 1058 \cr
Modified: pkg/ROptEst/DESCRIPTION
===================================================================
--- pkg/ROptEst/DESCRIPTION 2018-07-28 22:55:06 UTC (rev 1062)
+++ pkg/ROptEst/DESCRIPTION 2018-07-28 23:09:11 UTC (rev 1063)
@@ -6,7 +6,7 @@
methods.
Depends: R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2), RandVar(>= 0.9.2),
RobAStBase(>= 1.0)
-Imports: startupmsg, MASS, stats, graphics, utils
+Imports: startupmsg, MASS, stats, graphics, utils, grDevices
Suggests: RobLox
Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"), email="Matthias.Kohl at stamats.de"),
person("Mykhailo", "Pupashenko", role="ctb", comment="contributed wrapper functions for diagnostic
Modified: pkg/ROptEst/NAMESPACE
===================================================================
--- pkg/ROptEst/NAMESPACE 2018-07-28 22:55:06 UTC (rev 1062)
+++ pkg/ROptEst/NAMESPACE 2018-07-28 23:09:11 UTC (rev 1063)
@@ -5,6 +5,7 @@
import("distrMod")
import("RobAStBase")
importFrom("startupmsg", "buildStartupMessage", "infoShow")
+importFrom("grDevices", "dev.list")
importFrom("graphics", "abline", "axis", "box", "par",
"points", "text", "matlines", "matpoints", "mtext",
"title")
Modified: pkg/ROptEst/R/comparePlot.R
===================================================================
--- pkg/ROptEst/R/comparePlot.R 2018-07-28 22:55:06 UTC (rev 1062)
+++ pkg/ROptEst/R/comparePlot.R 2018-07-28 23:09:11 UTC (rev 1063)
@@ -88,6 +88,7 @@
ret$dots <- ret$args <- ret$call <- NULL
plotInfo <- c(plotInfo, ret)
class(plotInfo) <- c("plotInfo","DiagnInfo")
-
+ if(return.Order){ whichRet <- names(plotInfo) %in% c("obj1","obj2","obj3","obj4")
+ return(plotInfo[whichRet])}
return(invisible(plotInfo))
})
Modified: pkg/ROptEst/man/0ROptEst-package.Rd
===================================================================
--- pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 22:55:06 UTC (rev 1062)
+++ pkg/ROptEst/man/0ROptEst-package.Rd 2018-07-28 23:09:11 UTC (rev 1063)
@@ -16,9 +16,10 @@
Date: \tab 2018-07-25 \cr
Depends: \tab R(>= 2.14.0), methods, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
RandVar(>= 0.9.2), RobAStBase(>= 1.0) \cr
-Suggests: \tab RobLox, MASS \cr
-Imports: \tab startupmsg \cr
+Suggests: \tab RobLox\cr
+Imports: \tab startupmsg, MASS, stats, graphics, utils, grDevices \cr
ByteCompile: \tab yes \cr
+Encoding: \tab latin1 \cr
License: \tab LGPL-3 \cr
URL: \tab http://robast.r-forge.r-project.org/\cr
VCS/SVNRevision: \tab 1057 \cr
Modified: pkg/RobExtremes/man/0RobExtremes-package.Rd
===================================================================
--- pkg/RobExtremes/man/0RobExtremes-package.Rd 2018-07-28 22:55:06 UTC (rev 1062)
+++ pkg/RobExtremes/man/0RobExtremes-package.Rd 2018-07-28 23:09:11 UTC (rev 1063)
@@ -11,7 +11,7 @@
extending packages \pkg{distr}, \pkg{distrEx}, \pkg{distrMod},
\pkg{robustbase}, \pkg{RobAStBase}, and \pkg{ROptEst}.}
-\section{Distributions}
+\section{Distributions}{
Importing from packages \pkg{actuar},
\pkg{evd}, it provides S4 classes and methods for the
@@ -19,9 +19,9 @@
\item Generalized Extreme Value distribution (GEVD)
\item Generalized Pareto distribution (GPD)
\item Pareto distribution}
-\cr
+\cr}
-\section{Functionals for Distributions}
+\section{Functionals for Distributions}{
These distributions come together with particular methods for expectations.
I.e., a functional E() as in package \pkg{distrEx}, which as first argument
@@ -38,9 +38,9 @@
\pkg{robustbase}, we provide functionals for Sn and Qn. A new
asymmetric version of the \code{mad}, \code{kMAD} gives yet another robust
scale estimator (and functional). \cr
+}
+\section{Models and Estimators}{
-\section{Models and Estimators}
-
As to models, we provide the
\itemize{
\item GPD model (with known threshold), together with (speeded-up) optimally
@@ -68,9 +68,9 @@
For all these families, of course, MLEs and Minimum-Distance-Estimators
are also available through package "distrMod". \cr
+}
+\section{Diagnostics}{
-\section{Diagnostics}
-
We bridge to the diagnostics provided by package "ismev", i.e. our
return objects can be plugged into the diagnostics of this package.\cr
@@ -87,15 +87,16 @@
\item qqplots (with confidence bands) via \code{qqplot}
\item returnlevel plots via \code{returnlevelplot}
}
+\cr}
-\section{Starting Point}
+\section{Starting Point}{
As a starting point you may look at the included script
\file{"RobFitsAtRealData.R"} in the scripts folder of the package,
accessible by
\code{file.path(system.file(package="RobExtremes"),
- "scripts/RobFitsAtRealData.R")}.
+ "scripts/RobFitsAtRealData.R")}. \cr
+}
-
\details{
\tabular{ll}{
Package: \tab RobExtremes \cr
@@ -236,7 +237,7 @@
}}
-\section{Acknowledgement}
+\section{Acknowledgement}{
This package is joint work by Peter Ruckdeschel, Matthias Kohl, and
Nataliya Horbenko (whose PhD thesis went into this package to a large extent),
with contributions by Dasha Pupashenko, Misha Pupashenko, Gerald Kroisandt,
@@ -245,7 +246,7 @@
(and gratefully ackknowledged). Thanks also goes to the maintainers of CRAN,
in particully to Uwe Ligges who greatly helped us with finding an appropriate
way to store the database of interpolating functions which allow the speed up
--- this is now package RobAStRDA on CRAN.
+-- this is now package RobAStRDA on CRAN.\cr}
\author{
@@ -290,19 +291,19 @@
You may suppress the start-up banner/message completely by setting
\code{options("StartupBanner"="off")} somewhere before loading this package by
\code{library} or \code{require} in your R-code / R-session.
-
+%
If option \code{"StartupBanner"} is not defined (default) or setting
\code{options("StartupBanner"=NULL)} or
\code{options("StartupBanner"="complete")} the complete start-up banner is
displayed.
-
+%
For any other value of option \code{"StartupBanner"} (i.e., not in
\code{c(NULL,"off","complete")}) only the version information is displayed.
-
+%
The same can be achieved by wrapping the \code{library} or \code{require} call
into either \code{suppressStartupMessages()} or
\code{onlytypeStartupMessages(.,atypes="version")}.
-
+%
As for general \code{packageStartupMessage}'s, you may also suppress all
the start-up banner by wrapping the \code{library} or \code{require}
call into \code{suppressPackageStartupMessages()} from
More information about the Robast-commits
mailing list