[Robast-commits] r325 - branches/robast-0.7/pkg/RobAStBase/R

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

Author: stamats
Date: 2009-07-15 16:24:08 +0200 (Wed, 15 Jul 2009)
New Revision: 325

Modified:
   branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R
Log:
minor bugs corrected - seems to work now, but code has some fragile points ...

Modified: branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R	2009-07-15 11:45:40 UTC (rev 324)
+++ branches/robast-0.7/pkg/RobAStBase/R/infoPlot.R	2009-07-15 14:24:08 UTC (rev 325)
@@ -25,9 +25,9 @@
         dimm <- length(L2Fam at param)
         
         to.draw <- 1:(dims+1)
-        dimnms  <- c(rownames(trafO))
+        dimnms <- rownames(trafO)
         if(is.null(dimnms))
-           dimnms <- paste("dim",1:dims,sep="")
+           dimnms <- names(main(L2Fam at param))# paste("dim",1:dims,sep="")
         pdimnms <- c("Abs",dimnms)
         if(! is.null(to.draw.arg)){
             if(is.character(to.draw.arg)) 
@@ -40,7 +40,7 @@
         dims0 <- length(to.draw1)
         nrows <- trunc(sqrt(dims0))
         ncols <- ceiling(dims0/nrows)
-        in1to.draw   <- (1%in%to.draw)
+        in1to.draw <- (1%in%to.draw)
 
         if(missing(legend.location)){
            legend.location <- distr:::.fillList(list("topright"), dims0+in1to.draw   )
@@ -180,10 +180,10 @@
             }else{if(any(is.na(inner))||any(!inner)) {
                      innerT <- as.list(rep("",1+dims)); innerL <- FALSE
                 }else{innerL <- TRUE
-                      tnm  <- c(rownames(trafO))
+                      tnm  <- rownames(trafO)
                       tnms <- if(is.null(tnm)) paste(1:dims) else 
                                                paste("'", tnm, "'", sep = "") 
-                      innerT <- as.list(paste(c( paste(gettext("Absolute information of (partial) IC for"), 
+                      innerT <- as.list(paste(c( paste(gettext("Absolute information of (partial) IC for "), 
                                        name(L2Fam)[1], sep =""),
                                    paste(gettext("Relative information of \ncomponent "),
                                        tnms, 
@@ -193,7 +193,7 @@
               }
 
 
-            QFc <- diag(dimm)
+            QFc <- diag(dims)
             if(is(object,"ContIC") & dims>1 )
                {if (is(normtype(object),"QFNorm")) QFc <- QuadForm(normtype(object))
                 QFc0 <- solve( trafo %*% solve(L2Fam at FisherInfo) %*% t(trafo ))
@@ -206,12 +206,12 @@
             absInfoClass <- t(classIC) %*% QFc %*% classIC
             absInfoClass <- sapply(x.vec, absInfoClass at Map[[1]])
 
-            QF <- diag(dimm)
+            QF <- diag(dims)
             if(is(object,"ContIC") & dims>1 )
                {if (is(normtype(object),"QFNorm")) QF <- QuadForm(normtype(object))}
             QF.5 <- sqrt(PosSemDefSymmMatrix(QF))
 
-            IC1 <- as(diag(dimm) %*% object at Curve, "EuclRandVariable")
+            IC1 <- as(diag(dims) %*% object at Curve, "EuclRandVariable")
             absInfo <- t(IC1) %*% QF %*% IC1
             absInfo <- sapply(x.vec, absInfo at Map[[1]])