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

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

Author: ruckdeschel
Date: 2013-09-18 12:24:46 +0200 (Wed, 18 Sep 2013)
New Revision: 715

Modified:
   branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R
   branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R
   pkg/ROptEst/DESCRIPTION
   pkg/ROptEst/R/plotWrapper.R
   pkg/RobAStBase/DESCRIPTION
   pkg/RobAStBase/R/plotWrapper.R
Log:
fixed two bugs in plotWrapper.R in pkgs RobAStBase and ROptEst detected by Misha

Modified: branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R
===================================================================
--- branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R	2013-09-14 12:22:48 UTC (rev 714)
+++ branches/robast-1.0/pkg/ROptEst/R/plotWrapper.R	2013-09-18 10:24:46 UTC (rev 715)
@@ -105,7 +105,7 @@
                    ,ylab=substitute("Asymptotic Risk difference (classic - robust)")
                    ,bty = substitute("o")
                    ), scaleList)
-  print(argsList)
+#  print(argsList)
   ##parameter for plotting
   if(mc$with.legend)
   {
@@ -119,7 +119,7 @@
   }
 
   args <- .merge.lists(argsList, dots)
-  print(args)
+#  print(args)
   ###
   ### 3. build up the call but grab it and write it into an object
   ###

Modified: branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R
===================================================================
--- branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R	2013-09-14 12:22:48 UTC (rev 714)
+++ branches/robast-1.0/pkg/RobAStBase/R/plotWrapper.R	2013-09-18 10:24:46 UTC (rev 715)
@@ -308,7 +308,7 @@
                      ,panel.first= substitute(grid())
                      ,col = substitute("blue")
     ), scaleList)
-  if(missing(y)){c(argsList, y = substitute(y)
+  if(!missing(y)){c(argsList, y = substitute(y)
                      ,cex.pts = substitute(0.3)
                      ,col.pts = substitute(addAlphTrsp2col(rgb(0,255,0,maxColorValue=255), substitute(alpha.trsp)))
                      ,pch.pts = substitute(19)

Modified: pkg/ROptEst/DESCRIPTION
===================================================================
--- pkg/ROptEst/DESCRIPTION	2013-09-14 12:22:48 UTC (rev 714)
+++ pkg/ROptEst/DESCRIPTION	2013-09-18 10:24:46 UTC (rev 715)
@@ -1,5 +1,5 @@
 Package: ROptEst
-Version: 0.9
+Version: 0.9.1
 Date: 2013-09-11
 Title: Optimally robust estimation
 Description: Optimally robust estimation in general smoothly parameterized models using S4 classes and methods.

Modified: pkg/ROptEst/R/plotWrapper.R
===================================================================
--- pkg/ROptEst/R/plotWrapper.R	2013-09-14 12:22:48 UTC (rev 714)
+++ pkg/ROptEst/R/plotWrapper.R	2013-09-18 10:24:46 UTC (rev 715)
@@ -105,7 +105,7 @@
                    ,ylab=substitute("Asymptotic Risk difference (classic - robust)")
                    ,bty = substitute("o")
                    ), scaleList)
-  print(argsList)
+#  print(argsList)
   ##parameter for plotting
   if(mc$with.legend)
   {
@@ -119,7 +119,7 @@
   }
 
   args <- .merge.lists(argsList, dots)
-  print(args)
+#  print(args)
   ###
   ### 3. build up the call but grab it and write it into an object
   ###

Modified: pkg/RobAStBase/DESCRIPTION
===================================================================
--- pkg/RobAStBase/DESCRIPTION	2013-09-14 12:22:48 UTC (rev 714)
+++ pkg/RobAStBase/DESCRIPTION	2013-09-18 10:24:46 UTC (rev 715)
@@ -1,5 +1,5 @@
 Package: RobAStBase
-Version: 0.9
+Version: 0.9.1
 Date: 2013-09-11
 Title: Robust Asymptotic Statistics
 Description: Base S4-classes and functions for robust asymptotic statistics.

Modified: pkg/RobAStBase/R/plotWrapper.R
===================================================================
--- pkg/RobAStBase/R/plotWrapper.R	2013-09-14 12:22:48 UTC (rev 714)
+++ pkg/RobAStBase/R/plotWrapper.R	2013-09-18 10:24:46 UTC (rev 715)
@@ -308,7 +308,7 @@
                      ,panel.first= substitute(grid())
                      ,col = substitute("blue")
     ), scaleList)
-  if(missing(y)){c(argsList, y = substitute(y)
+  if(!missing(y)){c(argsList, y = substitute(y)
                      ,cex.pts = substitute(0.3)
                      ,col.pts = substitute(addAlphTrsp2col(rgb(0,255,0,maxColorValue=255), substitute(alpha.trsp)))
                      ,pch.pts = substitute(19)