[Robast-commits] r1087 - in branches: robast-1.1/pkg/RobAStBase robast-1.1/pkg/RobAStBase/R robast-1.2/pkg/RobAStBase/R
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Aug 2 12:28:38 CEST 2018
Author: ruckdeschel
Date: 2018-08-02 12:28:38 +0200 (Thu, 02 Aug 2018)
New Revision: 1087
Modified:
branches/robast-1.1/pkg/RobAStBase/DESCRIPTION
branches/robast-1.1/pkg/RobAStBase/R/AllPlot.R
branches/robast-1.1/pkg/RobAStBase/R/comparePlot.R
branches/robast-1.2/pkg/RobAStBase/R/AllPlot.R
branches/robast-1.2/pkg/RobAStBase/R/comparePlot.R
Log:
[RobAStBase] branches 1.1 and 1.2 merged changed from trunk
Modified: branches/robast-1.1/pkg/RobAStBase/DESCRIPTION
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/DESCRIPTION 2018-08-01 22:42:10 UTC (rev 1086)
+++ branches/robast-1.1/pkg/RobAStBase/DESCRIPTION 2018-08-02 10:28:38 UTC (rev 1087)
@@ -5,7 +5,7 @@
Description: Base S4-classes and functions for robust asymptotic statistics.
Depends: R(>= 2.14.0), methods, rrcov, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
RandVar(>= 0.9.2)
-Suggests: ROptEst(>=1.1.0), RUnit(>= 0.4.26)
+Suggests: ROptEst(>= 1.1.0), RUnit(>= 0.4.26)
Imports: startupmsg, graphics, grDevices, stats
Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph", "aut"),
email="Matthias.Kohl at stamats.de"), person("Peter", "Ruckdeschel",role=c("aut", "cph")),
Modified: branches/robast-1.1/pkg/RobAStBase/R/AllPlot.R
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/R/AllPlot.R 2018-08-01 22:42:10 UTC (rev 1086)
+++ branches/robast-1.1/pkg/RobAStBase/R/AllPlot.R 2018-08-02 10:28:38 UTC (rev 1087)
@@ -243,11 +243,11 @@
y.vec1 <- resc$Y
finiteEndpoints <- rep(FALSE,4)
- if(scaleX){
+ if(scaleX[i]){
finiteEndpoints[1] <- is.finite(scaleX.inv[[i]](min(x.vec1, xlim[1,i])))
finiteEndpoints[2] <- is.finite(scaleX.inv[[i]](max(x.vec1, xlim[2,i])))
}
- if(scaleY){
+ if(scaleY[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])))
}
@@ -284,7 +284,7 @@
x.ticks = x.ticks[[i]], y.ticks = y.ticks[[i]])
if(withMBR){
MBR.i <- MBRB[i,]
- if(scaleY) MBR.i <- scaleY.fct[[i]](MBR.i)
+ if(scaleY[i]) MBR.i <- scaleY.fct[[i]](MBR.i)
abline(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
plotInfo$MBR[[i]] <- list(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
}
Modified: branches/robast-1.1/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/R/comparePlot.R 2018-08-01 22:42:10 UTC (rev 1086)
+++ branches/robast-1.1/pkg/RobAStBase/R/comparePlot.R 2018-08-02 10:28:38 UTC (rev 1087)
@@ -592,11 +592,11 @@
y0[1:2] <- c(ym,yM)
finiteEndpoints <- rep(FALSE,4)
- if(scaleX){
+ if(scaleX[i]){
finiteEndpoints[1] <- is.finite(scaleX.inv[[i]](min(x.vec[[i]], xlim[1,i],na.rm=TRUE)))
finiteEndpoints[2] <- is.finite(scaleX.inv[[i]](max(x.vec[[i]], xlim[2,i],na.rm=TRUE)))
}
- if(scaleY){
+ if(scaleY[i]){
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)))
}
@@ -639,7 +639,7 @@
x.ticks = x.ticks0, y.ticks = y.ticks0)
if(withMBR){
MBR.i <- MBRB[i,]
- if(scaleY) MBR.i <- scaleY.fct[[i]](MBR.i)
+ if(scaleY[i]) MBR.i <- scaleY.fct[[i]](MBR.i)
abline(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
plotInfo$MBR[[i]] <- list(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
}
Modified: branches/robast-1.2/pkg/RobAStBase/R/AllPlot.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/AllPlot.R 2018-08-01 22:42:10 UTC (rev 1086)
+++ branches/robast-1.2/pkg/RobAStBase/R/AllPlot.R 2018-08-02 10:28:38 UTC (rev 1087)
@@ -243,11 +243,11 @@
y.vec1 <- resc$Y
finiteEndpoints <- rep(FALSE,4)
- if(scaleX){
+ if(scaleX[i]){
finiteEndpoints[1] <- is.finite(scaleX.inv[[i]](min(x.vec1, xlim[1,i])))
finiteEndpoints[2] <- is.finite(scaleX.inv[[i]](max(x.vec1, xlim[2,i])))
}
- if(scaleY){
+ if(scaleY[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])))
}
@@ -284,7 +284,7 @@
x.ticks = x.ticks[[i]], y.ticks = y.ticks[[i]])
if(withMBR){
MBR.i <- MBRB[i,]
- if(scaleY) MBR.i <- scaleY.fct[[i]](MBR.i)
+ if(scaleY[i]) MBR.i <- scaleY.fct[[i]](MBR.i)
abline(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
plotInfo$MBR[[i]] <- list(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
}
Modified: branches/robast-1.2/pkg/RobAStBase/R/comparePlot.R
===================================================================
--- branches/robast-1.2/pkg/RobAStBase/R/comparePlot.R 2018-08-01 22:42:10 UTC (rev 1086)
+++ branches/robast-1.2/pkg/RobAStBase/R/comparePlot.R 2018-08-02 10:28:38 UTC (rev 1087)
@@ -592,11 +592,11 @@
y0[1:2] <- c(ym,yM)
finiteEndpoints <- rep(FALSE,4)
- if(scaleX){
+ if(scaleX[i]){
finiteEndpoints[1] <- is.finite(scaleX.inv[[i]](min(x.vec[[i]], xlim[1,i],na.rm=TRUE)))
finiteEndpoints[2] <- is.finite(scaleX.inv[[i]](max(x.vec[[i]], xlim[2,i],na.rm=TRUE)))
}
- if(scaleY){
+ if(scaleY[i]){
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)))
}
@@ -639,7 +639,7 @@
x.ticks = x.ticks0, y.ticks = y.ticks0)
if(withMBR){
MBR.i <- MBRB[i,]
- if(scaleY) MBR.i <- scaleY.fct[[i]](MBR.i)
+ if(scaleY[i]) MBR.i <- scaleY.fct[[i]](MBR.i)
abline(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
plotInfo$MBR[[i]] <- list(h=MBR.i, col=col.MBR, lty=lty.MBR, lwd = lwd.MBR)
}
More information about the Robast-commits
mailing list