[Robast-commits] r719 - branches/robast-1.0/pkg/RobAStBase/R

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2013-11-07 18:03:58 +0100 (Thu, 07 Nov 2013)
New Revision: 719

Modified:
   branches/robast-1.0/pkg/RobAStBase/R/kStepEstimator.R
Log:
Fehler in kStepEstimator behoben: nach Auswertung Startsch?\195?\164tzer muss die IC zun?\195?\164chst erst dorthin geschoben werden -> withPreModif, withPostModif

Modified: branches/robast-1.0/pkg/RobAStBase/R/kStepEstimator.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/kStepEstimator.R	2013-09-23 08:42:45 UTC (rev 718)
+++ branches/robast-1.0/pkg/RobAStBase/R/kStepEstimator.R	2013-11-07 17:03:58 UTC (rev 719)
@@ -103,8 +103,21 @@
 
         ### update - function
         updateStep <- function(u.theta, theta, IC, L2Fam, Param,
-                               withModif = TRUE, with.u.var = FALSE){
+                               withPreModif = FALSE,
+                               withPostModif = TRUE, with.u.var = FALSE
+                               ){
 
+                if(withPreModif){
+                   main(Param)[] <- .deleteDim(u.theta[idx])
+                   if (lnx) nuisance(Param)[] <- .deleteDim(u.theta[nuis.idx])
+#                   print(L2Fam)
+                   L2Fam <- modifyModel(L2Fam, Param,
+                               .withL2derivDistr = L2Fam at .withEvalL2derivDistr)
+#                   print(L2Fam)
+                   IC <- modifyIC(IC)(L2Fam, IC)
+#                   print(IC)
+                }
+
                 IC.c <- as(diag(p) %*% IC at Curve, "EuclRandVariable")
 
 #                print(theta)
@@ -181,7 +194,7 @@
                    }
                 }
 
-                if(withModif){
+                if(withPostModif){
                    main(Param)[] <- .deleteDim(u.theta[idx])
                    if (lnx) nuisance(Param)[] <- .deleteDim(u.theta[nuis.idx])
 #                   print(L2Fam)
@@ -219,9 +232,11 @@
                   L2Fam <- upd$L2Fam
                   Param <- upd$Param
                   tf <- trafo(L2Fam, Param)
-               }
+                  withPre <- FALSE
+               }else withPre <- TRUE
                upd <- updateStep(u.theta,theta,IC, L2Fam, Param,
-                                 withModif = (steps>1) | useLast,
+                                 withPreModif = withPre,
+                                 withPostModif = (steps>i) | useLast,
                                  with.u.var = i==steps)
                uksteps[,i] <- u.theta <- upd$u.theta
                ksteps[,i] <- theta <- upd$theta