[Robast-commits] r1135 - in branches/robast-1.2/pkg/RobLox: . R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Aug 12 17:58:23 CEST 2018
Author: ruckdeschel
Date: 2018-08-12 17:58:23 +0200 (Sun, 12 Aug 2018)
New Revision: 1135
Modified:
branches/robast-1.2/pkg/RobLox/DESCRIPTION
branches/robast-1.2/pkg/RobLox/R/rlOptIC.R
branches/robast-1.2/pkg/RobLox/R/rlsOptIC_AL.R
branches/robast-1.2/pkg/RobLox/R/roblox.R
branches/robast-1.2/pkg/RobLox/R/rsOptIC.R
Log:
[RobLox] branch 2.8:
the modifyIC and makeIC methods gain "..."
Modified: branches/robast-1.2/pkg/RobLox/DESCRIPTION
===================================================================
--- branches/robast-1.2/pkg/RobLox/DESCRIPTION 2018-08-12 15:57:02 UTC (rev 1134)
+++ branches/robast-1.2/pkg/RobLox/DESCRIPTION 2018-08-12 15:58:23 UTC (rev 1135)
@@ -4,8 +4,8 @@
Title: Optimally Robust Influence Curves and Estimators for Location and Scale
Description: Functions for the determination of optimally robust influence curves and
estimators in case of normal location and/or scale.
-Depends: R(>= 2.14.0), stats, distrMod(>= 2.5.2), RobAStBase(>= 0.9)
-Imports: methods, lattice, RColorBrewer, Biobase, RandVar(>= 0.9.2), distr(>= 2.5.2)
+Depends: R(>= 2.14.0), stats, distrMod(>= 2.8.0), RobAStBase(>= 1.2.0)
+Imports: methods, lattice, RColorBrewer, Biobase, RandVar(>= 1.1.0), distr(>= 2.8.0)
Suggests: MASS
Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"),
email="Matthias.Kohl at stamats.de"), person("Peter", "Ruckdeschel", role=c("aut",
Modified: branches/robast-1.2/pkg/RobLox/R/rlOptIC.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/R/rlOptIC.R 2018-08-12 15:57:02 UTC (rev 1134)
+++ branches/robast-1.2/pkg/RobLox/R/rlOptIC.R 2018-08-12 15:58:23 UTC (rev 1135)
@@ -18,12 +18,12 @@
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
if(is(L2Fam, "L2LocationFamily") && is(distribution(L2Fam), "Norm")){
CallL2Fam(IC) <- L2Fam at fam.call
return(IC)
}else{
- makeIC(IC, L2Fam)
+ makeIC(IC, L2Fam, ...)
}
}
Modified: branches/robast-1.2/pkg/RobLox/R/rlsOptIC_AL.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/R/rlsOptIC_AL.R 2018-08-12 15:57:02 UTC (rev 1134)
+++ branches/robast-1.2/pkg/RobLox/R/rlsOptIC_AL.R 2018-08-12 15:58:23 UTC (rev 1135)
@@ -157,7 +157,7 @@
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2LocationScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)[2]
@@ -191,7 +191,7 @@
}
return(IC)
}else{
- makeIC(IC, L2Fam)
+ makeIC(IC, L2Fam, ...)
}
}
Modified: branches/robast-1.2/pkg/RobLox/R/roblox.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/R/roblox.R 2018-08-12 15:57:02 UTC (rev 1134)
+++ branches/robast-1.2/pkg/RobLox/R/roblox.R 2018-08-12 15:58:23 UTC (rev 1135)
@@ -362,7 +362,7 @@
biastype = symmetricBias(),
normW = NormType())
mse <- robEst$A1 + robEst$A2
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2LocationScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)[2]
@@ -397,7 +397,7 @@
}
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormLocationScaleFamily(mean = m1, sd = s1),
@@ -491,7 +491,7 @@
biastype = symmetricBias(),
normW = NormType())
mse <- robEst$A1 + robEst$A2
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2LocationScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)[2]
@@ -526,7 +526,7 @@
}
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormLocationScaleFamily(mean = m1, sd = s1),
@@ -601,14 +601,14 @@
weight(w) <- getweight(w, neighbor = ContNeighborhood(radius = r),
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
if(is(L2Fam, "L2LocationFamily") && is(distribution(L2Fam), "Norm")){
CallL2New <- call("NormLocationFamily",
mean = main(L2Fam))
CallL2Fam(IC) <- CallL2New
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormLocationFamily(mean = m1, sd = s1),
@@ -690,14 +690,14 @@
weight(w) <- getweight(w, neighbor = ContNeighborhood(radius = r),
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
if(is(L2Fam, "L2LocationFamily") && is(distribution(L2Fam), "Norm")){
CallL2New <- call("NormLocationFamily",
mean = main(L2Fam))
CallL2Fam(IC) <- CallL2New
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormLocationFamily(mean = m1, sd = s1),
@@ -777,7 +777,7 @@
weight(w) <- getweight(w, neighbor = ContNeighborhood(radius = r),
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2ScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)
@@ -805,7 +805,7 @@
}
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormScaleFamily(mean = m1, sd = s1),
@@ -890,7 +890,7 @@
weight(w) <- getweight(w, neighbor = ContNeighborhood(radius = r),
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2ScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)
@@ -918,7 +918,7 @@
}
return(IC)
}else{
- makeIC(L2Fam, IC)
+ makeIC(L2Fam, IC, ...)
}
}
L2Fam <- substitute(NormScaleFamily(mean = m1, sd = s1),
Modified: branches/robast-1.2/pkg/RobLox/R/rsOptIC.R
===================================================================
--- branches/robast-1.2/pkg/RobLox/R/rsOptIC.R 2018-08-12 15:57:02 UTC (rev 1134)
+++ branches/robast-1.2/pkg/RobLox/R/rsOptIC.R 2018-08-12 15:58:23 UTC (rev 1135)
@@ -70,7 +70,7 @@
biastype = symmetricBias(),
normW = NormType())
- modIC <- function(L2Fam, IC, withMakeIC){
+ modIC <- function(L2Fam, IC, withMakeIC, ...){
ICL2Fam <- eval(CallL2Fam(IC))
if(is(L2Fam, "L2ScaleFamily") && is(distribution(L2Fam), "Norm")){
sdneu <- main(L2Fam)
@@ -97,7 +97,7 @@
}
return(IC)
}else{
- makeIC(IC, L2Fam)
+ makeIC(IC, L2Fam, ...)
}
}
More information about the Robast-commits
mailing list