[Robast-commits] r609 - branches/robast-0.9/pkg/ROptEst/R

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

Author: ruckdeschel
Date: 2013-02-16 15:36:01 +0100 (Sat, 16 Feb 2013)
New Revision: 609

Modified:
   branches/robast-0.9/pkg/ROptEst/R/getStartIC.R
Log:
ROptEst: getStartIC.R cleaned up (deleted unnecessary diagnostic prints which were commented out anyway) and skipped unnecessary steps when dealing with MBRE

Modified: branches/robast-0.9/pkg/ROptEst/R/getStartIC.R
===================================================================
--- branches/robast-0.9/pkg/ROptEst/R/getStartIC.R	2013-02-16 14:26:32 UTC (rev 608)
+++ branches/robast-0.9/pkg/ROptEst/R/getStartIC.R	2013-02-16 14:36:01 UTC (rev 609)
@@ -48,13 +48,10 @@
         }
     }else{
         neighbor at radius <- eps$sqn * fsCor * eps$e
-#        print(neighbor)
         infMod <- InfRobModel(center = model, neighbor = neighbor)
         arg.optic <- c(list(model = infMod, risk = risk),
                            dots.optic)
         if(..debug) print(c(arg.optic=arg.optic))
-#        print(arg.optic)
-#        print("----------------------------------------------------")
         ICstart <- do.call(optIC, args = arg.optic, envir=parent.frame(2))
     }
   return(ICstart)
@@ -72,14 +69,6 @@
            function(model, risk, ..., ..debug=FALSE){
     mc <- match.call(expand.dots=FALSE, call = sys.call(sys.parent(1)))
     dots <- as.list(mc$"...")
-    if("fsCor" %in% names(dots)){
-        fsCor <- eval(dots[["fsCor"]])
-        dots$fsCor <- NULL
-    }else fsCor <- 1
-    if("eps" %in% names(dots)){
-       eps <- dots[["eps"]]
-       dots$eps <- NULL
-    }else eps <- NULL
     if("neighbor" %in% names(dots)){
        neighbor <- eval(dots[["neighbor"]])
        dots$neighbor <- NULL
@@ -103,15 +92,9 @@
     sng <- try(getFromNamespace(.versionSuff(gridn), ns = "RobExtremes"),
                                  silent=TRUE)
     if(!is(sng,"try-error")) nsng <- names(sng)
-    #print(.versionSuff(gridn))
     if(length(nsng)){
        if(nam %in% nsng){
           interpolfct <- sng[[nam]]$fct
-          #print(xi)
-          #print(beta)
-          #print(head(sng[[nam]]$grid))
-          #print(xi)
-          #print(beta)
           .modifyIC <- function(L2Fam, IC){
                    para <- param(L2Fam)
                    xi0 <- main(para)["shape"]#[scaleshapename(L2Fam)["scale"]]