[Distr-commits] r1212 - branches/distr-2.8/pkg/distrMod/R

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

Author: ruckdeschel
Date: 2018-07-23 20:41:56 +0200 (Mon, 23 Jul 2018)
New Revision: 1212

Modified:
   branches/distr-2.8/pkg/distrMod/R/returnlevelplot.R
Log:
[distrMod] branch 2.8 bugfix: .labelprep in returnlevelplot.R lacked argument adj.lbl 

Modified: branches/distr-2.8/pkg/distrMod/R/returnlevelplot.R
===================================================================
--- branches/distr-2.8/pkg/distrMod/R/returnlevelplot.R	2018-07-23 12:19:11 UTC (rev 1211)
+++ branches/distr-2.8/pkg/distrMod/R/returnlevelplot.R	2018-07-23 18:41:56 UTC (rev 1212)
@@ -125,7 +125,9 @@
     if(is.null(mcl$datax)) datax <- FALSE
     force(x)
 
-    thresh0 <- threshold 
+#    if(!is.function(order.traf)) order.traf <- mcl$order.traf
+
+    thresh0 <- threshold
     if(is(y,"GPareto")){ 
        if(is.na(threshold)) thresh0 <- location(y)
        y <- y - thresh0
@@ -241,8 +243,10 @@
     }
 
     if(withLab&& plot.it){
-       lbprep <- .labelprep(xj,yc.o,lab.pts,
-                            col.lbl,cex.lbl,which.lbs,which.Order,order.traf)
+       lbprep <- .labelprep(x=xj,y=yc.o,lab.pts=lab.pts,
+                            col.lbl=col.lbl,cex.lbl=cex.lbl,
+                            adj.lbl=adj.lbl, which.lbs=which.lbs,
+                            which.Order=which.Order,order.traf=order.traf)
        lbprep$y0 <- p2rl(lbprep$y0)
        xlb0 <- if(datax) lbprep$x0 else lbprep$y0
        ylb0 <- if(datax) lbprep$y0 else lbprep$x0
@@ -334,7 +338,6 @@
     if(missing(xlab)) mc$xlab <- paste(gettext("Return Level of"), as.character(deparse(mc$x)))
     if(missing(ylab)) mc$ylab <- paste(gettext("Return Period at"), as.character(deparse(mc$y)))
     mcl <- as.list(mc)[-1]
-
     mcl$y <- yD <- y at distribution
     if(!is(yD,"UnivariateDistribution"))
        stop("Not yet implemented.")