[Robast-commits] r201 - pkg/RobAStBase/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Nov 3 07:30:32 CET 2008
Author: stamats
Date: 2008-11-03 07:30:31 +0100 (Mon, 03 Nov 2008)
New Revision: 201
Modified:
pkg/RobAStBase/R/kStepEstimator.R
pkg/RobAStBase/R/oneStepEstimator.R
Log:
minor modification to keep name of parameter
Modified: pkg/RobAStBase/R/kStepEstimator.R
===================================================================
--- pkg/RobAStBase/R/kStepEstimator.R 2008-10-31 12:30:18 UTC (rev 200)
+++ pkg/RobAStBase/R/kStepEstimator.R 2008-11-03 06:30:31 UTC (rev 201)
@@ -29,7 +29,7 @@
if(steps == 1){
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -76,7 +76,7 @@
start <- res
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- start
+ main(newParam)[] <- start
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
res <- start + rowMeans(evalIC(IC, as.matrix(x)), na.rm = TRUE)
@@ -84,7 +84,7 @@
if(useLast){
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -151,7 +151,7 @@
if(steps == 1){
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -198,7 +198,7 @@
start <- res
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- start
+ main(newParam)[] <- start
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
res <- start + rowMeans(evalIC(IC, x), na.rm = TRUE)
@@ -206,7 +206,7 @@
if(useLast){
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -271,7 +271,7 @@
if(steps == 1){
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -318,7 +318,7 @@
start0 <- res
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- start0
+ main(newParam)[] <- start0
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
res <- start0 + rowMeans(evalIC(IC, as.matrix(x)), na.rm = TRUE)
@@ -326,7 +326,7 @@
if(useLast){
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -393,7 +393,7 @@
if(steps == 1){
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
@@ -440,7 +440,7 @@
start0 <- res
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- start0
+ main(newParam)[] <- start0
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
res <- start0 + rowMeans(evalIC(IC, x), na.rm = TRUE)
@@ -448,7 +448,7 @@
if(useLast){
newL2Fam <- eval(CallL2Fam(IC))
newParam <- param(newL2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(newL2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("kStepEstimator",
Modified: pkg/RobAStBase/R/oneStepEstimator.R
===================================================================
--- pkg/RobAStBase/R/oneStepEstimator.R 2008-10-31 12:30:18 UTC (rev 200)
+++ pkg/RobAStBase/R/oneStepEstimator.R 2008-11-03 06:30:31 UTC (rev 201)
@@ -23,7 +23,7 @@
if(is(L2Fam, "L2GroupParamFamily")) useLast <- TRUE
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("oneStepEstimator",
@@ -94,7 +94,7 @@
if(is(L2Fam, "L2GroupParamFamily")) useLast <- TRUE
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("oneStepEstimator",
@@ -164,7 +164,7 @@
if(is(L2Fam, "L2GroupParamFamily")) useLast <- TRUE
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("oneStepEstimator",
@@ -236,7 +236,7 @@
if(is(L2Fam, "L2GroupParamFamily")) useLast <- TRUE
if(useLast && !is(modifyIC(IC), "NULL") ){
newParam <- param(L2Fam)
- main(newParam) <- res
+ main(newParam)[] <- res
newL2Fam <- modifyModel(L2Fam, newParam)
IC <- modifyIC(IC)(newL2Fam, IC)
Infos <- rbind(Infos, c("oneStepEstimator",
More information about the Robast-commits
mailing list