[Robast-commits] r1269 - branches/robast-1.3/pkg/ROptEst/R branches/robast-1.3/pkg/ROptEst/inst branches/robast-1.3/pkg/ROptEst/man pkg/ROptEst pkg/ROptEst/R pkg/ROptEst/inst pkg/ROptEst/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Feb 3 19:09:53 CET 2024
Author: ruckdeschel
Date: 2024-02-03 19:09:52 +0100 (Sat, 03 Feb 2024)
New Revision: 1269
Modified:
branches/robast-1.3/pkg/ROptEst/R/interpolLM.R
branches/robast-1.3/pkg/ROptEst/inst/NEWS
branches/robast-1.3/pkg/ROptEst/man/internal-interpolate.Rd
branches/robast-1.3/pkg/ROptEst/man/internalRobestHelpers.Rd
branches/robast-1.3/pkg/ROptEst/man/internal_Cniperplots.Rd
branches/robast-1.3/pkg/ROptEst/man/internals.Rd
pkg/ROptEst/DESCRIPTION
pkg/ROptEst/R/interpolLM.R
pkg/ROptEst/inst/NEWS
pkg/ROptEst/man/0ROptEst-package.Rd
pkg/ROptEst/man/internal-interpolate.Rd
pkg/ROptEst/man/internalRobestHelpers.Rd
pkg/ROptEst/man/internal_Cniperplots.Rd
pkg/ROptEst/man/internals.Rd
Log:
[ROptEst] some fixes in internal Rd files / NEWS / encoding set to UTF-8 in branch and trunk
Modified: branches/robast-1.3/pkg/ROptEst/R/interpolLM.R
===================================================================
--- branches/robast-1.3/pkg/ROptEst/R/interpolLM.R 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/R/interpolLM.R 2024-02-03 18:09:52 UTC (rev 1269)
@@ -60,7 +60,7 @@
upper = 1e4, lower = 1e-4, OptOrIter = "iterate",
maxiter = 50, tol = .Machine$double.eps^0.4,
loRad = 0, upRad = Inf, loRad0 = 1e-3,
- loRad.s=0.2, up.Rad.s=1,
+ loRad.s=0.2, upRad.s=1,
withStartLM = TRUE, len = 13
){
wprint <- function(...){ if (withPrint) print(...)}
Modified: branches/robast-1.3/pkg/ROptEst/inst/NEWS
===================================================================
--- branches/robast-1.3/pkg/ROptEst/inst/NEWS 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/inst/NEWS 2024-02-03 18:09:52 UTC (rev 1269)
@@ -8,6 +8,22 @@
information)
#######################################
+version 1.3.2
+#######################################
+
+under the hood
++ fixed some internal .Rd files
++ moved from latin1 to UTF-8 encoding
+
+
+#######################################
+version 1.3.1
+#######################################
+
+user-visible CHANGES:
++ changed old and now invalid URL detected during submission to CRAN.
+
+#######################################
version 1.3
#######################################
Modified: branches/robast-1.3/pkg/ROptEst/man/internal-interpolate.Rd
===================================================================
--- branches/robast-1.3/pkg/ROptEst/man/internal-interpolate.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/man/internal-interpolate.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -38,12 +38,12 @@
upper = 1e4, lower = 1e-4, OptOrIter = "iterate",
maxiter = 50, tol = .Machine$double.eps^0.4,
loRad = 0, upRad = Inf, loRad0 = 1e-3,
- loRad.s = 0.2, up.Rad.s = 1, withStartLM = TRUE, len = 13)
+ loRad.s = 0.2, upRad.s = 1, withStartLM = TRUE, len = 13)
.saveGridToCSV(Grid, toFileCSV, namPFam, nameInSysdata)
-.readGridFromCSV <- function(fromFileCSV)
+.readGridFromCSV(fromFileCSV)
.generateInterpGrid(thGrid, PFam, toFileCSV = "temp.csv",
getFun = .getLMGrid, ..., modifyfct, nameInSysdata,
@@ -94,7 +94,8 @@
internally set to \code{max(loRad,loRad0)}. }
\item{withStartLM}{ logical of length 1: shall the LM's of the preceding grid
value serve as starting value for the next grid value? }
- \item{withSmooth}{logical of length 1: shall a smoothing spline be used? }
+% should be an arg for .saveGridToRda (in pkg RobAStRDA)
+% \item{withSmooth}{logical of length 1: shall a smoothing spline be used? }
\item{withPrint}{logical of length 1: shall current grid value be printed out? }
\item{thGrid}{numeric; grid values. }
\item{optFct}{function with arguments \code{theta}, \code{PFam},
@@ -157,13 +158,13 @@
\item{.getLMGrid}{A grid (in form of a matrix of x and y-values) pasted
together by \code{cbind}. }
- \code{.saveGridToCSV}{\code{invisible(NULL)}. }
+ \item{.saveGridToCSV}{\code{invisible(NULL)}. }
- \code{.readGridFromCSV}{ a list with the read-in items, i.e.,
+ \item{.readGridFromCSV}{ a list with the read-in items, i.e.,
an item \code{Grid} with the grid, an item \code{namPFam} with the name of
the parametric family, and \code{namInSysdata}, the name of the read in grid. }
- \code{.generateInterpGrid}{\code{invisible(NULL)}. }
+ \item{.generateInterpGrid}{\code{invisible(NULL)}. }
}
\keyword{internal}
\concept{utilities}
Modified: branches/robast-1.3/pkg/ROptEst/man/internalRobestHelpers.Rd
===================================================================
--- branches/robast-1.3/pkg/ROptEst/man/internalRobestHelpers.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/man/internalRobestHelpers.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -1,10 +1,12 @@
\name{internals_for_ROptEst_robest}
\alias{internals_for_ROptEst_robest}
-\alias{.rescalefct}
-\alias{.plotRescaledAxis}
-\alias{.legendCoord}
-\alias{.SelectOrderData}
\alias{.dynScopeEval}
+\alias{.constructArg.list}
+\alias{.fix.in.defaults}
+\alias{.pretreat}
+\alias{.check.eps}
+\alias{.isOKsteps}
+\alias{.isOKfsCor}
\title{Internal / Helper functions of package ROptEst for function robest}
Modified: branches/robast-1.3/pkg/ROptEst/man/internal_Cniperplots.Rd
===================================================================
--- branches/robast-1.3/pkg/ROptEst/man/internal_Cniperplots.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/man/internal_Cniperplots.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -15,7 +15,6 @@
\arguments{
\item{data}{data to be plot in}
\item{dots}{list; argument \code{\dots} from the calling function}
- \item{origCl}{call: call from the calling function.}
\item{fun}{function from data to reals; function according to which
the data is ordered}
\item{L2Fam}{ object of class \code{L2ParamFamily} }
Modified: branches/robast-1.3/pkg/ROptEst/man/internals.Rd
===================================================================
--- branches/robast-1.3/pkg/ROptEst/man/internals.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ branches/robast-1.3/pkg/ROptEst/man/internals.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -7,6 +7,7 @@
\alias{.checkPIC}
\alias{.LowerCaseMultivariate}
\alias{.LowerCaseMultivariateTV}
+\alias{.isVirginW}
\alias{.getSB}
\title{Internal / Helper functions of package ROptEst}
Modified: pkg/ROptEst/DESCRIPTION
===================================================================
--- pkg/ROptEst/DESCRIPTION 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/DESCRIPTION 2024-02-03 18:09:52 UTC (rev 1269)
@@ -1,6 +1,6 @@
Package: ROptEst
-Version: 1.3.1
-Date: 2022-11-16
+Version: 1.3.2
+Date: 2024-02-03
Title: Optimally Robust Estimation
Description: Optimally robust estimation in general smoothly parameterized models using S4
classes and methods.
@@ -16,7 +16,7 @@
ByteCompile: yes
License: LGPL-3
URL: http://robast.r-forge.r-project.org/
-Encoding: latin1
+Encoding: UTF-8
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-VCS/SVNRevision: 1238
+VCS/SVNRevision: 1268
Modified: pkg/ROptEst/R/interpolLM.R
===================================================================
--- pkg/ROptEst/R/interpolLM.R 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/R/interpolLM.R 2024-02-03 18:09:52 UTC (rev 1269)
@@ -60,7 +60,7 @@
upper = 1e4, lower = 1e-4, OptOrIter = "iterate",
maxiter = 50, tol = .Machine$double.eps^0.4,
loRad = 0, upRad = Inf, loRad0 = 1e-3,
- loRad.s=0.2, up.Rad.s=1,
+ loRad.s=0.2, upRad.s=1,
withStartLM = TRUE, len = 13
){
wprint <- function(...){ if (withPrint) print(...)}
Modified: pkg/ROptEst/inst/NEWS
===================================================================
--- pkg/ROptEst/inst/NEWS 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/inst/NEWS 2024-02-03 18:09:52 UTC (rev 1269)
@@ -8,6 +8,15 @@
information)
#######################################
+version 1.3.2
+#######################################
+
+under the hood
++ fixed some internal .Rd files
++ moved from latin1 to UTF-8 encoding
+
+
+#######################################
version 1.3.1
#######################################
Modified: pkg/ROptEst/man/0ROptEst-package.Rd
===================================================================
--- pkg/ROptEst/man/0ROptEst-package.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/man/0ROptEst-package.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -1,77 +1,77 @@
-\name{ROptEst-package}
-\alias{ROptEst-package}
-\alias{ROptEst}
-\docType{package}
-\title{
-Optimally robust estimation
-}
-\description{
-Optimally robust estimation in general smoothly parameterized models
-using S4 classes and methods.
-}
-\details{
-\tabular{ll}{
-Package: \tab ROptEst \cr
-Version: \tab 1.3.1 \cr
-Date: \tab 2022-11-16 \cr
-Depends: \tab R(>= 3.4), methods, distr(>= 2.8.0), distrEx(>= 2.8.0), distrMod(>= 2.8.1),RandVar(>= 1.2.0), RobAStBase(>= 1.2.0) \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 https://robast.r-forge.r-project.org/\cr
-VCS/SVNRevision: \tab 1238 \cr
-}
-}
-\author{
-Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de},\cr%
-Matthias Kohl \email{Matthias.Kohl at stamats.de}\cr
-Maintainer: Matthias Kohl \email{matthias.kohl at stamats.de}}
-\references{
- M. Kohl (2005). Numerical Contributions to the Asymptotic Theory of Robustness.
- Dissertation. University of Bayreuth.
- M. Kohl, P. Ruckdeschel, H. Rieder (2010). Infinitesimally Robust Estimation in
- General Smoothly Parametrized Models. Statistical Methods and Application 19(3):333-354.
-}
-\seealso{
-\code{\link[distr:0distr-package]{distr-package}},
-\code{\link[distrEx:0distrEx-package]{distrEx-package}},
-\code{\link[distrMod:0distrMod-package]{distrMod-package}},
-\code{\link[RandVar:0RandVar-package]{RandVar-package}},
-\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}}
-}
-\section{Package versions}{
-Note: The first two numbers of package versions do not necessarily reflect
- package-individual development, but rather are chosen for the
- RobAStXXX family as a whole in order to ease updating "depends"
- information.
-}
-\examples{
-## don't test to reduce check time on CRAN
-\donttest{
-library(ROptEst)
-## Example: Rutherford-Geiger (1910); cf. Feller~(1968), Section VI.7 (a)
-x <- c(rep(0, 57), rep(1, 203), rep(2, 383), rep(3, 525), rep(4, 532),
- rep(5, 408), rep(6, 273), rep(7, 139), rep(8, 45), rep(9, 27),
- rep(10, 10), rep(11, 4), rep(12, 0), rep(13, 1), rep(14, 1))
-## ML-estimate from package distrMod
-MLest <- MLEstimator(x, PoisFamily())
-MLest
-## confidence interval based on CLT
-confint(MLest)
-## compute optimally (w.r.t to MSE) robust estimator (unknown contamination)
-robEst <- roptest(x, PoisFamily(), eps.upper = 0.1, steps = 3)
-estimate(robEst)
-## check influence curve
-pIC(robEst)
-checkIC(pIC(robEst))
-## plot influence curve
-plot(pIC(robEst))
-## confidence interval based on LAN - neglecting bias
-confint(robEst)
-## confidence interval based on LAN - including bias
-confint(robEst, method = symmetricBias())
-}
-}
-\keyword{package}
+\name{ROptEst-package}
+\alias{ROptEst-package}
+\alias{ROptEst}
+\docType{package}
+\title{
+Optimally robust estimation
+}
+\description{
+Optimally robust estimation in general smoothly parameterized models
+using S4 classes and methods.
+}
+\details{
+\tabular{ll}{
+Package: \tab ROptEst \cr
+Version: \tab 1.3.2 \cr
+Date: \tab 2024-02-03 \cr
+Depends: \tab R(>= 3.4), methods, distr(>= 2.8.0), distrEx(>= 2.8.0), distrMod(>= 2.8.1),RandVar(>= 1.2.0), RobAStBase(>= 1.2.0) \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 https://robast.r-forge.r-project.org/\cr
+VCS/SVNRevision: \tab 1268 \cr
+}
+}
+\author{
+Peter Ruckdeschel \email{peter.ruckdeschel at uni-oldenburg.de},\cr%
+Matthias Kohl \email{Matthias.Kohl at stamats.de}\cr
+Maintainer: Matthias Kohl \email{matthias.kohl at stamats.de}}
+\references{
+ M. Kohl (2005). Numerical Contributions to the Asymptotic Theory of Robustness.
+ Dissertation. University of Bayreuth.
+ M. Kohl, P. Ruckdeschel, H. Rieder (2010). Infinitesimally Robust Estimation in
+ General Smoothly Parametrized Models. Statistical Methods and Application 19(3):333-354.
+}
+\seealso{
+\code{\link[distr:0distr-package]{distr-package}},
+\code{\link[distrEx:0distrEx-package]{distrEx-package}},
+\code{\link[distrMod:0distrMod-package]{distrMod-package}},
+\code{\link[RandVar:0RandVar-package]{RandVar-package}},
+\code{\link[RobAStBase:0RobAStBase-package]{RobAStBase-package}}
+}
+\section{Package versions}{
+Note: The first two numbers of package versions do not necessarily reflect
+ package-individual development, but rather are chosen for the
+ RobAStXXX family as a whole in order to ease updating "depends"
+ information.
+}
+\examples{
+## don't test to reduce check time on CRAN
+\donttest{
+library(ROptEst)
+## Example: Rutherford-Geiger (1910); cf. Feller~(1968), Section VI.7 (a)
+x <- c(rep(0, 57), rep(1, 203), rep(2, 383), rep(3, 525), rep(4, 532),
+ rep(5, 408), rep(6, 273), rep(7, 139), rep(8, 45), rep(9, 27),
+ rep(10, 10), rep(11, 4), rep(12, 0), rep(13, 1), rep(14, 1))
+## ML-estimate from package distrMod
+MLest <- MLEstimator(x, PoisFamily())
+MLest
+## confidence interval based on CLT
+confint(MLest)
+## compute optimally (w.r.t to MSE) robust estimator (unknown contamination)
+robEst <- roptest(x, PoisFamily(), eps.upper = 0.1, steps = 3)
+estimate(robEst)
+## check influence curve
+pIC(robEst)
+checkIC(pIC(robEst))
+## plot influence curve
+plot(pIC(robEst))
+## confidence interval based on LAN - neglecting bias
+confint(robEst)
+## confidence interval based on LAN - including bias
+confint(robEst, method = symmetricBias())
+}
+}
+\keyword{package}
Modified: pkg/ROptEst/man/internal-interpolate.Rd
===================================================================
--- pkg/ROptEst/man/internal-interpolate.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/man/internal-interpolate.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -38,12 +38,12 @@
upper = 1e4, lower = 1e-4, OptOrIter = "iterate",
maxiter = 50, tol = .Machine$double.eps^0.4,
loRad = 0, upRad = Inf, loRad0 = 1e-3,
- loRad.s = 0.2, up.Rad.s = 1, withStartLM = TRUE, len = 13)
+ loRad.s = 0.2, upRad.s = 1, withStartLM = TRUE, len = 13)
.saveGridToCSV(Grid, toFileCSV, namPFam, nameInSysdata)
-.readGridFromCSV <- function(fromFileCSV)
+.readGridFromCSV(fromFileCSV)
.generateInterpGrid(thGrid, PFam, toFileCSV = "temp.csv",
getFun = .getLMGrid, ..., modifyfct, nameInSysdata,
@@ -94,7 +94,8 @@
internally set to \code{max(loRad,loRad0)}. }
\item{withStartLM}{ logical of length 1: shall the LM's of the preceding grid
value serve as starting value for the next grid value? }
- \item{withSmooth}{logical of length 1: shall a smoothing spline be used? }
+% should be an arg for .saveGridToRda (in pkg RobAStRDA)
+% \item{withSmooth}{logical of length 1: shall a smoothing spline be used? }
\item{withPrint}{logical of length 1: shall current grid value be printed out? }
\item{thGrid}{numeric; grid values. }
\item{optFct}{function with arguments \code{theta}, \code{PFam},
@@ -157,13 +158,13 @@
\item{.getLMGrid}{A grid (in form of a matrix of x and y-values) pasted
together by \code{cbind}. }
- \code{.saveGridToCSV}{\code{invisible(NULL)}. }
+ \item{.saveGridToCSV}{\code{invisible(NULL)}. }
- \code{.readGridFromCSV}{ a list with the read-in items, i.e.,
+ \item{.readGridFromCSV}{ a list with the read-in items, i.e.,
an item \code{Grid} with the grid, an item \code{namPFam} with the name of
the parametric family, and \code{namInSysdata}, the name of the read in grid. }
- \code{.generateInterpGrid}{\code{invisible(NULL)}. }
+ \item{.generateInterpGrid}{\code{invisible(NULL)}. }
}
\keyword{internal}
\concept{utilities}
Modified: pkg/ROptEst/man/internalRobestHelpers.Rd
===================================================================
--- pkg/ROptEst/man/internalRobestHelpers.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/man/internalRobestHelpers.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -1,10 +1,12 @@
\name{internals_for_ROptEst_robest}
\alias{internals_for_ROptEst_robest}
-\alias{.rescalefct}
-\alias{.plotRescaledAxis}
-\alias{.legendCoord}
-\alias{.SelectOrderData}
\alias{.dynScopeEval}
+\alias{.constructArg.list}
+\alias{.fix.in.defaults}
+\alias{.pretreat}
+\alias{.check.eps}
+\alias{.isOKsteps}
+\alias{.isOKfsCor}
\title{Internal / Helper functions of package ROptEst for function robest}
Modified: pkg/ROptEst/man/internal_Cniperplots.Rd
===================================================================
--- pkg/ROptEst/man/internal_Cniperplots.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/man/internal_Cniperplots.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -15,7 +15,6 @@
\arguments{
\item{data}{data to be plot in}
\item{dots}{list; argument \code{\dots} from the calling function}
- \item{origCl}{call: call from the calling function.}
\item{fun}{function from data to reals; function according to which
the data is ordered}
\item{L2Fam}{ object of class \code{L2ParamFamily} }
Modified: pkg/ROptEst/man/internals.Rd
===================================================================
--- pkg/ROptEst/man/internals.Rd 2024-02-02 07:08:26 UTC (rev 1268)
+++ pkg/ROptEst/man/internals.Rd 2024-02-03 18:09:52 UTC (rev 1269)
@@ -7,6 +7,7 @@
\alias{.checkPIC}
\alias{.LowerCaseMultivariate}
\alias{.LowerCaseMultivariateTV}
+\alias{.isVirginW}
\alias{.getSB}
\title{Internal / Helper functions of package ROptEst}
More information about the Robast-commits
mailing list