[Distr-commits] r1082 - in branches/distr-2.7/pkg/distr: R inst

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

Author: ruckdeschel
Date: 2016-01-15 17:38:52 +0100 (Fri, 15 Jan 2016)
New Revision: 1082

Modified:
   branches/distr-2.7/pkg/distr/R/plot-methods.R
   branches/distr-2.7/pkg/distr/R/plot-methods_LebDec.R
   branches/distr-2.7/pkg/distr/inst/NEWS
Log:
distr: ported change in trunk to devel

Modified: branches/distr-2.7/pkg/distr/R/plot-methods.R
===================================================================
--- branches/distr-2.7/pkg/distr/R/plot-methods.R	2016-01-15 16:36:56 UTC (rev 1081)
+++ branches/distr-2.7/pkg/distr/R/plot-methods.R	2016-01-15 16:38:52 UTC (rev 1082)
@@ -129,6 +129,7 @@
                                 if(is.call(res)) res <- res[-1]
                                 return(res)}
                                 }else function(x,i){
+                                  if(length(x)==1) return(x[1])
                                   res <- x[i]
                                   if(length(res)==0) return(NULL)
                                   if(is.na(res)) return(NULL)
@@ -495,6 +496,7 @@
                                 if(is.call(res)) res <- res[-1]
                                 return(res)}
                                 }else function(x,i){
+                                  if(length(x)==1) return(x[1])
                                   res <- x[i]
                                   if(length(res)==0) return(NULL)
                                   if(is.na(res)) return(NULL)

Modified: branches/distr-2.7/pkg/distr/R/plot-methods_LebDec.R
===================================================================
--- branches/distr-2.7/pkg/distr/R/plot-methods_LebDec.R	2016-01-15 16:36:56 UTC (rev 1081)
+++ branches/distr-2.7/pkg/distr/R/plot-methods_LebDec.R	2016-01-15 16:38:52 UTC (rev 1082)
@@ -241,11 +241,15 @@
                                 if(is.call(res)) res <- res[-1]
                                 return(res)}
                                 }else function(x,i){
+                                  if(length(x)==1) return(x[1])
                                   res <- x[i]
                                   if(length(res)==0) return(NULL)
                                   if(is.na(res)) return(NULL)
                                   return(res)}
               iL <- 1:length(to.draw)
+              print(to.draw)
+              print(iL[to.draw==1])
+              print(iL[to.draw==2])
               force(lb0)
               .mp3 <- .mp(dlb,iL[to.draw==1])
               if(1%in%to.draw & !is.null(.mp3)) lb0[[1]][["p"]] <- .mp3
@@ -276,8 +280,11 @@
       ylab0.c <- xlab0[[2]]
       ylab0.d <- ylab0[[3]]
       dots$ylab <- NULL
+      cat("\n----------------\nx\n--------------\n")
+      print(xlab0)
+      cat("\n----------------\ny\n--------------\n")
+      print(ylab0)
 
-
      if (hasArg("main")){
          mainL <- TRUE
          if (is.logical(main)){

Modified: branches/distr-2.7/pkg/distr/inst/NEWS
===================================================================
--- branches/distr-2.7/pkg/distr/inst/NEWS	2016-01-15 16:36:56 UTC (rev 1081)
+++ branches/distr-2.7/pkg/distr/inst/NEWS	2016-01-15 16:38:52 UTC (rev 1082)
@@ -54,7 +54,8 @@
 - bug fixes:
   + fixed a bug in plot (q) for LebDec-Distributions (verticals were not plotted correctly)
   + panel selection mechanism had a bug for LebDec-Distributions 
-
+  + fixed axis annotation: if xlab="" or ylab="" the respective lab are "" for all panels
+  
 ##############
 v 2.5.3
 ##############