[Robast-commits] r641 - in branches/robast-0.9/pkg/ROptRegTS: . man tests/Examples
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Mar 22 18:01:22 CET 2013
Author: stamats
Date: 2013-03-22 18:01:22 +0100 (Fri, 22 Mar 2013)
New Revision: 641
Modified:
branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION
branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd
branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd
branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd
branches/robast-0.9/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save
Log:
some minor corrections, preparation for release on CRAN as current version gives warnings
Modified: branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION
===================================================================
--- branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION 2013-03-18 18:16:47 UTC (rev 640)
+++ branches/robast-0.9/pkg/ROptRegTS/DESCRIPTION 2013-03-22 17:01:22 UTC (rev 641)
@@ -1,6 +1,6 @@
Package: ROptRegTS
Version: 0.9
-Date: 2010-12-03
+Date: 2013-03-22
Title: Optimally robust estimation for regression-type models
Description: Optimally robust estimation for regression-type models using S4 classes and
methods
Modified: branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd
===================================================================
--- branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-03-18 18:16:47 UTC (rev 640)
+++ branches/robast-0.9/pkg/ROptRegTS/man/Av1CondTotalVarIC.Rd 2013-03-22 17:01:22 UTC (rev 641)
@@ -14,11 +14,11 @@
\usage{
Av1CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"),
Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}),
- Domain = EuclideanSpace(dimension = 1))),
+ Domain = EuclideanSpace(dimension = 2))),
Risks, Infos, clipUp = Inf, stand = as.matrix(1),
- clipLo = RealRandVariable(Map = list(function(x) {-Inf},
+ clipLo = RealRandVariable(Map = list(function(x) {-Inf}),
Domain = EuclideanSpace(dimension = 1)),
- Domain = EuclideanSpace(dimension = 2)), lowerCase = NULL, neighborRadius = 0)
+ lowerCase = NULL, neighborRadius = 0)
}
\arguments{
\item{name}{ object of class \code{"character"}. }
Modified: branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd
===================================================================
--- branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd 2013-03-18 18:16:47 UTC (rev 640)
+++ branches/robast-0.9/pkg/ROptRegTS/man/CondIC.Rd 2013-03-22 17:01:22 UTC (rev 641)
@@ -7,7 +7,8 @@
}
\usage{
CondIC(name, Curve = EuclRandVarList(EuclRandVariable(Map = list(function(x){x[1] * x[2]}),
- Domain = EuclideanSpace(dimension = 2))),
+ Domain = EuclideanSpace(dimension = 2),
+ Range = Reals())),
Risks, Infos, CallL2Fam = call("L2RegTypeFamily"))
}
\arguments{
Modified: branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd
===================================================================
--- branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-03-18 18:16:47 UTC (rev 640)
+++ branches/robast-0.9/pkg/ROptRegTS/man/CondTotalVarIC.Rd 2013-03-22 17:01:22 UTC (rev 641)
@@ -14,7 +14,7 @@
\usage{
CondTotalVarIC(name, CallL2Fam = call("L2RegTypeFamily"),
Curve = EuclRandVarList(RealRandVariable(Map = list(function(x) {x[1] * x[2]}),
- Domain = EuclideanSpace(dimension = 1))),
+ Domain = EuclideanSpace(dimension = 2))),
Risks, Infos,
clipUp = RealRandVariable(Map = list(function(x) {Inf}), Domain = Reals()),
stand = as.matrix(1),
Modified: branches/robast-0.9/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save
===================================================================
--- branches/robast-0.9/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save 2013-03-18 18:16:47 UTC (rev 640)
+++ branches/robast-0.9/pkg/ROptRegTS/tests/Examples/ROptRegTS-Ex.Rout.save 2013-03-22 17:01:22 UTC (rev 641)
@@ -1,7 +1,8 @@
-R version 2.10.0 beta (2009-10-15 r50107)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R Under development (unstable) (2013-03-13 r62247) -- "Unsuffered Consequences"
+Copyright (C) 2013 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: x86_64-unknown-linux-gnu (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -17,78 +18,13 @@
'help.start()' for an HTML browser interface to help.
Type 'q()' to quit R.
-> ### * <HEADER>
-> ###
-> attach(NULL, name = "CheckExEnv")
-> assign("nameEx",
-+ local({
-+ s <- "__{must remake R-ex/*.R}__"
-+ function(new) {
-+ if(!missing(new)) s <<- new else s
-+ }
-+ }),
-+ pos = "CheckExEnv")
-> ## Add some hooks to label plot pages for base and grid graphics
-> assign("base_plot_hook",
-+ function() {
-+ pp <- par(c("mfg","mfcol","oma","mar"))
-+ if(all(pp$mfg[1:2] == c(1, pp$mfcol[2]))) {
-+ outer <- (oma4 <- pp$oma[4]) > 0; mar4 <- pp$mar[4]
-+ mtext(sprintf("help(\"%s\")", nameEx()), side = 4,
-+ line = if(outer)max(1, oma4 - 1) else min(1, mar4 - 1),
-+ outer = outer, adj = 1, cex = .8, col = "orchid", las=3)
-+ }
-+ },
-+ pos = "CheckExEnv")
-> assign("grid_plot_hook",
-+ function() {
-+ grid::pushViewport(grid::viewport(width=grid::unit(1, "npc") -
-+ grid::unit(1, "lines"), x=0, just="left"))
-+ grid::grid.text(sprintf("help(\"%s\")", nameEx()),
-+ x=grid::unit(1, "npc") + grid::unit(0.5, "lines"),
-+ y=grid::unit(0.8, "npc"), rot=90,
-+ gp=grid::gpar(col="orchid"))
-+ },
-+ pos = "CheckExEnv")
-> setHook("plot.new", get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("persp", get("base_plot_hook", pos = "CheckExEnv"))
-> setHook("grid.newpage", get("grid_plot_hook", pos = "CheckExEnv"))
-> assign("cleanEx",
-+ function(env = .GlobalEnv) {
-+ rm(list = ls(envir = env, all.names = TRUE), envir = env)
-+ RNGkind("default", "default")
-+ set.seed(1)
-+ options(warn = 1)
-+ .CheckExEnv <- as.environment("CheckExEnv")
-+ delayedAssign("T", stop("T used instead of TRUE"),
-+ assign.env = .CheckExEnv)
-+ delayedAssign("F", stop("F used instead of FALSE"),
-+ assign.env = .CheckExEnv)
-+ sch <- search()
-+ newitems <- sch[! sch %in% .oldSearch]
-+ for(item in rev(newitems))
-+ eval(substitute(detach(item), list(item=item)))
-+ missitems <- .oldSearch[! .oldSearch %in% sch]
-+ if(length(missitems))
-+ warning("items ", paste(missitems, collapse=", "),
-+ " have been removed from the search path")
-+ },
-+ pos = "CheckExEnv")
-> assign("ptime", proc.time(), pos = "CheckExEnv")
-> ## at least one package changes these via ps.options(), so do this
-> ## before loading the package.
-> ## Use postscript as incomplete files may be viewable, unlike PDF.
-> ## Choose a size that is close to on-screen devices, fix paper
-> grDevices::ps.options(width = 7, height = 7, paper = "a4", reset = TRUE)
-> grDevices::postscript("ROptRegTS-Ex.ps")
->
-> assign("par.postscript", graphics::par(no.readonly = TRUE), pos = "CheckExEnv")
-> options(contrasts = c(unordered = "contr.treatment", ordered = "contr.poly"))
+> pkgname <- "ROptRegTS"
+> source(file.path(R.home("share"), "R", "examples-header.R"))
> options(warn = 1)
> library('ROptRegTS')
Loading required package: distr
Loading required package: startupmsg
-:startupmsg> Utilities for start-up messages (version 0.7)
+:startupmsg> Utilities for start-up messages (version 0.8)
:startupmsg>
:startupmsg> For more information see ?"startupmsg",
:startupmsg> NEWS("startupmsg")
@@ -96,8 +32,16 @@
Loading required package: sfsmisc
Loading required package: SweaveListingUtils
:SweaveListingUtils> Utilities for Sweave together with
-:SweaveListingUtils> TeX listings package (version 0.4)
+:SweaveListingUtils> TeX listings package (version
+:SweaveListingUtils> 0.6.1)
:SweaveListingUtils>
+:SweaveListingUtils> NOTE: Support for this package
+:SweaveListingUtils> will stop soon.
+:SweaveListingUtils>
+:SweaveListingUtils> Package 'knitr' is providing the
+:SweaveListingUtils> same functionality in a better
+:SweaveListingUtils> way.
+:SweaveListingUtils>
:SweaveListingUtils> Some functions from package 'base'
:SweaveListingUtils> are intentionally masked ---see
:SweaveListingUtils> SweaveListingMASK().
@@ -115,16 +59,14 @@
:SweaveListingUtils> vignette("ExampleSweaveListingUtils").
-Attaching package: 'SweaveListingUtils'
+Attaching package: ‘SweaveListingUtils’
+The following object is masked from ‘package:base’:
- The following object(s) are masked from package:base :
+ library, require
- library,
- require
-
-:distr> Object orientated implementation of distributions (version
-:distr> 2.2)
+:distr> Object oriented implementation of distributions (version
+:distr> 2.4)
:distr>
:distr> Attention: Arithmetics on distribution objects are
:distr> understood as operations on corresponding random variables
@@ -143,31 +85,22 @@
:distr> vignette("distr").
-Attaching package: 'distr'
+Attaching package: ‘distr’
+The following object is masked from ‘package:stats’:
- The following object(s) are masked from package:stats :
+ df, qqplot, sd
- df,
- qqplot,
- sd
-
Loading required package: distrEx
-Loading required package: evd
-Loading required package: actuar
-
-Attaching package: 'actuar'
-
-
- The following object(s) are masked from package:grDevices :
-
- cm
-
-:distrEx> Extensions of package distr (version 2.2)
+:distrEx> Extensions of package distr (version 2.4)
:distrEx>
:distrEx> Note: Packages "e1071", "moments", "fBasics" should be
-:distrEx> attached /before/ package "distrEx". See distrExMASK().
+:distrEx> attached /before/ package "distrEx". See
+:distrEx> distrExMASK().Note: Extreme value distribution
+:distrEx> functionality has been moved to
:distrEx>
+:distrEx> package "RobExtremes". See distrExMOVED().
+:distrEx>
:distrEx> For more information see ?"distrEx", NEWS("distrEx"), as
:distrEx> well as
:distrEx> http://distr.r-forge.r-project.org/
@@ -176,18 +109,14 @@
:distrEx> vignette("distr").
-Attaching package: 'distrEx'
+Attaching package: ‘distrEx’
+The following object is masked from ‘package:stats’:
- The following object(s) are masked from package:stats :
+ IQR, mad, median, var
- IQR,
- mad,
- median,
- var
-
Loading required package: RandVar
-:RandVar> Implementation of random variables (version 0.7)
+:RandVar> Implementation of random variables (version 0.9)
:RandVar>
:RandVar> For more information see ?"RandVar", NEWS("RandVar"), as
:RandVar> well as
@@ -196,18 +125,18 @@
:RandVar> vignette("RandVar").
Loading required package: ROptEstOld
+Loading required package: evd
-Attaching package: 'ROptEstOld'
+Attaching package: ‘ROptEstOld’
+The following object is masked from ‘package:graphics’:
- The following object(s) are masked from package:graphics :
+ clip
- clip
-
>
-> assign(".oldSearch", search(), pos = 'CheckExEnv')
-> assign(".oldNS", loadedNamespaces(), pos = 'CheckExEnv')
-> cleanEx(); nameEx("Av1CondContIC-class")
+> base::assign(".oldSearch", base::search(), pos = 'CheckExEnv')
+> cleanEx()
+> nameEx("Av1CondContIC-class")
> ### * Av1CondContIC-class
>
> flush(stderr()); flush(stdout())
@@ -255,7 +184,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondContIC")
+> cleanEx()
+> nameEx("Av1CondContIC")
> ### * Av1CondContIC
>
> flush(stderr()); flush(stdout())
@@ -295,7 +225,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondContNeighborhood-class")
+> cleanEx()
+> nameEx("Av1CondContNeighborhood-class")
> ### * Av1CondContNeighborhood-class
>
> flush(stderr()); flush(stdout())
@@ -314,7 +245,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondContNeighborhood")
+> cleanEx()
+> nameEx("Av1CondContNeighborhood")
> ### * Av1CondContNeighborhood
>
> flush(stderr()); flush(stdout())
@@ -344,7 +276,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondTotalVarIC-class")
+> cleanEx()
+> nameEx("Av1CondTotalVarIC-class")
> ### * Av1CondTotalVarIC-class
>
> flush(stderr()); flush(stdout())
@@ -392,7 +325,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondTotalVarIC")
+> cleanEx()
+> nameEx("Av1CondTotalVarIC")
> ### * Av1CondTotalVarIC
>
> flush(stderr()); flush(stdout())
@@ -431,7 +365,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondTotalVarNeighborhood-class")
+> cleanEx()
+> nameEx("Av1CondTotalVarNeighborhood-class")
> ### * Av1CondTotalVarNeighborhood-class
>
> flush(stderr()); flush(stdout())
@@ -450,7 +385,8 @@
>
>
>
-> cleanEx(); nameEx("Av1CondTotalVarNeighborhood")
+> cleanEx()
+> nameEx("Av1CondTotalVarNeighborhood")
> ### * Av1CondTotalVarNeighborhood
>
> flush(stderr()); flush(stdout())
@@ -480,7 +416,8 @@
>
>
>
-> cleanEx(); nameEx("Av2CondContIC-class")
+> cleanEx()
+> nameEx("Av2CondContIC-class")
> ### * Av2CondContIC-class
>
> flush(stderr()); flush(stdout())
@@ -522,7 +459,8 @@
>
>
>
-> cleanEx(); nameEx("Av2CondContIC")
+> cleanEx()
+> nameEx("Av2CondContIC")
> ### * Av2CondContIC
>
> flush(stderr()); flush(stdout())
@@ -556,7 +494,8 @@
>
>
>
-> cleanEx(); nameEx("Av2CondContNeighborhood-class")
+> cleanEx()
+> nameEx("Av2CondContNeighborhood-class")
> ### * Av2CondContNeighborhood-class
>
> flush(stderr()); flush(stdout())
@@ -575,7 +514,8 @@
>
>
>
-> cleanEx(); nameEx("Av2CondContNeighborhood")
+> cleanEx()
+> nameEx("Av2CondContNeighborhood")
> ### * Av2CondContNeighborhood
>
> flush(stderr()); flush(stdout())
@@ -605,7 +545,8 @@
>
>
>
-> cleanEx(); nameEx("CondContIC-class")
+> cleanEx()
+> nameEx("CondContIC-class")
> ### * CondContIC-class
>
> flush(stderr()); flush(stdout())
@@ -657,7 +598,8 @@
>
>
>
-> cleanEx(); nameEx("CondContIC")
+> cleanEx()
+> nameEx("CondContIC")
> ### * CondContIC
>
> flush(stderr()); flush(stdout())
@@ -700,7 +642,8 @@
>
>
>
-> cleanEx(); nameEx("CondContNeighborhood-class")
+> cleanEx()
+> nameEx("CondContNeighborhood-class")
> ### * CondContNeighborhood-class
>
> flush(stderr()); flush(stdout())
@@ -719,7 +662,8 @@
>
>
>
-> cleanEx(); nameEx("CondContNeighborhood")
+> cleanEx()
+> nameEx("CondContNeighborhood")
> ### * CondContNeighborhood
>
> flush(stderr()); flush(stdout())
@@ -749,7 +693,8 @@
>
>
>
-> cleanEx(); nameEx("CondIC-class")
+> cleanEx()
+> nameEx("CondIC-class")
> ### * CondIC-class
>
> flush(stderr()); flush(stdout())
@@ -779,7 +724,8 @@
>
>
>
-> cleanEx(); nameEx("CondIC")
+> cleanEx()
+> nameEx("CondIC")
> ### * CondIC
>
> flush(stderr()); flush(stdout())
@@ -836,7 +782,8 @@
>
>
>
-> cleanEx(); nameEx("CondTotalVarIC-class")
+> cleanEx()
+> nameEx("CondTotalVarIC-class")
> ### * CondTotalVarIC-class
>
> flush(stderr()); flush(stdout())
@@ -888,7 +835,8 @@
>
>
>
-> cleanEx(); nameEx("CondTotalVarIC")
+> cleanEx()
+> nameEx("CondTotalVarIC")
> ### * CondTotalVarIC
>
> flush(stderr()); flush(stdout())
@@ -930,7 +878,8 @@
>
>
>
-> cleanEx(); nameEx("CondTotalVarNeighborhood-class")
+> cleanEx()
+> nameEx("CondTotalVarNeighborhood-class")
> ### * CondTotalVarNeighborhood-class
>
> flush(stderr()); flush(stdout())
@@ -949,7 +898,8 @@
>
>
>
-> cleanEx(); nameEx("CondTotalVarNeighborhood")
+> cleanEx()
+> nameEx("CondTotalVarNeighborhood")
> ### * CondTotalVarNeighborhood
>
> flush(stderr()); flush(stdout())
@@ -979,7 +929,8 @@
>
>
>
-> cleanEx(); nameEx("FixRobRegTypeModel-class")
+> cleanEx()
+> nameEx("FixRobRegTypeModel-class")
> ### * FixRobRegTypeModel-class
>
> flush(stderr()); flush(stdout())
@@ -1015,7 +966,8 @@
>
>
>
-> cleanEx(); nameEx("FixRobRegTypeModel")
+> cleanEx()
+> nameEx("FixRobRegTypeModel")
> ### * FixRobRegTypeModel
>
> flush(stderr()); flush(stdout())
@@ -1059,7 +1011,8 @@
>
>
>
-> cleanEx(); nameEx("InfRobRegTypeModel-class")
+> cleanEx()
+> nameEx("InfRobRegTypeModel-class")
> ### * InfRobRegTypeModel-class
>
> flush(stderr()); flush(stdout())
@@ -1095,7 +1048,8 @@
>
>
>
-> cleanEx(); nameEx("InfRobRegTypeModel")
+> cleanEx()
+> nameEx("InfRobRegTypeModel")
> ### * InfRobRegTypeModel
>
> flush(stderr()); flush(stdout())
@@ -1139,7 +1093,8 @@
>
>
>
-> cleanEx(); nameEx("L2RegTypeFamily-class")
+> cleanEx()
+> nameEx("L2RegTypeFamily-class")
> ### * L2RegTypeFamily-class
>
> flush(stderr()); flush(stdout())
@@ -1180,7 +1135,8 @@
>
>
>
-> cleanEx(); nameEx("L2RegTypeFamily")
+> cleanEx()
+> nameEx("L2RegTypeFamily")
> ### * L2RegTypeFamily
>
> flush(stderr()); flush(stdout())
@@ -1210,7 +1166,8 @@
>
>
>
-> cleanEx(); nameEx("NormLinRegFamily")
+> cleanEx()
+> nameEx("NormLinRegFamily")
> ### * NormLinRegFamily
>
> flush(stderr()); flush(stdout())
@@ -1248,10 +1205,10 @@
{
as.vector(x[1:1L] * (x[1L + 1] - x[1:1L] %*% 0))
}
-<environment: 0x7659740>
+<environment: 0xa6549e0>
> FisherInfo(LM1)
-An object of class “PosDefSymmMatrix”
+An object of class "PosDefSymmMatrix"
[,1]
[1,] 1
> checkL2deriv(LM1)
@@ -1264,7 +1221,8 @@
>
>
>
-> cleanEx(); nameEx("NormLinRegInterceptFamily")
+> cleanEx()
+> nameEx("NormLinRegInterceptFamily")
> ### * NormLinRegInterceptFamily
>
> flush(stderr()); flush(stdout())
@@ -1303,10 +1261,10 @@
{
as.vector(x[1:1L] * (x[1L + 1] - x[1:1L] %*% 0 - 0))
}
-<environment: 0x8955730>
+<environment: 0xa4c53f8>
> FisherInfo(LM1)
-An object of class “PosDefSymmMatrix”
+An object of class "PosDefSymmMatrix"
[,1] [,2]
[1,] 1 0
[2,] 0 1
@@ -1321,7 +1279,8 @@
>
>
>
-> cleanEx(); nameEx("NormLinRegScaleFamily")
+> cleanEx()
+> nameEx("NormLinRegScaleFamily")
> ### * NormLinRegScaleFamily
>
> flush(stderr()); flush(stdout())
@@ -1360,10 +1319,10 @@
{
as.vector(x[1:1L] * (x[1L + 1] - x[1:1L] %*% 0)/1^2)
}
-<environment: 0x82c23c0>
+<environment: 0xaa67150>
> FisherInfo(LM1)
-An object of class “PosDefSymmMatrix”
+An object of class "PosDefSymmMatrix"
[,1] [,2]
[1,] 1 0
[2,] 0 2
@@ -1378,7 +1337,8 @@
>
>
>
-> cleanEx(); nameEx("RegTypeFamily-class")
+> cleanEx()
+> nameEx("RegTypeFamily-class")
> ### * RegTypeFamily-class
>
> flush(stderr()); flush(stdout())
@@ -1412,7 +1372,8 @@
>
>
>
-> cleanEx(); nameEx("RegTypeFamily")
+> cleanEx()
+> nameEx("RegTypeFamily")
> ### * RegTypeFamily
>
> flush(stderr()); flush(stdout())
@@ -1444,8 +1405,8 @@
>
> ### * <FOOTER>
> ###
-> cat("Time elapsed: ", proc.time() - get("ptime", pos = 'CheckExEnv'),"\n")
-Time elapsed: 25.401 0.148 26.231 0 0
+> base::cat("Time elapsed: ", proc.time() - base::get("ptime", pos = 'CheckExEnv'),"\n")
+Time elapsed: 21.925 0.108 22.113 0 0
> grDevices::dev.off()
null device
1
More information about the Robast-commits
mailing list