[Distr-commits] r1412 - in branches/distr-2.9/pkg: distr distr/man distrDoc distrDoc/man distrEllipse distrEllipse/man distrEx distrEx/R distrEx/man distrMod distrMod/man distrRmetrics distrRmetrics/man distrSim distrSim/man distrTEst distrTEst/man distrTeach distrTeach/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon May 8 16:18:10 CEST 2023
Author: ruckdeschel
Date: 2023-05-08 16:18:09 +0200 (Mon, 08 May 2023)
New Revision: 1412
Modified:
branches/distr-2.9/pkg/distr/DESCRIPTION
branches/distr-2.9/pkg/distr/man/0distr-package.Rd
branches/distr-2.9/pkg/distrDoc/DESCRIPTION
branches/distr-2.9/pkg/distrDoc/man/0distrDoc-package.Rd
branches/distr-2.9/pkg/distrEllipse/DESCRIPTION
branches/distr-2.9/pkg/distrEllipse/man/0distrEllipse-package.Rd
branches/distr-2.9/pkg/distrEx/DESCRIPTION
branches/distr-2.9/pkg/distrEx/R/AllGeneric.R
branches/distr-2.9/pkg/distrEx/man/0distrEx-package.Rd
branches/distr-2.9/pkg/distrMod/DESCRIPTION
branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd
branches/distr-2.9/pkg/distrRmetrics/DESCRIPTION
branches/distr-2.9/pkg/distrRmetrics/man/0distrRmetrics-package.Rd
branches/distr-2.9/pkg/distrSim/DESCRIPTION
branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd
branches/distr-2.9/pkg/distrTEst/DESCRIPTION
branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd
branches/distr-2.9/pkg/distrTeach/DESCRIPTION
branches/distr-2.9/pkg/distrTeach/man/0distrTeach-package.Rd
Log:
[distr] branch 2.9 updated URL for project web page on r-forge
Modified: branches/distr-2.9/pkg/distr/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distr/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distr/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -18,7 +18,7 @@
ByteCompile: yes
Encoding: UTF-8
License: LGPL-3
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distr/man/0distr-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distr/man/0distr-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distr/man/0distr-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -51,7 +51,7 @@
Imports: \tab stats, grDevices, utils, MASS \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1395 \cr
}}
\section{Classes}{
Modified: branches/distr-2.9/pkg/distrDoc/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrDoc/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrDoc/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -19,7 +19,7 @@
ByteCompile: yes
Encoding: UTF-8
License: LGPL-3
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrDoc/man/0distrDoc-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrDoc/man/0distrDoc-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrDoc/man/0distrDoc-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -22,7 +22,7 @@
Suggests: \tab Biobase, knitr \cr
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}}
Modified: branches/distr-2.9/pkg/distrEllipse/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrEllipse/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrEllipse/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -12,7 +12,7 @@
email="peter.ruckdeschel at uni-oldenburg.de")
ByteCompile: yes
License: LGPL-3
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
Encoding: UTF-8
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
Modified: branches/distr-2.9/pkg/distrEllipse/man/0distrEllipse-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrEllipse/man/0distrEllipse-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrEllipse/man/0distrEllipse-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -20,7 +20,7 @@
Imports: \tab startupmsg, stats \cr
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}
}
Modified: branches/distr-2.9/pkg/distrEx/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrEx/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrEx/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -12,7 +12,7 @@
ByteCompile: yes
License: LGPL-3
Encoding: UTF-8
-URL: http://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrEx/R/AllGeneric.R
===================================================================
--- branches/distr-2.9/pkg/distrEx/R/AllGeneric.R 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrEx/R/AllGeneric.R 2023-05-08 14:18:09 UTC (rev 1412)
@@ -20,40 +20,69 @@
### intentionally mask functionals for additional ... argument P.R. 28-03-06
-var <- function(x , ...)
- {dots <- list(...)
- if(hasArg(y)) y <- dots$"y"
- na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
- if(!hasArg(use))
- use <- ifelse (na.rm, "complete.obs","all.obs")
- else use <- dots$"use"
- if(hasArg(y))
- stats::var(x = x, y = y, na.rm = na.rm, use)
- else
- stats::var(x = x, y = NULL, na.rm = na.rm, use)
- }
+var <- function(x , ...){
+ mf <- match.call(expand.dots = TRUE)
+ m <- match(c("x", "y", "na.rm", "use"), names(mf), 0L)
+ mf <- mf[c(1L, m)]
+ mf[[1L]] <- quote(stats::var)
+ eval(as.call(mf))
+ }
+### PR 20230202: use match.call to reproduce stats::var more closely as default method
+
+## old version: (throws, e.g., errors for var(NA))
+# var <- function(x , ...)
+# {dots <- list(...)
+# if(hasArg(y)) y <- dots$"y"
+# na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
+# if(!hasArg(use))
+# use <- ifelse (na.rm, "complete.obs","all.obs")
+# else use <- dots$"use"
+# if(hasArg(y))
+# stats::var(x = x, y = y, na.rm = na.rm, use)
+# else
+# stats::var(x = x, y = NULL, na.rm = na.rm, use)
+# }
+
## sd already masked in NormalDistribution.R in package "distr"
-median <- function(x , ...)
- {dots <- list(...)
- na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
- stats::median(x = x, na.rm = na.rm)}
+median <- function(x , ...){
+ mf <- match.call(expand.dots = TRUE)
+ m <- match(c("x", "na.rm"), names(mf), 0L)
+ mf <- mf[c(1L, m)]
+ mf[[1L]] <- quote(stats::median)
+ eval(as.call(mf))
+}
+# {dots <- list(...)
+# na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
+# stats::median(x = x, na.rm = na.rm)}
-IQR <- function(x , ...)
- {dots <- list(...)
- na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
- stats::IQR(x = x, na.rm = na.rm)}
+IQR <- function(x , ...){
+ mf <- match.call(expand.dots = TRUE)
+ m <- match(c("x", "na.rm"), names(mf), 0L)
+ mf <- mf[c(1L, m)]
+ mf[[1L]] <- quote(stats::IQR)
+ eval(as.call(mf))
+}
+# {dots <- list(...)
+# na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
+# stats::IQR(x = x, na.rm = na.rm)}
-mad <- function(x , ...)
- {dots <- list(...)
- na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
- low <- ifelse(hasArg(low), dots$"low", FALSE)
- high <- ifelse(hasArg(high), dots$"high", FALSE)
- center <- ifelse(hasArg(center), dots$"center", median(x))
- constant <- ifelse(hasArg(constant), dots$"constant", 1.4826)
- stats::mad(x = x, center = center, constant = constant , na.rm = na.rm,
- low = low, high = high)}
+mad <- function(x , ...){
+ mf <- match.call(expand.dots = TRUE)
+ m <- match(c("x", "na.rm", "low", "high", "center", "constant"), names(mf), 0L)
+ mf <- mf[c(1L, m)]
+ mf[[1L]] <- quote(stats::mad)
+ eval(as.call(mf))
+}
+# {dots <- list(...)
+# na.rm <- ifelse(hasArg(na.rm), dots$"na.rm", FALSE)
+# low <- ifelse(hasArg(low), dots$"low", FALSE)
+# high <- ifelse(hasArg(high), dots$"high", FALSE)
+# center <- ifelse(hasArg(center), dots$"center", median(x))
+# constant <- ifelse(hasArg(constant), dots$"constant", 1.4826)
+# stats::mad(x = x, center = center, constant = constant , na.rm = na.rm,
+# low = low, high = high)}
### --------- registration as generics ------------------
Modified: branches/distr-2.9/pkg/distrEx/man/0distrEx-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrEx/man/0distrEx-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrEx/man/0distrEx-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -34,7 +34,7 @@
Suggests: \tab tcltk \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}
}
Modified: branches/distr-2.9/pkg/distrMod/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrMod/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrMod/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -15,7 +15,7 @@
ByteCompile: yes
License: LGPL-3
Encoding: UTF-8
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrMod/man/0distrMod-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -21,7 +21,7 @@
Enhances: RobExtremes\cr
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1367 \cr
}}
\section{Classes}{
Modified: branches/distr-2.9/pkg/distrRmetrics/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrRmetrics/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrRmetrics/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -12,7 +12,7 @@
ByteCompile: yes
License: LGPL-3
Encoding: UTF-8
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate: 2011-11-18 13:15:04 +0100 (Fr, 18 Nov 2011) $}
LastChangedRevision: {$LastChangedRevision: 758 $}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrRmetrics/man/0distrRmetrics-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrRmetrics/man/0distrRmetrics-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrRmetrics/man/0distrRmetrics-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -21,7 +21,7 @@
Imports: startupmsg \cr
ByteCompile: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}
}
Modified: branches/distr-2.9/pkg/distrSim/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrSim/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrSim/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -15,7 +15,7 @@
ByteCompile: yes
License: LGPL-3
Encoding: UTF-8
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrSim/man/0distrSim-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -21,7 +21,7 @@
Imports: \tab startupmsg, stats, grDevices \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}
}
Modified: branches/distr-2.9/pkg/distrTEst/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrTEst/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrTEst/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -15,7 +15,7 @@
ByteCompile: yes
Encoding: UTF-8
License: LGPL-3
-URL: https://distr.r-forge.r-project.org/
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrTEst/man/0distrTEst-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -23,7 +23,7 @@
Suggests: \tab distrEx(>= 2.8.0) \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab https://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}}
\section{Classes}{
Modified: branches/distr-2.9/pkg/distrTeach/DESCRIPTION
===================================================================
--- branches/distr-2.9/pkg/distrTeach/DESCRIPTION 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrTeach/DESCRIPTION 2023-05-08 14:18:09 UTC (rev 1412)
@@ -15,8 +15,7 @@
ByteCompile: yes
License: LGPL-3
Encoding: UTF-8
-URL: https://distr.r-forge.r-project.org/
-Packaged: Fri Jun 8 00:12:57 2007; Peter
+URL: https://r-forge.r-project.org/projects/distr/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
VCS/SVNRevision: 1324
Modified: branches/distr-2.9/pkg/distrTeach/man/0distrTeach-package.Rd
===================================================================
--- branches/distr-2.9/pkg/distrTeach/man/0distrTeach-package.Rd 2023-05-08 14:01:52 UTC (rev 1411)
+++ branches/distr-2.9/pkg/distrTeach/man/0distrTeach-package.Rd 2023-05-08 14:18:09 UTC (rev 1412)
@@ -27,7 +27,7 @@
Imports: \tab startupmsg, grDevices, graphics, stats \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
-URL: \tab http://distr.r-forge.r-project.org/\cr
+URL: \tab https://r-forge.r-project.org/projects/distr/\cr
VCS/SVNRevision: \tab 1324 \cr
}
}
More information about the Distr-commits
mailing list