[Robast-commits] r687 - branches/robast-0.9/pkg/ROptReg/R

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

Author: kroisand
Date: 2013-09-09 11:18:10 +0200 (Mon, 09 Sep 2013)
New Revision: 687

Modified:
   branches/robast-0.9/pkg/ROptReg/R/AllClass.R
   branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R
   branches/robast-0.9/pkg/ROptReg/R/generateICfct.R
   branches/robast-0.9/pkg/ROptReg/R/weights.R
Log:
offensichtliche Fehler in ROptReg behoben, aber check l?\195?\164uft immer noch nicht durch...

Modified: branches/robast-0.9/pkg/ROptReg/R/AllClass.R
===================================================================
--- branches/robast-0.9/pkg/ROptReg/R/AllClass.R	2013-09-07 03:52:05 UTC (rev 686)
+++ branches/robast-0.9/pkg/ROptReg/R/AllClass.R	2013-09-09 09:18:10 UTC (rev 687)
@@ -80,7 +80,7 @@
                       ErrorL2derivSymm = new("FunSymmList"),
                       ErrorL2derivDistr = UnivarDistrList(Norm()),
                       ErrorL2derivDistrSymm = new("DistrSymmList"),
-                      FisherInfo = new("PosDefSymmMatrix", matrix(1))
+                      FisherInfo = new("PosDefSymmMatrix", matrix(1)),
                       FisherInfo.fct = function(theta)return(new("PosDefSymmMatrix", matrix(1)))
                       ),
             contains = "RegTypeFamily", 
@@ -144,7 +144,7 @@
                       ErrorL2derivSymm = new("FunSymmList"),
                       ErrorL2derivDistr = UnivarDistrList(Norm()),
                       ErrorL2derivDistrSymm = new("DistrSymmList"),
-                      FisherInfo = new("PosDefSymmMatrix", matrix(1))
+                      FisherInfo = new("PosDefSymmMatrix", matrix(1)),
                       FisherInfo.fct = function(theta)return(new("PosDefSymmMatrix", matrix(1)))
                       ),
             contains = "RegTypeFamily",

Modified: branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R
===================================================================
--- branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R	2013-09-07 03:52:05 UTC (rev 686)
+++ branches/robast-0.9/pkg/ROptReg/R/CondTotalVarIC.R	2013-09-09 09:18:10 UTC (rev 687)
@@ -43,23 +43,6 @@
 setMethod("generateIC", signature(neighbor = "CondTotalVarNeighborhood", 
                                   L2Fam = "L2RegTypeFamily"),
     function(neighbor, L2Fam, res){
-        return(CondContIC(
-                name = "conditionally centered IC of contamination type",
-                CallL2Fam = L2call,
-                Curve = generateIC.fct(neighbor, L2Fam, res),
-                clip = b,
-                cent = a,
-                stand = A,
-                lowerCase = d,
-                neighborRadius = neighbor at radius,
-                neighborRadiusCurve = neighbor at radiusCurve,
-                modifyIC = res$modifyIC,
-                normtype = normtype,
-                biastype = biastype,
-                Risks = res$risk,
-                Infos = matrix(res$info, ncol = 2,
-                            dimnames = list(character(0), c("method", "message")))))
-    })
         A <- res$A
         a <- res$a
         b <- res$b
@@ -71,7 +54,7 @@
         L2call$trafo <- trafo(L2Fam)
         return(CondTotalVarIC(
                 name = "conditionally centered IC of contamination type", 
-                CallL2Fam = L2call
+                CallL2Fam = L2call,
                 Curve = generateIC.fct(neighbor, L2Fam, res),
                 clipUp = b,
                 clipLo = a,

Modified: branches/robast-0.9/pkg/ROptReg/R/generateICfct.R
===================================================================
--- branches/robast-0.9/pkg/ROptReg/R/generateICfct.R	2013-09-07 03:52:05 UTC (rev 686)
+++ branches/robast-0.9/pkg/ROptReg/R/generateICfct.R	2013-09-09 09:18:10 UTC (rev 687)
@@ -213,7 +213,7 @@
                 }else{
                     body(ICfct[[1]]) <- substitute(
                                             { L2x <- L2(x[k+1])-z
-                                              ind <- .eq(L2x))
+                                              ind <- .eq(L2x)
                                               D <- matrix(D.vec, ncol = k)
                                               K.inv <- matrix(K.vec, ncol = k)
                                               D %*% K.inv %*% x[1:k]*ifelse(ind, NA, L2x*w(L2x)) },

Modified: branches/robast-0.9/pkg/ROptReg/R/weights.R
===================================================================
--- branches/robast-0.9/pkg/ROptReg/R/weights.R	2013-09-07 03:52:05 UTC (rev 686)
+++ branches/robast-0.9/pkg/ROptReg/R/weights.R	2013-09-09 09:18:10 UTC (rev 687)
@@ -25,7 +25,7 @@
 .fac <- function(norm,D,Kinv){
    if(is(norm,"SelfNorm")||is(norm,"InfoNorm")){
       1/sqrt(nrow(D))
-   }else{ if(norm,"QFNorm"){
+   }else{ if(is(norm,"QFNorm")){
              B <- QuadForm(norm)
              sum(diag(t(D)%*%B%*%D%*%Kinv))^-.5
           }else{