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

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

Author: ruckdeschel
Date: 2014-08-04 13:17:13 +0200 (Mon, 04 Aug 2014)
New Revision: 775

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
Log:
[RobAStBase] comparePlot, infoPlot, and the plot-Method for ICs now if scaleX == TRUE by default use an equidistant grid on the rescaled x-Axis.

Modified: branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R	2014-08-01 18:11:23 UTC (rev 774)
+++ branches/robast-1.0/pkg/RobAStBase/R/AllPlot.R	2014-08-04 11:17:13 UTC (rev 775)
@@ -84,8 +84,16 @@
                   upper <- max(upper,xM)
                 }
                 h <- upper - lower
-                if(is.null(x.vec))
-                   x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+                if(is.null(x.vec)){
+                   if(scaleX){
+                      xpl <- scaleX.fct(lower - 0.1*h)
+                      xpu <- scaleX.fct(upper + 0.1*h)
+                      xp.vec <- seq(from = xpl, to = xpu, length = 1000)
+                      x.vec <- scaleX.inv(xp.vec)
+                   }else{
+                      x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+                   }
+                }
                 plty <- "l"
                 lty <- "solid"
             }else{

Modified: branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R	2014-08-01 18:11:23 UTC (rev 774)
+++ branches/robast-1.0/pkg/RobAStBase/R/comparePlot.R	2014-08-04 11:17:13 UTC (rev 775)
@@ -112,8 +112,16 @@
                upper <- max(upper,xM)
             }
             h <- upper - lower
-            if(is.null(x.vec))
-               x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+            if(is.null(x.vec)){
+               if(scaleX){
+                  xpl <- scaleX.fct(lower - 0.1*h)
+                  xpu <- scaleX.fct(upper + 0.1*h)
+                  xp.vec <- seq(from = xpl, to = xpu, length = 1000)
+                  x.vec <- scaleX.inv(xp.vec)
+               }else{
+                  x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+               }
+            }
             plty <- "l"
             if(missing(lty)) lty <- "solid"
         }else{

Modified: branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R	2014-08-01 18:11:23 UTC (rev 774)
+++ branches/robast-1.0/pkg/RobAStBase/R/infoPlot.R	2014-08-04 11:17:13 UTC (rev 775)
@@ -108,8 +108,16 @@
                   upper <- max(upper,xM)
                 }
                 h <- upper - lower
-                if(is.null(x.vec))
-                   x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+                if(is.null(x.vec)){
+                   if(scaleX){
+                      xpl <- scaleX.fct(lower - 0.1*h)
+                      xpu <- scaleX.fct(upper + 0.1*h)
+                      xp.vec <- seq(from = xpl, to = xpu, length = 1000)
+                      x.vec <- scaleX.inv(xp.vec)
+                   }else{
+                      x.vec <- seq(from = lower - 0.1*h, to = upper + 0.1*h, length = 1000)
+                   }
+                }
                 plty <- "l"
                 if(missing(lty)) lty <- "solid"
             }else{