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

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

Author: ruckdeschel
Date: 2014-08-05 19:30:44 +0200 (Tue, 05 Aug 2014)
New Revision: 778

Modified:
   branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R
   branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R
   branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R
   branches/robast-1.0/pkg/RobAStBase/R/plotRescaledAxis.R
Log:
[RobAStBase] argh:oversaw some issues with finiteEndpoints

Modified: branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R	2014-08-05 16:55:39 UTC (rev 777)
+++ branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R	2014-08-05 17:30:44 UTC (rev 778)
@@ -268,8 +268,8 @@
                finiteEndpoints[2] <- is.finite(scaleX.inv(max(x.vec1, xlim[2,i])))
             }
             if(scaleY){
-               finiteEndpoints[3] <- is.finite(scaleY.inv(min(y.vec1, ylim[1,i])))
-               finiteEndpoints[4] <- is.finite(scaleY.inv(max(y.vec1, ylim[2,i])))
+               finiteEndpoints[3] <- is.finite(scaleY.inv[[i]](min(y.vec1, ylim[1,i])))
+               finiteEndpoints[4] <- is.finite(scaleY.inv[[i]](max(y.vec1, ylim[2,i])))
             }
             do.call(plot, args=c(list(x=x.vec1, y=y.vec1, type = plty, lty = lty,
                                       xlab = xlab, ylab = ylab), dots))

Modified: branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R	2014-08-05 16:55:39 UTC (rev 777)
+++ branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R	2014-08-05 17:30:44 UTC (rev 778)
@@ -363,8 +363,8 @@
                finiteEndpoints[2] <- is.finite(scaleX.inv(max(x.vec1, xlim[2],na.rm=TRUE)))
             }
             if(scaleY){
-               finiteEndpoints[3] <- is.finite(scaleY.inv(min(ym, ylim[1,i],na.rm=TRUE)))
-               finiteEndpoints[4] <- is.finite(scaleY.inv(max(yM, ylim[2,i],na.rm=TRUE)))
+               finiteEndpoints[3] <- is.finite(scaleY.inv[[i]](min(ym, ylim[1,i],na.rm=TRUE)))
+               finiteEndpoints[4] <- is.finite(scaleY.inv[[i]](max(yM, ylim[2,i],na.rm=TRUE)))
             }
 
             do.call(plot, args=c(list(x = resc1$X, y = y0,

Modified: branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R	2014-08-05 16:55:39 UTC (rev 777)
+++ branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R	2014-08-05 17:30:44 UTC (rev 778)
@@ -480,8 +480,8 @@
                   finiteEndpoints[2] <- is.finite(scaleX.inv(max(resc.C$X, xlim[2],na.rm=TRUE)))
                }
                if(scaleY){
-                  finiteEndpoints[3] <- is.finite(scaleY.inv(min(resc.C$Y, ylim[1,1],na.rm=TRUE)))
-                  finiteEndpoints[4] <- is.finite(scaleY.inv(max(resc.C$Y, ylim[2,1],na.rm=TRUE)))
+                  finiteEndpoints[3] <- is.finite(scaleY.inv[[1]](min(resc.C$Y, ylim[1,1],na.rm=TRUE)))
+                  finiteEndpoints[4] <- is.finite(scaleY.inv[[1]](max(resc.C$Y, ylim[2,1],na.rm=TRUE)))
                }
 
                .plotRescaledAxis(scaleX0, scaleX.fct, scaleX.inv,

Modified: branches/robast-1.0/pkg/RobAStBase/R/plotRescaledAxis.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/plotRescaledAxis.R	2014-08-05 16:55:39 UTC (rev 777)
+++ branches/robast-1.0/pkg/RobAStBase/R/plotRescaledAxis.R	2014-08-05 17:30:44 UTC (rev 778)
@@ -88,8 +88,8 @@
                if(i0){ xf <- c(NA,xf); X <- c(0, X)}
                if(i1){ xf <- c(xf,NA); X <- c(X, 1)}
                axis(1,at=X,labels=xf)
-               if(finiteEndpoints[1]&i0) axis(1,at=0,labels=expression(-infinity))
-               if(finiteEndpoints[2]&i1) axis(1,at=1,labels=expression(infinity))
+               if(!finiteEndpoints[1]&i0) axis(1,at=0,labels=expression(-infinity))
+               if(!finiteEndpoints[2]&i1) axis(1,at=1,labels=expression(infinity))
             }else{
                if(is.null(xlim)){ xlim <- c(-Inf,Inf)}else{
                   if(is.na(xlim[1])) xlim[1] <- -Inf
@@ -138,8 +138,8 @@
                if(i0){ yf <- c(NA,yf); Y <- c(0, Y)}
                if(i1){ yf <- c(yf,NA); Y <- c(Y, 1)}
                axis(2,at=Y,labels=yf)
-               if(finiteEndpoints[3]&i0) axis(2,at=0,labels=expression(-infinity))
-               if(finiteEndpoints[4]&i1) axis(2,at=1,labels=expression(infinity))
+               if(!finiteEndpoints[3]&i0) axis(2,at=0,labels=expression(-infinity))
+               if(!finiteEndpoints[4]&i1) axis(2,at=1,labels=expression(infinity))
             }else{
                if(is.null(ylim)){ ylim <- c(-Inf,Inf)}else{
                   if(is.na(ylim[1])) ylim[1] <- -Inf